From c3d9e2253a6fda9a938aa5be9c45714c66b9e168 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 24 Jun 2022 15:31:37 +0200 Subject: [PATCH] always `preserveFocus` when calling `_open.mergeEditor` (#153113) fixes https://github.com/microsoft/vscode/issues/152948 --- .../workbench/contrib/mergeEditor/browser/commands/commands.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts b/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts index 5e0619f9e4b..8814e2435be 100644 --- a/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts +++ b/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts @@ -33,7 +33,7 @@ export class OpenMergeEditor extends Action2 { validatedArgs.input2, validatedArgs.output, ); - accessor.get(IEditorService).openEditor(input); + accessor.get(IEditorService).openEditor(input, { preserveFocus: true }); } }