From 3ca1a456edcd0fa8e5d1a287b59703334f2ae3b0 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Fri, 22 Sep 2023 12:22:12 -0700 Subject: [PATCH 1/2] fix #193713 --- .../browser/terminal.accessibility.contribution.ts | 2 -- .../accessibility/browser/terminalAccessibleBufferProvider.ts | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts index 95d437c7ee2..c0d80177324 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts @@ -250,7 +250,6 @@ registerTerminalAction({ ], run: async (c) => { const instance = await c.service.getActiveOrCreateInstance(); - await c.service.revealActiveTerminal(); if (!instance) { return; } @@ -272,7 +271,6 @@ registerTerminalAction({ ], run: async (c) => { const instance = await c.service.getActiveOrCreateInstance(); - await c.service.revealActiveTerminal(); if (!instance) { return; } diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts index 5e0a5b0fbe5..7e2a63b3759 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts @@ -25,8 +25,7 @@ export class TerminalAccessibleBufferProvider extends DisposableStore implements @IModelService _modelService: IModelService, @IConfigurationService _configurationService: IConfigurationService, @IContextKeyService _contextKeyService: IContextKeyService, - @ITerminalService _terminalService: ITerminalService, - @IConfigurationService configurationService: IConfigurationService + @ITerminalService _terminalService: ITerminalService ) { super(); } From a4f925454787a3fd29cc798e30f31aea8a1c7be0 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Fri, 22 Sep 2023 12:24:37 -0700 Subject: [PATCH 2/2] don't create a terminal in these commands --- .../browser/terminal.accessibility.contribution.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts index c0d80177324..f4cd2e45dc5 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts @@ -249,7 +249,7 @@ registerTerminalAction({ } ], run: async (c) => { - const instance = await c.service.getActiveOrCreateInstance(); + const instance = await c.service.activeInstance; if (!instance) { return; } @@ -270,7 +270,7 @@ registerTerminalAction({ } ], run: async (c) => { - const instance = await c.service.getActiveOrCreateInstance(); + const instance = await c.service.activeInstance; if (!instance) { return; }