Skip to content

check if the text will be executed before firing event #201241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meganrogge merged 3 commits into from
Dec 19, 2023
Merged

check if the text will be executed before firing event #201241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5b980d
fix #199589
meganrogge Dec 19, 2023
292c58a
improve name
meganrogge Dec 19, 2023
fba0b71
one more case
meganrogge Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/terminal/browser/terminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
onDidBlur: Event<ITerminalInstance>;
onDidInputData: Event<ITerminalInstance>;
onDidChangeSelection: Event<ITerminalInstance>;
onDidRunText: Event<void>;
onDidExecuteText: Event<void>;
onDidChangeTarget: Event<TerminalLocation | undefined>;
onDidSendText: Event<string>;

Expand Down
8 changes: 5 additions & 3 deletions src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
readonly onRequestAddInstanceToGroup = this._onRequestAddInstanceToGroup.event;
private readonly _onDidChangeHasChildProcesses = this._register(new Emitter<boolean>());
readonly onDidChangeHasChildProcesses = this._onDidChangeHasChildProcesses.event;
private readonly _onDidRunText = this._register(new Emitter<void>());
readonly onDidRunText = this._onDidRunText.event;
private readonly _onDidExecuteText = this._register(new Emitter<void>());
readonly onDidExecuteText = this._onDidExecuteText.event;
private readonly _onDidChangeTarget = this._register(new Emitter<TerminalLocation | undefined>());
readonly onDidChangeTarget = this._onDidChangeTarget.event;
private readonly _onDidSendText = this._register(new Emitter<string>());
Expand Down Expand Up @@ -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<void> {
Expand Down
2 changes: 1 addition & 1 deletion ...ench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...rkbench/contrib/terminalContrib/accessibility/browser/terminalAccessibleBufferProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class TerminalAccessibleBufferProvider extends DisposableStore implements
readonly onDidRequestClearLastProvider = this._onDidRequestClearProvider.event;
private _focusedInstance: ITerminalInstance | undefined;
constructor(
private readonly _instance: Pick<ITerminalInstance, 'onDidRunText' | 'focus' | 'shellType' | 'capabilities' | 'onDidRequestFocus' | 'resource' | 'onDisposed'>,
private readonly _instance: Pick<ITerminalInstance, 'onDidExecuteText' | 'focus' | 'shellType' | 'capabilities' | 'onDidRequestFocus' | 'resource' | 'onDisposed'>,
private _bufferTracker: BufferContentTracker,
customHelp: () => string,
@IModelService _modelService: IModelService,
Expand Down