SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 07:00:11 +01:00
Code Issues Projects Releases Packages Activity

Fix bug with highlighting of C++ raw string literals (#4436)

Browse source 
* Fix bug with highlighting of C++ raw string literals

* Update to today's monaco-editor-core

* Continue generating `string.raw.end` tokens

---------

Co-authored-by: Alex Dima <alexdima@microsoft.com>
This commit is contained in:
Jeremy Rifkin 2024-03-20 16:09:44 -05:00 • committed by GitHub
parent c92a363985
commit 92f21bfb5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
package-lock.json generated
View file

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

2
package.json
View file

@ -52,7 +52,7 @@
"jsdom": "^19.0.0", "jsdom": "^19.0.0",
"jsonc-parser": "^3.0.0", "jsonc-parser": "^3.0.0",
"mocha": "^9.2.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", "parcel": "^2.7.0",
"pin-github-action": "^1.8.0", "pin-github-action": "^1.8.0",
"playwright": "^1.32.2", "playwright": "^1.32.2",

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

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