提交 1c432b96 编写于 作者: R Rob Lourens

Fix #22985

上级 3cb39e1a
......@@ -355,10 +355,11 @@ function getRgArgs(config: IRawSearch): { args: string[], siblingClauses: glob.I
args.push('--follow');
// Set default encoding
if (config.fileEncoding) {
if (config.fileEncoding && config.fileEncoding !== 'utf8') {
args.push('--encoding', encoding.toCanonicalName(config.fileEncoding));
}
let searchPatternAfterDoubleDashes: string;
if (config.contentPattern.isRegExp) {
if (config.contentPattern.isWordMatch) {
args.push('--word-regexp');
......@@ -369,12 +370,20 @@ function getRgArgs(config: IRawSearch): { args: string[], siblingClauses: glob.I
if (config.contentPattern.isWordMatch) {
args.push('--word-regexp', '--regexp', strings.escapeRegExpCharacters(config.contentPattern.pattern));
} else {
args.push('--fixed-strings', config.contentPattern.pattern);
args.push('--fixed-strings');
searchPatternAfterDoubleDashes = config.contentPattern.pattern;
}
}
// Folder to search
args.push('--', './');
args.push('--');
if (searchPatternAfterDoubleDashes) {
// Put the query after --, in case the query starts with a dash
args.push(searchPatternAfterDoubleDashes);
}
args.push('./');
return { args, siblingClauses };
}
......
......@@ -179,4 +179,14 @@ suite('Search-integration', () => {
doSearchTest(config, 0, done);
});
test('Text: -size', function (done: () => void) {
let config = {
rootFolders: rootfolders(),
filePattern: '*.css',
contentPattern: { pattern: '-size', modifiers: 'i' }
};
doSearchTest(config, 9, done);
});
});
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册