From f89f293320c486fb0c2953785a8349f351d7a6ab Mon Sep 17 00:00:00 2001 From: meganrogge Date: Tue, 19 Sep 2023 09:05:55 -0700 Subject: [PATCH 1/4] fix #193454 --- .../workbench/contrib/terminal/browser/terminalActions.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts index 3b01c31dff1..325d7988c89 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts @@ -491,7 +491,11 @@ export function registerTerminalActions() { return; } c.service.setActiveInstance(instance); - return c.groupService.showPanel(true); + if (instance.target === TerminalLocation.Panel) { + c.groupService.showPanel(true); + } else { + c.editorService.activeInstance?.focus(); + } } }); From 34648687295a48cffca22cb87b5c8356f6ec2628 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Tue, 19 Sep 2023 12:26:32 -0700 Subject: [PATCH 2/4] use helper --- .../workbench/contrib/terminal/browser/terminalActions.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts index 325d7988c89..0c707050a73 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts @@ -491,11 +491,7 @@ export function registerTerminalActions() { return; } c.service.setActiveInstance(instance); - if (instance.target === TerminalLocation.Panel) { - c.groupService.showPanel(true); - } else { - c.editorService.activeInstance?.focus(); - } + c.service.focusActiveInstance(); } }); From b8c1929f961e5cf8c53de4268a917c6cc922757e Mon Sep 17 00:00:00 2001 From: Megan Rogge Date: Tue, 19 Sep 2023 12:48:11 -0700 Subject: [PATCH 3/4] Update src/vs/workbench/contrib/terminal/browser/terminalActions.ts Co-authored-by: Daniel Imms <2193314+Tyriar@users.noreply.github.com> --- src/vs/workbench/contrib/terminal/browser/terminalActions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts index 0c707050a73..83fe8c2d7c0 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts @@ -491,7 +491,7 @@ export function registerTerminalActions() { return; } c.service.setActiveInstance(instance); - c.service.focusActiveInstance(); + focusActiveInstance(instance, c); } }); From c44e774e116d36b4187ef98a267e5c85a612fa4a Mon Sep 17 00:00:00 2001 From: meganrogge Date: Tue, 19 Sep 2023 13:15:11 -0700 Subject: [PATCH 4/4] fix --- src/vs/workbench/contrib/terminal/browser/terminalActions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts index 83fe8c2d7c0..d14a577769d 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts @@ -491,7 +491,7 @@ export function registerTerminalActions() { return; } c.service.setActiveInstance(instance); - focusActiveInstance(instance, c); + focusActiveTerminal(instance, c); } });