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

* 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>
microsoft · Mar 20, 2024 · 92f21bf · 92f21bf
1 parent c92a363
commit 92f21bf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 23 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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",

diff --git a/src/basic-languages/cpp/cpp.ts b/src/basic-languages/cpp/cpp.ts
@@ -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: [