Skip to content

V
vscode

xxadev / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 84a884a9 编写于 作者: D Daniel Imms
浏览文件
操作

Return after done(e) 

Part of #95945
上级 78f299ee
隐藏空白更改
内联 并排
Showing with 24 addition and 0 deletion
extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
浏览文件 @ 84a884a9
...@@ -27,6 +27,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -27,6 +27,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term); equal(terminal, term);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
terminal.dispose(); terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done())); disposables.push(window.onDidCloseTerminal(() => done()));
...@@ -41,6 +42,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -41,6 +42,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term); equal(terminal, term);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
let data = ''; let data = '';
disposables.push(window.onDidWriteTerminalData(e => { disposables.push(window.onDidWriteTerminalData(e => {
...@@ -48,6 +50,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -48,6 +50,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, e.terminal); equal(terminal, e.terminal);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
data += e.data; data += e.data;
if (data.indexOf(expected) !== 0) { if (data.indexOf(expected) !== 0) {
...@@ -80,6 +83,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -80,6 +83,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term); equal(terminal, term);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
terminal.dispose(); terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done())); disposables.push(window.onDidCloseTerminal(() => done()));
...@@ -93,12 +97,14 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -93,12 +97,14 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term); equal(terminal, term);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
terminal.processId.then(id => { terminal.processId.then(id => {
try { try {
ok(id && id > 0); ok(id && id > 0);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
terminal.dispose(); terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done())); disposables.push(window.onDidCloseTerminal(() => done()));
...@@ -113,6 +119,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -113,6 +119,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term); equal(terminal, term);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
terminal.dispose(); terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done())); disposables.push(window.onDidCloseTerminal(() => done()));
...@@ -122,6 +129,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -122,6 +129,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal.name, 'a'); equal(terminal.name, 'a');
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
}); });
...@@ -131,6 +139,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -131,6 +139,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term); equal(terminal, term);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
terminal.dispose(); terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done())); disposables.push(window.onDidCloseTerminal(() => done()));
...@@ -146,6 +155,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -146,6 +155,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
throws(() => (<any>terminal.creationOptions).name = 'bad', 'creationOptions should be readonly at runtime'); throws(() => (<any>terminal.creationOptions).name = 'bad', 'creationOptions should be readonly at runtime');
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
}); });
...@@ -155,6 +165,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -155,6 +165,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(term.name, 'b'); equal(term.name, 'b');
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
disposables.push(window.onDidCloseTerminal(() => done())); disposables.push(window.onDidCloseTerminal(() => done()));
terminal.dispose(); terminal.dispose();
...@@ -168,6 +179,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -168,6 +179,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(term, terminal); equal(term, terminal);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
disposables.push(window.onDidCloseTerminal(t => { disposables.push(window.onDidCloseTerminal(t => {
try { try {
...@@ -263,6 +275,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -263,6 +275,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
ok(window.terminals.indexOf(terminal) !== -1); ok(window.terminals.indexOf(terminal) !== -1);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
disposables.push(window.onDidCloseTerminal(() => { disposables.push(window.onDidCloseTerminal(() => {
// reg3.dispose(); // reg3.dispose();
...@@ -360,6 +373,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -360,6 +373,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(term.name, 'c'); equal(term.name, 'c');
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
disposables.push(window.onDidCloseTerminal(() => done())); disposables.push(window.onDidCloseTerminal(() => done()));
term.dispose(); term.dispose();
...@@ -425,6 +439,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -425,6 +439,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term); equal(terminal, term);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
term.show(); term.show();
disposables.push(window.onDidChangeTerminalDimensions(e => { disposables.push(window.onDidChangeTerminalDimensions(e => {
...@@ -440,6 +455,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -440,6 +455,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(e.terminal, terminal); equal(e.terminal, terminal);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
disposables.push(window.onDidCloseTerminal(() => done())); disposables.push(window.onDidCloseTerminal(() => done()));
terminal.dispose(); terminal.dispose();
...@@ -464,6 +480,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -464,6 +480,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal.exitStatus, undefined); equal(terminal.exitStatus, undefined);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
disposables.push(window.onDidCloseTerminal(t => { disposables.push(window.onDidCloseTerminal(t => {
try { try {
...@@ -494,6 +511,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -494,6 +511,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal.exitStatus, undefined); equal(terminal.exitStatus, undefined);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
disposables.push(window.onDidCloseTerminal(t => { disposables.push(window.onDidCloseTerminal(t => {
try { try {
...@@ -524,6 +542,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -524,6 +542,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal.exitStatus, undefined); equal(terminal.exitStatus, undefined);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
disposables.push(window.onDidCloseTerminal(t => { disposables.push(window.onDidCloseTerminal(t => {
try { try {
...@@ -553,6 +572,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -553,6 +572,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term); equal(terminal, term);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
terminal.dispose(); terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done())); disposables.push(window.onDidCloseTerminal(() => done()));
...@@ -588,6 +608,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -588,6 +608,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, e.terminal); equal(terminal, e.terminal);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
// Multiple expected could show up in the same data event // Multiple expected could show up in the same data event
while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) { while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) {
...@@ -633,6 +654,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -633,6 +654,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, e.terminal); equal(terminal, e.terminal);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
// Multiple expected could show up in the same data event // Multiple expected could show up in the same data event
while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) { while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) {
...@@ -677,6 +699,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -677,6 +699,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, e.terminal); equal(terminal, e.terminal);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
// Multiple expected could show up in the same data event // Multiple expected could show up in the same data event
while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) { while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) {
...@@ -718,6 +741,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert'; ...@@ -718,6 +741,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, e.terminal); equal(terminal, e.terminal);
} catch (e) { } catch (e) {
done(e); done(e);
return;
} }
// Multiple expected could show up in the same data event // Multiple expected could show up in the same data event
while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) { while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或