Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 10:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor file search - use new interface for SearchService.fileSearch

Browse Source
This commit is contained in:
Rob Lourens
2018-10-22 11:26:06 -07:00
parent 4e436d128c
commit 96f7df4336
13 changed files with 264 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/vs/workbench/api/node/extHostSearch.ts
View File

@@ -12,11 +12,10 @@ import { IFileQuery, IFolderQuery, IRawFileQuery, IRawQuery, IRawTextQuery, ISea
import { ExtHostConfiguration } from 'vs/workbench/api/node/extHostConfiguration';
import { FileIndexSearchManager } from 'vs/workbench/api/node/extHostSearch.fileIndex';
import { FileSearchManager } from 'vs/workbench/services/search/node/fileSearchManager';
import { IFolderSearch, IRawSearch } from 'vs/workbench/services/search/node/legacy/search';
import { SearchService } from 'vs/workbench/services/search/node/rawSearchService';
import { RipgrepSearchProvider } from 'vs/workbench/services/search/node/ripgrepSearchProvider';
import { OutputChannel } from 'vs/workbench/services/search/node/ripgrepSearchUtils';
import { isSerializedFileMatch, isSerializedSearchComplete, isSerializedSearchSuccess } from 'vs/workbench/services/search/node/search';
import { isSerializedFileMatch } from 'vs/workbench/services/search/node/search';
import { TextSearchManager } from 'vs/workbench/services/search/node/textSearchManager';
import * as vscode from 'vscode';
import { ExtHostSearchShape, IMainContext, MainContext, MainThreadSearchShape } from './extHost.protocol';
@@ -136,56 +135,22 @@ export class ExtHostSearch implements ExtHostSearchShape {
}
private doInternalFileSearch(handle: number, session: number, rawQuery: IFileQuery, token: CancellationToken): Thenable<ISearchCompleteStats> {
return new Promise((resolve, reject) => {
const query: IRawSearch = {
folderQueries: [],
ignoreSymlinks: rawQuery.folderQueries.some(fq => fq.ignoreSymlinks),
filePattern: rawQuery.filePattern,
excludePattern: rawQuery.excludePattern,
includePattern: rawQuery.includePattern,
maxResults: rawQuery.maxResults,
exists: rawQuery.exists,
sortByScore: rawQuery.sortByScore,
cacheKey: rawQuery.cacheKey,
useRipgrep: rawQuery.useRipgrep,
disregardIgnoreFiles: rawQuery.folderQueries.some(fq => fq.disregardIgnoreFiles),
disregardGlobalIgnoreFiles: rawQuery.folderQueries.some(fq => fq.disregardGlobalIgnoreFiles),
};
query.folderQueries = rawQuery.folderQueries.map(fq => (<IFolderSearch>{
disregardGlobalIgnoreFiles: fq.disregardGlobalIgnoreFiles,
disregardIgnoreFiles: fq.disregardIgnoreFiles,
excludePattern: fq.excludePattern,
fileEncoding: fq.fileEncoding,
folder: fq.folder.fsPath,
includePattern: fq.includePattern
}));
const onResult = (ev) => {
if (isSerializedFileMatch(ev)) {
ev = [ev];
}
const event = this._internalFileSearchProvider.fileSearch(query);
event(ev => {
if (isSerializedSearchComplete(ev)) {
if (isSerializedSearchSuccess(ev)) {
resolve(ev);
return;
} else {
reject(ev);
return;
}
} else {
if (isSerializedFileMatch(ev)) {
ev = [ev];
}
if (Array.isArray(ev)) {
this._proxy.$handleFileMatch(handle, session, ev.map(m => URI.file(m.path)));
return;
}
if (Array.isArray(ev)) {
this._proxy.$handleFileMatch(handle, session, ev.map(m => URI.file(m.path)));
return;
}
if (ev.message) {
this._logService.debug('ExtHostSearch', ev.message);
}
};
if (ev.message) {
this._logService.debug('ExtHostSearch', ev.message);
}
}
});
});
return this._internalFileSearchProvider.doFileSearch(rawQuery, onResult, token);
}
$clearCache(cacheKey: string): Thenable<void> {