Merge pull request #82072 from IllusionMH/pcre2-for-whole-word-82071

Fallback to PCRE2 if match whole word used with regexp
microsoft · Oct 8, 2019 · 8f3b739 · 8f3b739
2 parents 4332203 + 10545c3
commit 8f3b739
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts b/src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts
@@ -425,13 +425,14 @@ function getRgArgs(query: TextSearchQuery, options: TextSearchOptions): string[]
 		args.push('--pcre2');
 	}
 
+	// Allow $ to match /r/n
+	args.push('--crlf');
+
 	if (query.isRegExp) {
 		query.pattern = unicodeEscapesToPCRE2(query.pattern);
+		args.push('--auto-hybrid-regex');
 	}
 
-	// Allow $ to match /r/n
-	args.push('--crlf');
-
 	let searchPatternAfterDoubleDashes: Maybe<string>;
 	if (query.isWordMatch) {
 		const regexp = createRegExp(query.pattern, !!query.isRegExp, { wholeWord: query.isWordMatch });
@@ -441,7 +442,6 @@ function getRgArgs(query: TextSearchQuery, options: TextSearchOptions): string[]
 		let fixedRegexpQuery = fixRegexNewline(query.pattern);
 		fixedRegexpQuery = fixNewline(fixedRegexpQuery);
 		args.push('--regexp', fixedRegexpQuery);
-		args.push('--auto-hybrid-regex');
 	} else {
 		searchPatternAfterDoubleDashes = query.pattern;
 		args.push('--fixed-strings');