From b0a34ceac3cee4a155f209843d39c663b0b8beb4 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Fri, 17 Aug 2018 10:46:22 -0700 Subject: [PATCH] Fix #56487 - Don't search in models that aren't open --- src/vs/workbench/services/search/node/searchService.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts index 5bf7b93503c..9d4f029f1bb 100644 --- a/src/vs/workbench/services/search/node/searchService.ts +++ b/src/vs/workbench/services/search/node/searchService.ts @@ -27,6 +27,7 @@ import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/un import { IRawSearch, IRawSearchService, ISerializedFileMatch, ISerializedSearchComplete, ISerializedSearchProgressItem, isSerializedSearchComplete, isSerializedSearchSuccess, ITelemetryEvent } from './search'; import { ISearchChannel, SearchChannelClient } from './searchIpc'; import { getPathFromAmdModule } from 'vs/base/common/amd'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export class SearchService extends Disposable implements ISearchService { public _serviceBrand: any; @@ -39,6 +40,7 @@ export class SearchService extends Disposable implements ISearchService { constructor( @IModelService private modelService: IModelService, @IUntitledEditorService private untitledEditorService: IUntitledEditorService, + @IEditorService private editorService: IEditorService, @IEnvironmentService environmentService: IEnvironmentService, @ITelemetryService private telemetryService: ITelemetryService, @IConfigurationService private configurationService: IConfigurationService, @@ -235,6 +237,10 @@ export class SearchService extends Disposable implements ISearchService { return; } + if (!this.editorService.isOpen({ resource })) { + return; + } + // Support untitled files if (resource.scheme === Schemas.untitled) { if (!this.untitledEditorService.exists(resource)) { -- GitLab