ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-02 01:25:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/test/electron-browser/api/mainThreadDocuments.test.ts
View File

@@ -8,7 +8,7 @@
import * as assert from 'assert';
import { BoundModelReferenceCollection } from 'vs/workbench/api/electron-browser/mainThreadDocuments';
import { TextModel } from 'vs/editor/common/model/textModel';
import { TPromise } from 'vs/base/common/winjs.base';
import { timeout } from 'vs/base/common/async';
suite('BoundModelReferenceCollection', () => {
@@ -29,7 +29,7 @@ suite('BoundModelReferenceCollection', () => {
}
});
return TPromise.timeout(30).then(() => {
return timeout(30).then(() => {
assert.equal(didDispose, true);
});
});