From 6a412745f2e1003d44ed8b9d46b48a143b02c4f3 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Tue, 3 Oct 2023 15:43:52 -0700 Subject: [PATCH 1/2] Revert "add test acc service" This reverts commit 3b442f9c7302cc09eccfc281f31e16f6ab2a4d56. --- .../browser/terminal.accessibility.contribution.ts | 7 +++---- .../accessibility/browser/textAreaSyncAddon.ts | 5 ++--- .../test/browser/bufferContentTracker.test.ts | 3 --- 3 files changed, 5 insertions(+), 10 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 2e604a7cde2..ba012fd2ee0 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 @@ -29,9 +29,8 @@ import type { Terminal } from 'xterm'; import { Position } from 'vs/editor/common/core/position'; import { ICommandWithEditorLine, TerminalAccessibleBufferProvider } from 'vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { TerminalSettingId, WindowsShellType } from 'vs/platform/terminal/common/terminal'; +import { TerminalSettingId } from 'vs/platform/terminal/common/terminal'; import { Event } from 'vs/base/common/event'; -import { isWindows } from 'vs/base/common/platform'; class TextAreaSyncContribution extends DisposableStore implements ITerminalContribution { static readonly ID = 'terminal.textAreaSync'; @@ -47,7 +46,7 @@ class TextAreaSyncContribution extends DisposableStore implements ITerminalContr super(); } xtermReady(xterm: IXtermTerminal & { raw: Terminal }): void { - const addon = this._instantiationService.createInstance(TextAreaSyncAddon, isWindows ? this._instance.shellType as WindowsShellType : undefined, this._instance.capabilities); + const addon = this._instantiationService.createInstance(TextAreaSyncAddon, this._instance.capabilities); xterm.raw.loadAddon(addon); addon.activate(xterm.raw); } @@ -90,7 +89,7 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT })); } xtermReady(xterm: IXtermTerminal & { raw: Terminal }): void { - const addon = this._instantiationService.createInstance(TextAreaSyncAddon, isWindows ? this._instance.shellType as WindowsShellType : undefined, this._instance.capabilities); + const addon = this._instantiationService.createInstance(TextAreaSyncAddon, this._instance.capabilities); xterm.raw.loadAddon(addon); addon.activate(xterm.raw); this._xterm = xterm; diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts index 2c06d1be7bd..2f9cda97bee 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts @@ -6,7 +6,7 @@ import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle'; import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility'; import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities'; -import { ITerminalLogService, WindowsShellType } from 'vs/platform/terminal/common/terminal'; +import { ITerminalLogService } from 'vs/platform/terminal/common/terminal'; import type { Terminal, ITerminalAddon } from 'xterm'; import { debounce } from 'vs/base/common/decorators'; import { addDisposableListener } from 'vs/base/browser/dom'; @@ -30,7 +30,6 @@ export class TextAreaSyncAddon extends Disposable implements ITerminalAddon { } constructor( - private readonly _windowsShell: WindowsShellType | undefined, private readonly _capabilities: ITerminalCapabilityStore, @IAccessibilityService private readonly _accessibilityService: IAccessibilityService, @ITerminalLogService private readonly _logService: ITerminalLogService @@ -88,7 +87,7 @@ export class TextAreaSyncAddon extends Disposable implements ITerminalAddon { } const commandCapability = this._capabilities.get(TerminalCapability.CommandDetection); const currentCommand = commandCapability?.currentCommand; - if (!currentCommand || (this._windowsShell && (this._windowsShell === 'pwsh' && !currentCommand.command?.includes('PS')) || (this._windowsShell === 'cmd' && !currentCommand.command?.includes('C:')))) { + if (!currentCommand) { this._logService.debug(`TextAreaSyncAddon#updateCommandAndCursor: no current command`); return; } diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts index 4a4ba9498e1..5f2a3678c61 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts @@ -7,8 +7,6 @@ import * as assert from 'assert'; import { importAMDNodeModule } from 'vs/amdX'; import { isWindows } from 'vs/base/common/platform'; import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; -import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility'; -import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @@ -67,7 +65,6 @@ suite('Buffer Content Tracker', () => { instantiationService.stub(IContextMenuService, store.add(instantiationService.createInstance(ContextMenuService))); instantiationService.stub(ILifecycleService, store.add(new TestLifecycleService())); instantiationService.stub(IContextKeyService, store.add(new MockContextKeyService())); - instantiationService.stub(IAccessibilityService, new TestAccessibilityService()); configHelper = store.add(instantiationService.createInstance(TerminalConfigHelper)); capabilities = store.add(new TerminalCapabilityStore()); if (!isWindows) { From 2ced9dccfc1e8cb25f95d192f23110d2283c2206 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Tue, 3 Oct 2023 15:45:01 -0700 Subject: [PATCH 2/2] undo bad changes --- .../accessibility/test/browser/bufferContentTracker.test.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts index 5f2a3678c61..4a4ba9498e1 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/test/browser/bufferContentTracker.test.ts @@ -7,6 +7,8 @@ import * as assert from 'assert'; import { importAMDNodeModule } from 'vs/amdX'; import { isWindows } from 'vs/base/common/platform'; import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils'; +import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility'; +import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @@ -65,6 +67,7 @@ suite('Buffer Content Tracker', () => { instantiationService.stub(IContextMenuService, store.add(instantiationService.createInstance(ContextMenuService))); instantiationService.stub(ILifecycleService, store.add(new TestLifecycleService())); instantiationService.stub(IContextKeyService, store.add(new MockContextKeyService())); + instantiationService.stub(IAccessibilityService, new TestAccessibilityService()); configHelper = store.add(instantiationService.createInstance(TerminalConfigHelper)); capabilities = store.add(new TerminalCapabilityStore()); if (!isWindows) {