maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't hardcode number of result providers

Browse source 
Minor refactor. Does not change any logic.
This commit is contained in:
Nick Snyder 2017-06-06 07:47:57 -07:00 committed by Christof Marti
parent 61377c23b0
commit 06dfe10a38
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/vs/workbench/parts/search/browser/openAnythingHandler.ts
View file

@ -166,8 +166,6 @@ export class OpenAnythingHandler extends QuickOpenHandler {
// Symbol Results (unless disabled or a range or absolute path is specified)
if (this.includeSymbols && !searchWithRange) {
resultPromises.push(this.openSymbolHandler.getResults(searchValue));
} else {
resultPromises.push(TPromise.as(new QuickOpenModel())); // We need this empty promise because we are using the throttler below!
}
// Join and sort unified
@ -179,8 +177,10 @@ export class OpenAnythingHandler extends QuickOpenHandler {
return TPromise.as<QuickOpenModel>(new QuickOpenModel());
}
// Combine file results and symbol results (if any)
const mergedResults = [...results[0].entries, ...results[1].entries];
// Combine results.
const mergedResults: QuickOpenEntry[] = results.reduce((entries: QuickOpenEntry[], model: QuickOpenModel) => {
return entries.concat(model.entries);
}, []);
// Sort
const unsortedResultTime = Date.now();
@ -200,10 +200,11 @@ export class OpenAnythingHandler extends QuickOpenHandler {
});
let fileSearchStats: ISearchStats;
if (results[0] instanceof FileQuickOpenModel) {
fileSearchStats = (<FileQuickOpenModel>results[0]).stats;
} else if (results[1] instanceof FileQuickOpenModel) {
fileSearchStats = (<FileQuickOpenModel>results[1]).stats;
for (const result of results) {
if (result instanceof FileQuickOpenModel) {
fileSearchStats = (<FileQuickOpenModel>result).stats;
break;
}
}
const duration = new Date().getTime() - startTime;