From e2eba0acf61d58e502cdbb4b8a4cdec4cb1ab065 Mon Sep 17 00:00:00 2001
From: Alex Ross <38270282+alexr00@users.noreply.github.com>
Date: Wed, 19 Mar 2025 17:21:45 +0100
Subject: [PATCH] Re-enable regex highlight test (#244014)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Re-enable regex highlight test

* 🤦‍♀️
---
 build/gulpfile.vscode.js                                   | 3 +++
 build/gulpfile.vscode.web.js                               | 3 +++
 extensions/vscode-colorize-tests/src/colorizer.test.ts     | 7 ++++---
 .../test/colorize-fixtures/test.regexp.ts                  | 6 ++++++
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 extensions/vscode-colorize-tests/test/colorize-fixtures/test.regexp.ts

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 20b45d96ed3..7046ee004bb 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -101,6 +101,9 @@ const vscodeResourceIncludes = [
 
 	// Tree Sitter highlights
 	'out-build/vs/editor/common/languages/highlights/*.scm',
+
+	// Tree Sitter injection queries
+	'out-build/vs/editor/common/languages/injections/*.scm',
 ];
 
 const vscodeResources = [
diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js
index d2b499294ea..2828f507c60 100644
--- a/build/gulpfile.vscode.web.js
+++ b/build/gulpfile.vscode.web.js
@@ -52,6 +52,9 @@ const vscodeWebResourceIncludes = [
 	// Tree Sitter highlights
 	'out-build/vs/editor/common/languages/highlights/*.scm',
 
+	// Tree Sitter injections
+	'out-build/vs/editor/common/languages/injections/*.scm',
+
 	// Extension Host Worker
 	'out-build/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html',
 ];
diff --git a/extensions/vscode-colorize-tests/src/colorizer.test.ts b/extensions/vscode-colorize-tests/src/colorizer.test.ts
index d2cc5d73cd9..891f0bc9f8a 100644
--- a/extensions/vscode-colorize-tests/src/colorizer.test.ts
+++ b/extensions/vscode-colorize-tests/src/colorizer.test.ts
@@ -70,16 +70,17 @@ suite('colorization', () => {
 	suiteSetup(async function () {
 		originalSettingValues = [
 			workspace.getConfiguration('editor.experimental').get('preferTreeSitter.typescript'),
+			workspace.getConfiguration('editor.experimental').get('preferTreeSitter.regex'),
 			workspace.getConfiguration('editor.experimental').get('preferTreeSitter.ini')
 		];
 		await workspace.getConfiguration('editor.experimental').update('preferTreeSitter.typescript', true, ConfigurationTarget.Global);
-		await workspace.getConfiguration('editor.experimental').update('preferTreeSitter.ini', true, ConfigurationTarget.Global);
 		await workspace.getConfiguration('editor.experimental').update('preferTreeSitter.regex', true, ConfigurationTarget.Global);
+		await workspace.getConfiguration('editor.experimental').update('preferTreeSitter.ini', true, ConfigurationTarget.Global);
 	});
 	suiteTeardown(async function () {
 		await workspace.getConfiguration('editor.experimental').update('preferTreeSitter.typescript', originalSettingValues[0], ConfigurationTarget.Global);
-		await workspace.getConfiguration('editor.experimental').update('preferTreeSitter.ini', originalSettingValues[1], ConfigurationTarget.Global);
-		await workspace.getConfiguration('editor.experimental').update('preferTreeSitter.regex', originalSettingValues[2], ConfigurationTarget.Global);
+		await workspace.getConfiguration('editor.experimental').update('preferTreeSitter.regex', originalSettingValues[1], ConfigurationTarget.Global);
+		await workspace.getConfiguration('editor.experimental').update('preferTreeSitter.ini', originalSettingValues[2], ConfigurationTarget.Global);
 	});
 
 	for (const fixture of fs.readdirSync(fixturesPath)) {
diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/test.regexp.ts b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.regexp.ts
new file mode 100644
index 00000000000..115c0d8a9a0
--- /dev/null
+++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/test.regexp.ts
@@ -0,0 +1,6 @@
+const a = /\\\xFF/;
+const b = /[.*+\-?^${}()|[\]\\]/;
+const c = /\r\n|\r|\n/;
+const d = /\/\/# sourceMappingURL=[^ ]+$/;
+const e = /<%=\s*([^\s]+)\s*%>/;
+const f = /```suggestion(\u0020*(\r\n|\n))((?<suggestion>[\s\S]*?)(\r\n|\n))?```/;