Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-19 14:49:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #23534 - no reason to force --regexp when using --word-regex

Browse Source
This commit is contained in:
Rob Lourens
2017-03-29 15:12:57 -07:00
parent 68e6886423
commit 2a823213ce
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/search/node/ripgrepTextSearch.ts
+6 -11
View File
@@ -12,7 +12,6 @@ import { rgPath } from 'vscode-ripgrep';
import * as extfs from 'vs/base/node/extfs';
import * as encoding from 'vs/base/node/encoding';
import * as strings from 'vs/base/common/strings';
import * as glob from 'vs/base/common/glob';
import { ILineMatch, IProgress } from 'vs/platform/search/common/search';
import { TPromise } from 'vs/base/common/winjs.base';
@@ -366,20 +365,16 @@ function getRgArgs(config: IRawSearch): { args: string[], siblingClauses: glob.I
args.push('--encoding', encoding.toCanonicalName(config.fileEncoding));
}
if (config.contentPattern.isWordMatch) {
args.push('--word-regexp');
}
let searchPatternAfterDoubleDashes: string;
if (config.contentPattern.isRegExp) {
if (config.contentPattern.isWordMatch) {
args.push('--word-regexp');
}
args.push('--regexp', config.contentPattern.pattern);
} else {
if (config.contentPattern.isWordMatch) {
args.push('--word-regexp', '--regexp', strings.escapeRegExpCharacters(config.contentPattern.pattern));
} else {
args.push('--fixed-strings');
searchPatternAfterDoubleDashes = config.contentPattern.pattern;
}
searchPatternAfterDoubleDashes = config.contentPattern.pattern;
args.push('--fixed-strings');
}
// Folder to search