diff --git a/src/vs/workbench/api/browser/mainThreadTerminalService.ts b/src/vs/workbench/api/browser/mainThreadTerminalService.ts index de12c271b51..8344b323c7e 100644 --- a/src/vs/workbench/api/browser/mainThreadTerminalService.ts +++ b/src/vs/workbench/api/browser/mainThreadTerminalService.ts @@ -332,7 +332,7 @@ class TerminalDataEventTracker extends Disposable { constructor( private readonly _callback: (id: number, data: string) => void, - @ITerminalService private readonly _terminalService: ITerminalService, + @ITerminalService private readonly _terminalService: ITerminalService ) { super(); diff --git a/src/vs/workbench/contrib/terminal/test/common/terminalDataBuffering.test.ts b/src/vs/workbench/contrib/terminal/test/common/terminalDataBuffering.test.ts index 298923d2c23..70a54735f1f 100644 --- a/src/vs/workbench/contrib/terminal/test/common/terminalDataBuffering.test.ts +++ b/src/vs/workbench/contrib/terminal/test/common/terminalDataBuffering.test.ts @@ -16,95 +16,93 @@ suite('Workbench - TerminalDataBufferer', () => { bufferer = new TerminalDataBufferer(); }); - suite('buffering', () => { - test('start', async () => { - let terminalOnData = new Emitter(); - let counter = 0; - let data: string | undefined; + test('start', async () => { + let terminalOnData = new Emitter(); + let counter = 0; + let data: string | undefined; - bufferer.startBuffering(1, terminalOnData.event, (id, e) => { - counter++; - data = e; - }, 0); + bufferer.startBuffering(1, terminalOnData.event, (id, e) => { + counter++; + data = e; + }, 0); - terminalOnData.fire('1'); - terminalOnData.fire('2'); - terminalOnData.fire('3'); + terminalOnData.fire('1'); + terminalOnData.fire('2'); + terminalOnData.fire('3'); - await wait(5); + await wait(0); - terminalOnData.fire('4'); + terminalOnData.fire('4'); - assert.equal(counter, 1); - assert.equal(data, '123'); + assert.equal(counter, 1); + assert.equal(data, '123'); - await wait(5); + await wait(0); - assert.equal(counter, 2); - assert.equal(data, '4'); - }); + assert.equal(counter, 2); + assert.equal(data, '4'); + }); - test('start 2', async () => { - let terminal1OnData = new Emitter(); - let terminal1Counter = 0; - let terminal1Data: string | undefined; + test('start 2', async () => { + let terminal1OnData = new Emitter(); + let terminal1Counter = 0; + let terminal1Data: string | undefined; - bufferer.startBuffering(1, terminal1OnData.event, (id, e) => { - terminal1Counter++; - terminal1Data = e; - }, 0); + bufferer.startBuffering(1, terminal1OnData.event, (id, e) => { + terminal1Counter++; + terminal1Data = e; + }, 0); - let terminal2OnData = new Emitter(); - let terminal2Counter = 0; - let terminal2Data: string | undefined; + let terminal2OnData = new Emitter(); + let terminal2Counter = 0; + let terminal2Data: string | undefined; - bufferer.startBuffering(2, terminal2OnData.event, (id, e) => { - terminal2Counter++; - terminal2Data = e; - }, 0); + bufferer.startBuffering(2, terminal2OnData.event, (id, e) => { + terminal2Counter++; + terminal2Data = e; + }, 0); - terminal1OnData.fire('1'); - terminal2OnData.fire('4'); - terminal1OnData.fire('2'); - terminal2OnData.fire('5'); - terminal1OnData.fire('3'); - terminal2OnData.fire('6'); - terminal2OnData.fire('7'); + terminal1OnData.fire('1'); + terminal2OnData.fire('4'); + terminal1OnData.fire('2'); + terminal2OnData.fire('5'); + terminal1OnData.fire('3'); + terminal2OnData.fire('6'); + terminal2OnData.fire('7'); - assert.equal(terminal1Counter, 0); - assert.equal(terminal1Data, undefined); - assert.equal(terminal2Counter, 0); - assert.equal(terminal2Data, undefined); + assert.equal(terminal1Counter, 0); + assert.equal(terminal1Data, undefined); + assert.equal(terminal2Counter, 0); + assert.equal(terminal2Data, undefined); - await wait(5); + await wait(5); - assert.equal(terminal1Counter, 1); - assert.equal(terminal1Data, '123'); - assert.equal(terminal2Counter, 1); - assert.equal(terminal2Data, '4567'); - }); + assert.equal(terminal1Counter, 1); + assert.equal(terminal1Data, '123'); + assert.equal(terminal2Counter, 1); + assert.equal(terminal2Data, '4567'); + }); - test('stop', async () => { - let terminalOnData = new Emitter(); - let counter = 0; - let data: string | undefined; + test('stop', async () => { + let terminalOnData = new Emitter(); + let counter = 0; + let data: string | undefined; - bufferer.startBuffering(1, terminalOnData.event, (id, e) => { - counter++; - data = e; - }, 0); + bufferer.startBuffering(1, terminalOnData.event, (id, e) => { + counter++; + data = e; + }, 0); - terminalOnData.fire('1'); - terminalOnData.fire('2'); - terminalOnData.fire('3'); + terminalOnData.fire('1'); + terminalOnData.fire('2'); + terminalOnData.fire('3'); - bufferer.stopBuffering(1); + bufferer.stopBuffering(1); - await wait(5); + await wait(5); - assert.equal(counter, 0); - assert.equal(data, undefined); - }); + assert.equal(counter, 0); + assert.equal(data, undefined); }); test('start 2 stop 1', async () => {