diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts index f606904b41c63..dcfc52dfb3e6d 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts @@ -660,7 +660,7 @@ export interface ITerminalInstance extends IBaseTerminalInstance { onDidBlur: Event; onDidInputData: Event; onDidChangeSelection: Event; - onDidRunText: Event; + onDidExecuteText: Event; onDidChangeTarget: Event; onDidSendText: Event; diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts index 1f27f0d74186e..1accf460115fd 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts @@ -326,8 +326,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { readonly onRequestAddInstanceToGroup = this._onRequestAddInstanceToGroup.event; private readonly _onDidChangeHasChildProcesses = this._register(new Emitter()); readonly onDidChangeHasChildProcesses = this._onDidChangeHasChildProcesses.event; - private readonly _onDidRunText = this._register(new Emitter()); - readonly onDidRunText = this._onDidRunText.event; + private readonly _onDidExecuteText = this._register(new Emitter()); + readonly onDidExecuteText = this._onDidExecuteText.event; private readonly _onDidChangeTarget = this._register(new Emitter()); readonly onDidChangeTarget = this._onDidChangeTarget.event; private readonly _onDidSendText = this._register(new Emitter()); @@ -1216,7 +1216,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { this._onDidInputData.fire(this); this._onDidSendText.fire(text); this.xterm?.scrollToBottom(); - this._onDidRunText.fire(); + if (shouldExecute) { + this._onDidExecuteText.fire(); + } } async sendPath(originalPath: string | URI, shouldExecute: boolean): Promise { 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 2b9b5946db1af..7790ed30a3cda 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 @@ -85,7 +85,7 @@ export class TerminalAccessibleViewContribution extends Disposable implements IT this.show(); return true; }, TerminalContextKeys.focus)); - this._register(_instance.onDidRunText(() => { + this._register(_instance.onDidExecuteText(() => { const focusAfterRun = _configurationService.getValue(TerminalSettingId.FocusAfterRun); if (focusAfterRun === 'terminal') { _instance.focus(true); diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts index 76856dc92ffb4..761041e20eec0 100644 --- a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts +++ b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts @@ -24,7 +24,7 @@ export class TerminalAccessibleBufferProvider extends DisposableStore implements readonly onDidRequestClearLastProvider = this._onDidRequestClearProvider.event; private _focusedInstance: ITerminalInstance | undefined; constructor( - private readonly _instance: Pick, + private readonly _instance: Pick, private _bufferTracker: BufferContentTracker, customHelp: () => string, @IModelService _modelService: IModelService,