Fix microsoft#94439.

Jackson Kearl · Jackson Kearl · commit f0fb32319435 · 2020-04-30T05:48:21.000-07:00
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
@@ -248,10 +248,7 @@ export class SearchEditor extends BaseTextEditor {
 	}
 
 	focusSearchInput() {
-		const viewState = this.loadViewState();
-		if (viewState && viewState.focused === 'editor') {
-			this.queryEditorWidget.searchInput.focus();
-		}
+		this.queryEditorWidget.searchInput.focus();
 	}
 
 	focusNextInput() {
diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.ts
@@ -161,7 +161,7 @@ export class RerunSearchEditorSearchAction extends Action {
 
 export class FocusQueryEditorWidgetAction extends Action {
 	static readonly ID: string = Constants.FocusQueryEditorWidgetCommandId;
-	static readonly LABEL = localize('search.action.focusQueryEditorWidget', "Focus Query Editor Widget");
+	static readonly LABEL = localize('search.action.focusQueryEditorWidget', "Focus Search Editor Input");
 
 	constructor(id: string, label: string,
 		@IEditorService private readonly editorService: IEditorService,

Original file line number	Diff line number	Diff line change
`@@ -248,10 +248,7 @@ export class SearchEditor extends BaseTextEditor {`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`focusSearchInput() {`
`251`		`- const viewState = this.loadViewState();`
`252`		`- if (viewState && viewState.focused === 'editor') {`
`253`		`- this.queryEditorWidget.searchInput.focus();`
`254`		`- }`
	`251`	`+ this.queryEditorWidget.searchInput.focus();`
`255`	`252`	`}`
`256`	`253`
`257`	`254`	`focusNextInput() {`