Escape query, fixes microsoft#153583 (microsoft#154990)

rzhao271 · web-flow · commit 3e18c4995f92 · 2022-07-12T17:05:28.000-07:00
diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts b/src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
@@ -554,7 +554,7 @@ export class SettingMatches {
 		// Trim excess ending characters off the query.
 		singleWordQuery = singleWordQuery.toLowerCase().replace(/[\s-\._]+$/, '');
 		lineToSearch = lineToSearch.toLowerCase();
-		const singleWordRegex = new RegExp(`\\b${singleWordQuery}\\b`);
+		const singleWordRegex = new RegExp(`\\b${strings.escapeRegExpCharacters(singleWordQuery)}\\b`);
 		if (singleWordRegex.test(lineToSearch)) {
 			this.matchType |= SettingMatchType.WholeWordMatch;
 		}

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ export class SettingMatches {`
`554`	`554`	`// Trim excess ending characters off the query.`
`555`	`555`	`singleWordQuery = singleWordQuery.toLowerCase().replace(/[\s-\._]+$/, '');`
`556`	`556`	`lineToSearch = lineToSearch.toLowerCase();`
`557`		- const singleWordRegex = new RegExp(`\\b${singleWordQuery}\\b`);
	`557`	+ const singleWordRegex = new RegExp(`\\b${strings.escapeRegExpCharacters(singleWordQuery)}\\b`);
`558`	`558`	`if (singleWordRegex.test(lineToSearch)) {`
`559`	`559`	`this.matchType \|= SettingMatchType.WholeWordMatch;`
`560`	`560`	`}`