Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-26 13:19:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure terminal data is segmented by C and D sequences

Browse Source 
The tests failed because on mac the 633;C and 633;D events both appear in the
same event. The change ensures we match globally on the regex and cleans up
handling of multiple events. This went from failing consistently to passing
consistently on my mac.

Fixes #241592
This commit is contained in:
Daniel Imms
2025-02-23 07:35:37 -08:00
parent 199a1b6c95
commit 55feb94b29
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/vscode-api-tests/src/singlefolder-tests/terminal.shellIntegration.test.ts
View File

@@ -142,7 +142,7 @@ import { assertNoRpc } from '../utils';
await closeTerminalAsync(terminal);
});
test.skip('TerminalShellExecution.read iterables should be available between the start and end execution events', async () => {
test('TerminalShellExecution.read iterables should be available between the start and end execution events', async () => {
const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
const events: string[] = [];
disposables.push(window.onDidStartTerminalShellExecution(() => events.push('start')));
@@ -164,7 +164,7 @@ import { assertNoRpc } from '../utils';
await closeTerminalAsync(terminal);
});
test.skip('TerminalShellExecution.read events should fire with contents of command', async () => {
test('TerminalShellExecution.read events should fire with contents of command', async () => {
const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
const events: string[] = [];
@@ -179,7 +179,7 @@ import { assertNoRpc } from '../utils';
await closeTerminalAsync(terminal);
});
test.skip('TerminalShellExecution.read events should give separate iterables per call', async () => {
test('TerminalShellExecution.read events should give separate iterables per call', async () => {
const { terminal, shellIntegration } = await createTerminalAndWaitForShellIntegration();
const { execution, endEvent } = executeCommandAsync(shellIntegration, 'echo hello');

39
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
View File

@@ -13,7 +13,7 @@ import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scro
import { AutoOpenBarrier, Barrier, Promises, disposableTimeout, timeout } from '../../../../base/common/async.js';
import { Codicon } from '../../../../base/common/codicons.js';
import { debounce } from '../../../../base/common/decorators.js';
import { onUnexpectedError } from '../../../../base/common/errors.js';
import { BugIndicatingError, onUnexpectedError } from '../../../../base/common/errors.js';
import { Emitter, Event } from '../../../../base/common/event.js';
import { KeyCode } from '../../../../base/common/keyCodes.js';
import { ISeparator, template } from '../../../../base/common/labels.js';
@@ -1527,25 +1527,28 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
// consistent form respectively. This must be done here as xterm.js does not currently have
// a listener for when individual data events are parsed, only `onWriteParsed` which fires
// when the write buffer is flushed.
const match = ev.data.match(/(?<seq>\x1b\][16]33;(?:C|D(?:;\d+)?)\x07)/);
const index = match?.index;
if (match?.groups?.seq && index !== undefined) {
const seq = match?.groups?.seq;
if (ev.trackCommit) {
this._writeProcessData(ev.data.substring(0, index));
this._writeProcessData(seq);
ev.writePromise = new Promise<void>(r => this._writeProcessData(ev.data.substring(index + seq.length), r));
} else {
this._writeProcessData(ev.data.substring(0, index));
this._writeProcessData(seq);
this._writeProcessData(ev.data.substring(index + seq.length));
const leadingSegmentedData: string[] = [];
const matches = ev.data.matchAll(/(?<seq>\x1b\][16]33;(?:C|D(?:;\d+)?)\x07)/g);
let i = 0;
for (const match of matches) {
if (match.groups?.seq === undefined) {
throw new BugIndicatingError('seq must be defined');
}
leadingSegmentedData.push(ev.data.substring(i, match.index));
leadingSegmentedData.push(match.groups?.seq ?? '');
i = match.index + match[0].length;
}
const lastData = ev.data.substring(i);
// Write all leading segmented data first, followed by the last data, tracking commit if
// necessary
for (let i = 0; i < leadingSegmentedData.length; i++) {
this._writeProcessData(leadingSegmentedData[i]);
}
if (ev.trackCommit) {
ev.writePromise = new Promise<void>(r => this._writeProcessData(lastData, r));
} else {
if (ev.trackCommit) {
ev.writePromise = new Promise<void>(r => this._writeProcessData(ev.data, r));
} else {
this._writeProcessData(ev.data);
}
this._writeProcessData(lastData);
}
}