From 83b97d009f5eb2493ca88983c9b5ed4742ba0dc1 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 29 Aug 2016 07:43:50 +0200 Subject: [PATCH] possible fix for #11079 --- .../browser/parts/quickopen/quickOpenController.ts | 1 - src/vs/workbench/parts/search/browser/openFileHandler.ts | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index 8b448e11846..cf538b9493d 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -704,7 +704,6 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe let quickOpenModel = new QuickOpenModel(matchingHistoryEntries, this.actionProvider); let resultPromises: TPromise[] = []; resolvedHandlers.forEach(resolvedHandler => { - const result = resolvedHandler.getResults(value); const promise = (result).promisedModel || >>result; shortResponseTime = shortResponseTime || !!(result).shortResponseTime; diff --git a/src/vs/workbench/parts/search/browser/openFileHandler.ts b/src/vs/workbench/parts/search/browser/openFileHandler.ts index 698437ba487..9fa7a764a8e 100644 --- a/src/vs/workbench/parts/search/browser/openFileHandler.ts +++ b/src/vs/workbench/parts/search/browser/openFileHandler.ts @@ -158,7 +158,7 @@ export class OpenFileHandler extends QuickOpenHandler { private cacheQuery(cacheKey: string): ISearchQuery { const options: IQueryOptions = { folderResources: this.contextService.getWorkspace() ? [this.contextService.getWorkspace().resource] : [], - extraFileResources: [], + extraFileResources: getOutOfWorkspaceEditorResources(this.editorGroupService, this.contextService), filePattern: '', cacheKey: cacheKey, maxResults: 0, @@ -193,7 +193,7 @@ class CacheState { private promise: TPromise; - constructor (private cacheQuery: (cacheKey: string) => ISearchQuery, private doLoad: (query: ISearchQuery) => TPromise, private doDispose: (cacheKey: string) => TPromise, private previous: CacheState) { + constructor(private cacheQuery: (cacheKey: string) => ISearchQuery, private doLoad: (query: ISearchQuery) => TPromise, private doDispose: (cacheKey: string) => TPromise, private previous: CacheState) { this.query = cacheQuery(this._cacheKey); if (this.previous) { const current = objects.assign({}, this.query, { cacheKey: null }); @@ -227,7 +227,7 @@ class CacheState { } public dispose(): void { - this.promise.then(null, () => {}) + this.promise.then(null, () => { }) .then(() => { this._isLoaded = false; return this.doDispose(this._cacheKey);