daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable legacy non-rg search #65337

pull/66115/head
Rob Lourens 2019-01-03 16:55:51 -08:00
parent fb0d022d8a
commit 32db2fdb09
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/parts/search/common/queryBuilder.ts
View File

@ -150,10 +150,10 @@ export class QueryBuilder {
folderResources.map(uri => this.getFolderQueryForRoot(uri, options, excludePattern))) folderResources.map(uri => this.getFolderQueryForRoot(uri, options, excludePattern)))
.filter(query => !!query) as IFolderQuery[]; .filter(query => !!query) as IFolderQuery[];
const useRipgrep = !folderResources || folderResources.every(folder => { // const useRipgrep = !folderResources || folderResources.every(folder => {
const folderConfig = this.configurationService.getValue<ISearchConfiguration>({ resource: folder }); // const folderConfig = this.configurationService.getValue<ISearchConfiguration>({ resource: folder });
return !folderConfig.search.useLegacySearch; // return !folderConfig.search.useLegacySearch;
}); // });
const queryProps: ICommonQueryProps<uri> = { const queryProps: ICommonQueryProps<uri> = {
_reason: options._reason, _reason: options._reason,
@ -164,7 +164,7 @@ export class QueryBuilder {
excludePattern: excludePattern.pattern, excludePattern: excludePattern.pattern,
includePattern, includePattern,
maxResults: options.maxResults, maxResults: options.maxResults,
useRipgrep useRipgrep: true
}; };
// Filter extraFileResources against global include/exclude patterns - they are already expected to not belong to a workspace // Filter extraFileResources against global include/exclude patterns - they are already expected to not belong to a workspace