daohualiuxiang
/
monaco-editor
mirror of https://github.com/microsoft/monaco-editor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into samstrohkorbatt/python-fstring

pull/4401/head
samstrohkorbatt 2024-04-01 14:27:04 -06:00 committed by GitHub
parent c1707b8fde 8503aef01e
commit ac2c7a1add
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.azure-pipelines/publish-nightly.yml
View File

@ -44,6 +44,7 @@ parameters:
extends:
template: azure-pipelines/npm-package/pipeline.yml@templates
parameters:
cgIgnoreDirectories: $(Build.SourcesDirectory)/dependencies/vscode/extensions
npmPackages:
- name: monaco-editor-core
workingDirectory: $(Build.SourcesDirectory)/dependencies/vscode/out-monaco-editor-core

14
package-lock.json generated
View File

@ -25,7 +25,7 @@
"jsdom": "^19.0.0",
"jsonc-parser": "^3.0.0",
"mocha": "^9.2.0",
"monaco-editor-core": "0.48.0-dev-20240319",
"monaco-editor-core": "0.48.0-dev-20240320",
"parcel": "^2.7.0",
"pin-github-action": "^1.8.0",
"playwright": "^1.32.2",
@ -5388,9 +5388,9 @@
"dev": true
},
"node_modules/monaco-editor-core": {
"version": "0.48.0-dev-20240319",
"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.48.0-dev-20240319.tgz",
"integrity": "sha512-w8QasiJcJY/XPHPqtqj1+aokHrFIFBYuKOOABFT9vDmTEp/0euMxARhwc0R1VvtQ1hSFVKb0CQq6X1kMdgvbbQ==",
"version": "0.48.0-dev-20240320",
"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.48.0-dev-20240320.tgz",
"integrity": "sha512-fXS0Bt39Qv9C10Cuuf0ZvgcK8LhN+fP+27sDfjILEQCUVRa4pDAtvZOny2BiiPqsmOINch8UVNSZtH7+Af3ngQ==",
"dev": true
},
"node_modules/mri": {
@ -11144,9 +11144,9 @@
}
},
"monaco-editor-core": {
"version": "0.48.0-dev-20240319",
"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.48.0-dev-20240319.tgz",
"integrity": "sha512-w8QasiJcJY/XPHPqtqj1+aokHrFIFBYuKOOABFT9vDmTEp/0euMxARhwc0R1VvtQ1hSFVKb0CQq6X1kMdgvbbQ==",
"version": "0.48.0-dev-20240320",
"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.48.0-dev-20240320.tgz",
"integrity": "sha512-fXS0Bt39Qv9C10Cuuf0ZvgcK8LhN+fP+27sDfjILEQCUVRa4pDAtvZOny2BiiPqsmOINch8UVNSZtH7+Af3ngQ==",
"dev": true
},
"mri": {

2
package.json
View File

@ -52,7 +52,7 @@
"jsdom": "^19.0.0",
"jsonc-parser": "^3.0.0",
"mocha": "^9.2.0",
"monaco-editor-core": "0.48.0-dev-20240319",
"monaco-editor-core": "0.48.0-dev-20240320",
"parcel": "^2.7.0",
"pin-github-action": "^1.8.0",
"playwright": "^1.32.2",

9
samples/package-lock.json generated
View File

@ -4322,9 +4322,10 @@
}
},
"node_modules/webpack-dev-middleware": {
"version": "5.3.3",
"version": "5.3.4",
"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
"integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
"dev": true,
"license": "MIT",
"dependencies": {
"colorette": "^2.0.10",
"memfs": "^3.4.3",
@ -7315,7 +7316,9 @@
}
},
"webpack-dev-middleware": {
"version": "5.3.3",
"version": "5.3.4",
"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
"integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
"dev": true,
"requires": {
"colorette": "^2.0.10",

18
src/basic-languages/cpp/cpp.ts
View File

@ -378,21 +378,9 @@ export const language = <languages.IMonarchLanguage>{
],
raw: [
[
/(.*)(\))(?:([^ ()\\\t"]*))(\")/,
{
cases: {
'$3==$S2': [
'string.raw',
'string.raw.end',
'string.raw.end',
{ token: 'string.raw.end', next: '@pop' }
],
'@default': ['string.raw', 'string.raw', 'string.raw', 'string.raw']
}
}
],
[/.*/, 'string.raw']
[/[^)]+/, 'string.raw'],
[/\)$S2\"/, { token: 'string.raw.end', next: '@pop' }],
[/\)/, 'string.raw']
],
annotation: [

6
website/yarn.lock
View File

@ -3374,9 +3374,9 @@ webpack-cli@^4.10.0:
webpack-merge "^5.7.3"
webpack-dev-middleware@^5.3.1:
version "5.3.3"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
version "5.3.4"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
dependencies:
colorette "^2.0.10"
memfs "^3.4.3"