Skip to content

Commit c9cf90b

Browse files
alexdimaalexdima
committed
Adopt Promise.timeout => TPromise.timeout
1 parent 86370a5 commit c9cf90b

23 files changed

Lines changed: 58 additions & 55 deletions

File tree

‎src/vs/base/browser/builder.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict';
66

77
import 'vs/css!./builder';
8-
import {Promise} from 'vs/base/common/winjs.base';
8+
import {TPromise} from 'vs/base/common/winjs.base';
99
import types = require('vs/base/common/types');
1010
import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
1111
import strings = require('vs/base/common/strings');
@@ -1306,7 +1306,7 @@ export class Builder implements IDisposable {
13061306
// Cancel any pending showDelayed() invocation
13071307
this.cancelVisibilityPromise();
13081308

1309-
let promise = Promise.timeout(delay);
1309+
let promise = TPromise.timeout(delay);
13101310
this.setProperty(VISIBILITY_BINDING_ID, promise);
13111311

13121312
promise.done(() => {
@@ -1360,7 +1360,7 @@ export class Builder implements IDisposable {
13601360
}
13611361

13621362
private cancelVisibilityPromise(): void {
1363-
let promise: Promise = this.getProperty(VISIBILITY_BINDING_ID);
1363+
let promise: TPromise<void> = this.getProperty(VISIBILITY_BINDING_ID);
13641364
if (promise) {
13651365
promise.cancel();
13661366
this.removeProperty(VISIBILITY_BINDING_ID);

‎src/vs/base/browser/ui/messagelist/messageList.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import 'vs/css!./messageList';
99
import nls = require('vs/nls');
10-
import {Promise} from 'vs/base/common/winjs.base';
10+
import {TPromise} from 'vs/base/common/winjs.base';
1111
import {Builder, withElementById, $} from 'vs/base/browser/builder';
1212
import DOM = require('vs/base/browser/dom');
1313
import errors = require('vs/base/common/errors');
@@ -56,7 +56,7 @@ export class MessageList {
5656
private static DEFAULT_MAX_MESSAGE_LENGTH = 500;
5757

5858
private messages: IMessageEntry[];
59-
private messageListPurger: Promise;
59+
private messageListPurger: TPromise<void>;
6060
private messageListContainer: Builder;
6161

6262
private containerElementId: string;
@@ -225,7 +225,7 @@ export class MessageList {
225225
this.usageLogger.publicLog('workbenchActionExecuted', { id: action.id, from: 'message' });
226226
}
227227

228-
(action.run() || Promise.as(null))
228+
(action.run() || TPromise.as(null))
229229
.then(null, error => this.showMessage(Severity.Error, error))
230230
.done((r) => {
231231
if (r === false) {
@@ -269,7 +269,7 @@ export class MessageList {
269269
new Action('close.message.action', nls.localize('close', "Close"), null, true, () => {
270270
this.hideMessage(message.text); // hide all matching the text since there may be duplicates
271271

272-
return Promise.as(true);
272+
return TPromise.as(true);
273273
})
274274
];
275275
}
@@ -366,7 +366,7 @@ export class MessageList {
366366
}
367367

368368
// Configure
369-
this.messageListPurger = Promise.timeout(this.options.purgeInterval).then(() => {
369+
this.messageListPurger = TPromise.timeout(this.options.purgeInterval).then(() => {
370370
let needsUpdate = false;
371371
let counter = 0;
372372

‎src/vs/base/browser/ui/progressbar/progressbar.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'use strict';
77

88
import 'vs/css!./progressbar';
9-
import {Promise, ValueCallback} from 'vs/base/common/winjs.base';
9+
import {TPromise, ValueCallback} from 'vs/base/common/winjs.base';
1010
import assert = require('vs/base/common/assert');
1111
import browser = require('vs/base/browser/browser');
1212
import {Builder, $} from 'vs/base/browser/builder';
@@ -99,7 +99,7 @@ export class ProgressBar {
9999
this.bit.style.width = 'inherit';
100100

101101
if (delayed) {
102-
Promise.timeout(200).then(() => this.off());
102+
TPromise.timeout(200).then(() => this.off());
103103
} else {
104104
this.off();
105105
}
@@ -109,7 +109,7 @@ export class ProgressBar {
109109
else {
110110
this.bit.style.opacity = '0';
111111
if (delayed) {
112-
Promise.timeout(200).then(() => this.off());
112+
TPromise.timeout(200).then(() => this.off());
113113
} else {
114114
this.off();
115115
}
@@ -148,7 +148,7 @@ export class ProgressBar {
148148

149149
let counter = 0;
150150
let animationFn: () => void = () => {
151-
Promise.timeout(50).then(() => {
151+
TPromise.timeout(50).then(() => {
152152

153153
// Return if another manualInfinite() call was made
154154
if (currentProgressToken !== this.currentProgressToken) {

‎src/vs/base/common/async.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ export class PeriodThrottledDelayer<T> extends ThrottledDelayer<T> {
238238
return super.trigger(() => {
239239
return this.periodThrottler.queue(() => {
240240
return Promise.join([
241-
Promise.timeout(this.minimumPeriod),
241+
TPromise.timeout(this.minimumPeriod),
242242
promiseFactory()
243243
]).then(r => r[1]);
244244
});

‎src/vs/base/common/winjs.base.d.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ export declare class Promise {
2727
static join(promises:{[name:string]:Promise;}):Promise;
2828
static join(promises:Promise[]):Promise;
2929
static any(promises:Promise[]):Promise;
30-
static timeout(delay:number):Promise;
30+
31+
// commented out to speed up adoption of TPromise
32+
// static timeout(delay:number):Promise;
33+
3134
static wrapError(error:any):Promise;
3235
static is(value: any): boolean;
3336
static addEventListener(type:string, fn:EventCallback):void;

‎src/vs/base/parts/quickopen/browser/quickOpenWidget.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import 'vs/css!./quickopen';
88
import nls = require('vs/nls');
9-
import {Promise} from 'vs/base/common/winjs.base';
9+
import {TPromise} from 'vs/base/common/winjs.base';
1010
import platform = require('vs/base/common/platform');
1111
import browser = require('vs/base/browser/browser');
1212
import {EventType} from 'vs/base/common/events';
@@ -589,7 +589,7 @@ export class QuickOpenWidget implements IModelProvider {
589589
});
590590
}
591591

592-
private setTreeHeightForInput(input: IModel<any>): Promise {
592+
private setTreeHeightForInput(input: IModel<any>): TPromise<void> {
593593
let newHeight = this.getHeight(input) + 'px';
594594
let oldHeight = this.treeContainer.style('height');
595595

@@ -598,11 +598,11 @@ export class QuickOpenWidget implements IModelProvider {
598598

599599
// Return instantly if we don't CSS transition or the height is the same as old
600600
if (!this.treeContainer.hasClass('transition') || oldHeight === newHeight) {
601-
return Promise.as(null);
601+
return TPromise.as(null);
602602
}
603603

604604
// Otherwise return promise that only fulfills when the CSS transition has ended
605-
return new Promise((c, e) => {
605+
return new TPromise<void>((c, e) => {
606606
let unbind: IDisposable[] = [];
607607
let complete = false;
608608
let completeHandler = () => {
@@ -821,7 +821,7 @@ export class QuickOpenWidget implements IModelProvider {
821821
}
822822

823823
this.isLoosingFocus = true;
824-
Promise.timeout(0).then(() => {
824+
TPromise.timeout(0).then(() => {
825825
if (!this.isLoosingFocus) {
826826
return;
827827
}

‎src/vs/base/parts/tree/browser/treeView.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ export class TreeView extends HeightMap implements IScrollable {
888888
var viewItem = this.items[item.id];
889889

890890
if (viewItem) {
891-
viewItem.loadingPromise = WinJS.Promise.timeout(TreeView.LOADING_DECORATION_DELAY).then(() => {
891+
viewItem.loadingPromise = WinJS.TPromise.timeout(TreeView.LOADING_DECORATION_DELAY).then(() => {
892892
viewItem.loadingPromise = null;
893893
viewItem.loading = true;
894894
});
@@ -1500,7 +1500,7 @@ export class TreeView extends HeightMap implements IScrollable {
15001500
}
15011501
}
15021502

1503-
this.currentDropPromise = WinJS.Promise.timeout(500).then(() => {
1503+
this.currentDropPromise = WinJS.TPromise.timeout(500).then(() => {
15041504
return this.context.tree.expand(this.currentDropElement).then(() => {
15051505
this.shouldInvalidateDropReaction = true;
15061506
});

‎src/vs/base/parts/tree/test/browser/treeModel.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,7 @@ suite('TreeModel - Dynamic data model', () => {
13471347
dataModel.addChild('father', 'brother');
13481348
dataModel.addChild('mother', 'sister');
13491349

1350-
dataModel.promiseFactory = () => { return WinJS.Promise.timeout(0); };
1350+
dataModel.promiseFactory = () => { return WinJS.TPromise.timeout(0); };
13511351

13521352
var getTimes = 0;
13531353
var gotTimes = 0;
@@ -1618,7 +1618,7 @@ suite('TreeModel - Dynamic data model', () => {
16181618
model.setInput('root').then(() => {
16191619

16201620
// delay expansions and refreshes
1621-
dataModel.promiseFactory = () => { return WinJS.Promise.timeout(0); };
1621+
dataModel.promiseFactory = () => { return WinJS.TPromise.timeout(0); };
16221622

16231623
var promises: WinJS.Promise[] = [];
16241624

@@ -1671,9 +1671,9 @@ suite('TreeModel - bugs', () => {
16711671
let listeners = <any> [];
16721672

16731673
// helpers
1674-
var getGetRootChildren = (children: string[], timeout = 0) => () => WinJS.Promise.timeout(timeout).then(() => children);
1674+
var getGetRootChildren = (children: string[], timeout = 0) => () => WinJS.TPromise.timeout(timeout).then(() => children);
16751675
var getRootChildren = getGetRootChildren(['homer', 'bart', 'lisa', 'marge', 'maggie'], 0);
1676-
var getGetBartChildren = (timeout = 0) => () => WinJS.Promise.timeout(timeout).then(() => ['milhouse', 'nelson']);
1676+
var getGetBartChildren = (timeout = 0) => () => WinJS.TPromise.timeout(timeout).then(() => ['milhouse', 'nelson']);
16771677
var getBartChildren = getGetBartChildren(0);
16781678

16791679
// item expanding should not exist!

‎src/vs/base/test/browser/builder.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as assert from 'assert';
88
import { Build, Builder, MultiBuilder, Binding, Dimension, Position, Box, $ } from 'vs/base/browser/builder';
99
import * as Types from 'vs/base/common/types';
1010
import * as DomUtils from 'vs/base/browser/dom';
11-
import { Promise } from 'vs/base/common/winjs.base';
11+
import { TPromise } from 'vs/base/common/winjs.base';
1212
import { IDisposable } from 'vs/base/common/lifecycle';
1313

1414
var withElementsBySelector = function(selector: string, offdom: boolean = false) {
@@ -810,7 +810,7 @@ suite("Builder", () => {
810810
b.showDelayed(20);
811811
assert(b.hasClass("hidden"));
812812

813-
Promise.timeout(30).then(function() {
813+
TPromise.timeout(30).then(function() {
814814
assert(!b.hasClass("hidden"));
815815
done();
816816
});
@@ -825,7 +825,7 @@ suite("Builder", () => {
825825

826826
b.hide(); // Should cancel the visibility promise
827827

828-
Promise.timeout(30).then(function() {
828+
TPromise.timeout(30).then(function() {
829829
assert(b.hasClass("hidden"));
830830
done();
831831
});

‎src/vs/base/test/common/async.test.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict';
66

77
import * as assert from 'assert';
8-
import { Promise } from 'vs/base/common/winjs.base';
8+
import { Promise, TPromise } from 'vs/base/common/winjs.base';
99
import Async = require('vs/base/common/async');
1010

1111
suite('Async', () => {
@@ -29,7 +29,7 @@ suite('Async', () => {
2929
test('Throttler', function(done) {
3030
var count = 0;
3131
var factory = () => {
32-
return Promise.timeout(0).then(() => {
32+
return TPromise.timeout(0).then(() => {
3333
return ++count;
3434
});
3535
};
@@ -56,7 +56,7 @@ suite('Async', () => {
5656
test('Throttler - cancel should not cancel other promises', function(done) {
5757
var count = 0;
5858
var factory = () => {
59-
return Promise.timeout(0).then(() => {
59+
return TPromise.timeout(0).then(() => {
6060
return ++count;
6161
});
6262
};
@@ -77,7 +77,7 @@ suite('Async', () => {
7777
test('Throttler - cancel the first queued promise should not cancel other promises', function(done) {
7878
var count = 0;
7979
var factory = () => {
80-
return Promise.timeout(0).then(() => {
80+
return TPromise.timeout(0).then(() => {
8181
return ++count;
8282
});
8383
};
@@ -98,7 +98,7 @@ suite('Async', () => {
9898
test('Throttler - cancel in the middle should not cancel other promises', function(done) {
9999
var count = 0;
100100
var factory = () => {
101-
return Promise.timeout(0).then(() => {
101+
return TPromise.timeout(0).then(() => {
102102
return ++count;
103103
});
104104
};
@@ -118,7 +118,7 @@ suite('Async', () => {
118118

119119
test('Throttler - last factory should be the one getting called', function(done) {
120120
var factoryFactory = (n: number) => () => {
121-
return Promise.timeout(0).then(() => n);
121+
return TPromise.timeout(0).then(() => n);
122122
};
123123

124124
var throttler = new Async.Throttler();
@@ -135,7 +135,7 @@ suite('Async', () => {
135135
test('Throttler - progress should work', function(done) {
136136
var order = 0;
137137
var factory = () => new Promise((c, e, p) => {
138-
Promise.timeout(0).done(() => {
138+
TPromise.timeout(0).done(() => {
139139
p(order++);
140140
c(true);
141141
});
@@ -308,7 +308,7 @@ suite('Async', () => {
308308
test('Delayer - progress should work', function(done) {
309309
var order = 0;
310310
var factory = () => new Promise((c, e, p) => {
311-
Promise.timeout(0).done(() => {
311+
TPromise.timeout(0).done(() => {
312312
p(order++);
313313
c(true);
314314
});
@@ -333,7 +333,7 @@ suite('Async', () => {
333333
test('ThrottledDelayer - progress should work', function(done) {
334334
var order = 0;
335335
var factory = () => new Promise((c, e, p) => {
336-
Promise.timeout(0).done(() => {
336+
TPromise.timeout(0).done(() => {
337337
p(order++);
338338
c(true);
339339
});
@@ -403,7 +403,7 @@ suite('Async', () => {
403403

404404
test('Limiter - async', function(done) {
405405
var factoryFactory = (n: number) => () => {
406-
return Promise.timeout(0).then(() => n);
406+
return TPromise.timeout(0).then(() => n);
407407
};
408408

409409
var limiter = new Async.Limiter(1);
@@ -429,7 +429,7 @@ suite('Async', () => {
429429
var factoryFactory = (n: number) => () => {
430430
activePromises++;
431431
assert(activePromises < 6);
432-
return Promise.timeout(0).then(() => { activePromises--; return n; });
432+
return TPromise.timeout(0).then(() => { activePromises--; return n; });
433433
};
434434

435435
var limiter = new Async.Limiter(5);

0 commit comments

Comments
 (0)