From 08e5cccb113d309ffec951f2ed88290cf2535fb1 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Fri, 16 Jul 2021 13:30:50 -0700 Subject: [PATCH] Fix #127898 --- src/vs/workbench/contrib/search/browser/search.contribution.ts | 1 + src/vs/workbench/contrib/search/browser/searchActions.ts | 2 ++ src/vs/workbench/contrib/search/browser/searchView.ts | 3 +++ .../contrib/searchEditor/browser/searchEditor.contribution.ts | 1 + 4 files changed, 7 insertions(+) diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts index 3d7c1cf33d9..bb6069bff55 100644 --- a/src/vs/workbench/contrib/search/browser/search.contribution.ts +++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts @@ -705,6 +705,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ isCaseSensitive: { 'type': 'boolean' }, matchWholeWord: { 'type': 'boolean' }, useExcludeSettingsAndIgnoreFiles: { 'type': 'boolean' }, + onlyOpenEditors: { 'type': 'boolean' }, } } }, diff --git a/src/vs/workbench/contrib/search/browser/searchActions.ts b/src/vs/workbench/contrib/search/browser/searchActions.ts index d4035e10c08..963423ac59e 100644 --- a/src/vs/workbench/contrib/search/browser/searchActions.ts +++ b/src/vs/workbench/contrib/search/browser/searchActions.ts @@ -172,6 +172,7 @@ export interface IFindInFilesArgs { isCaseSensitive?: boolean; matchWholeWord?: boolean; useExcludeSettingsAndIgnoreFiles?: boolean; + onlyOpenEditors?: boolean; } export const FindInFilesCommand: ICommandHandler = (accessor, args: IFindInFilesArgs = {}) => { const searchConfig = accessor.get(IConfigurationService).getValue().search; @@ -201,6 +202,7 @@ export const FindInFilesCommand: ICommandHandler = (accessor, args: IFindInFiles isCaseSensitive: args.isCaseSensitive, isRegexp: args.isRegex, useExcludeSettingsAndIgnoreFiles: args.useExcludeSettingsAndIgnoreFiles, + onlyOpenEditors: args.onlyOpenEditors, showIncludesExcludes: !!(args.filesToExclude || args.filesToExclude || !args.useExcludeSettingsAndIgnoreFiles), }); accessor.get(ICommandService).executeCommand(OpenEditorCommandId, convertArgs(args)); diff --git a/src/vs/workbench/contrib/search/browser/searchView.ts b/src/vs/workbench/contrib/search/browser/searchView.ts index 90bb28ccaf0..3a65c0b871b 100644 --- a/src/vs/workbench/contrib/search/browser/searchView.ts +++ b/src/vs/workbench/contrib/search/browser/searchView.ts @@ -1240,6 +1240,9 @@ export class SearchView extends ViewPane { if (typeof args.useExcludeSettingsAndIgnoreFiles === 'boolean') { this.inputPatternExcludes.setUseExcludesAndIgnoreFiles(args.useExcludeSettingsAndIgnoreFiles); } + if (typeof args.onlyOpenEditors === 'boolean') { + this.searchIncludePattern.setOnlySearchInOpenEditors(args.onlyOpenEditors); + } } toggleQueryDetails(moveFocus = true, show?: boolean, skipLayout?: boolean, reverse?: boolean): void { diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts index b0c825f7180..a7558703a85 100644 --- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts +++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts @@ -217,6 +217,7 @@ const openArgDescription = { showIncludesExcludes: { type: 'boolean' }, triggerSearch: { type: 'boolean' }, focusResults: { type: 'boolean' }, + onlyOpenEditors: { type: 'boolean' }, } } }]