From cb555f0004720d09f8f0808c288db8291ae7b4e5 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 3 Jul 2019 12:02:40 -0700 Subject: [PATCH] Remove showing search result when the search viewlet visibility changes This is broken and I don't really like this behavior anyway --- .../contrib/search/browser/searchView.ts | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts index 35bc6bf882b..242447cfc92 100644 --- a/src/vs/workbench/contrib/search/browser/searchView.ts +++ b/src/vs/workbench/contrib/search/browser/searchView.ts @@ -320,14 +320,6 @@ export class SearchView extends ViewletPanel { if (this.viewModel) { this.viewModel.searchResult.toggleHighlights(visible); } - - // Open focused element from results in case the editor area is otherwise empty - if (visible && !this.editorService.activeEditor) { - const focus = this.tree.getFocus(); - if (focus) { - this.onFocus(focus, true); - } - } } get searchAndReplaceWidget(): SearchWidget { @@ -1548,12 +1540,7 @@ export class SearchView extends ViewletPanel { this.currentSelectedFileMatch = undefined; } - private onFocus(lineMatch: any, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Promise { - if (!(lineMatch instanceof Match)) { - this.viewModel.searchResult.rangeHighlightDecorations.removeHighlightRange(); - return Promise.resolve(true); - } - + private onFocus(lineMatch: Match, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Promise { const useReplacePreview = this.configurationService.getValue().search.useReplacePreview; return (useReplacePreview && this.viewModel.isReplaceActive() && !!this.viewModel.replaceString) ? this.replaceService.openReplacePreview(lineMatch, preserveFocus, sideBySide, pinned) :