diff --git a/src/vs/base/browser/builder.ts b/src/vs/base/browser/builder.ts index cc2d4d08d0e..86c8fa616ad 100644 --- a/src/vs/base/browser/builder.ts +++ b/src/vs/base/browser/builder.ts @@ -5,7 +5,7 @@ 'use strict'; import 'vs/css!./builder'; -import {Promise} from 'vs/base/common/winjs.base'; +import {TPromise} from 'vs/base/common/winjs.base'; import types = require('vs/base/common/types'); import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; import strings = require('vs/base/common/strings'); @@ -1306,7 +1306,7 @@ export class Builder implements IDisposable { // Cancel any pending showDelayed() invocation this.cancelVisibilityPromise(); - let promise = Promise.timeout(delay); + let promise = TPromise.timeout(delay); this.setProperty(VISIBILITY_BINDING_ID, promise); promise.done(() => { @@ -1360,7 +1360,7 @@ export class Builder implements IDisposable { } private cancelVisibilityPromise(): void { - let promise: Promise = this.getProperty(VISIBILITY_BINDING_ID); + let promise: TPromise = this.getProperty(VISIBILITY_BINDING_ID); if (promise) { promise.cancel(); this.removeProperty(VISIBILITY_BINDING_ID); diff --git a/src/vs/base/browser/ui/messagelist/messageList.ts b/src/vs/base/browser/ui/messagelist/messageList.ts index 5c0dd01642a..67b2db5ecf3 100644 --- a/src/vs/base/browser/ui/messagelist/messageList.ts +++ b/src/vs/base/browser/ui/messagelist/messageList.ts @@ -7,7 +7,7 @@ import 'vs/css!./messageList'; import nls = require('vs/nls'); -import {Promise} from 'vs/base/common/winjs.base'; +import {TPromise} from 'vs/base/common/winjs.base'; import {Builder, withElementById, $} from 'vs/base/browser/builder'; import DOM = require('vs/base/browser/dom'); import errors = require('vs/base/common/errors'); @@ -56,7 +56,7 @@ export class MessageList { private static DEFAULT_MAX_MESSAGE_LENGTH = 500; private messages: IMessageEntry[]; - private messageListPurger: Promise; + private messageListPurger: TPromise; private messageListContainer: Builder; private containerElementId: string; @@ -225,7 +225,7 @@ export class MessageList { this.usageLogger.publicLog('workbenchActionExecuted', { id: action.id, from: 'message' }); } - (action.run() || Promise.as(null)) + (action.run() || TPromise.as(null)) .then(null, error => this.showMessage(Severity.Error, error)) .done((r) => { if (r === false) { @@ -269,7 +269,7 @@ export class MessageList { new Action('close.message.action', nls.localize('close', "Close"), null, true, () => { this.hideMessage(message.text); // hide all matching the text since there may be duplicates - return Promise.as(true); + return TPromise.as(true); }) ]; } @@ -366,7 +366,7 @@ export class MessageList { } // Configure - this.messageListPurger = Promise.timeout(this.options.purgeInterval).then(() => { + this.messageListPurger = TPromise.timeout(this.options.purgeInterval).then(() => { let needsUpdate = false; let counter = 0; diff --git a/src/vs/base/browser/ui/progressbar/progressbar.ts b/src/vs/base/browser/ui/progressbar/progressbar.ts index 7002d64ca74..5e7d29e9f52 100644 --- a/src/vs/base/browser/ui/progressbar/progressbar.ts +++ b/src/vs/base/browser/ui/progressbar/progressbar.ts @@ -6,7 +6,7 @@ 'use strict'; import 'vs/css!./progressbar'; -import {Promise, ValueCallback} from 'vs/base/common/winjs.base'; +import {TPromise, ValueCallback} from 'vs/base/common/winjs.base'; import assert = require('vs/base/common/assert'); import browser = require('vs/base/browser/browser'); import {Builder, $} from 'vs/base/browser/builder'; @@ -99,7 +99,7 @@ export class ProgressBar { this.bit.style.width = 'inherit'; if (delayed) { - Promise.timeout(200).then(() => this.off()); + TPromise.timeout(200).then(() => this.off()); } else { this.off(); } @@ -109,7 +109,7 @@ export class ProgressBar { else { this.bit.style.opacity = '0'; if (delayed) { - Promise.timeout(200).then(() => this.off()); + TPromise.timeout(200).then(() => this.off()); } else { this.off(); } @@ -148,7 +148,7 @@ export class ProgressBar { let counter = 0; let animationFn: () => void = () => { - Promise.timeout(50).then(() => { + TPromise.timeout(50).then(() => { // Return if another manualInfinite() call was made if (currentProgressToken !== this.currentProgressToken) { diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts index 9eadde4da9e..f636836fe04 100644 --- a/src/vs/base/common/async.ts +++ b/src/vs/base/common/async.ts @@ -238,7 +238,7 @@ export class PeriodThrottledDelayer extends ThrottledDelayer { return super.trigger(() => { return this.periodThrottler.queue(() => { return Promise.join([ - Promise.timeout(this.minimumPeriod), + TPromise.timeout(this.minimumPeriod), promiseFactory() ]).then(r => r[1]); }); diff --git a/src/vs/base/common/winjs.base.d.ts b/src/vs/base/common/winjs.base.d.ts index 3e6b024dc70..77b5f773a0e 100644 --- a/src/vs/base/common/winjs.base.d.ts +++ b/src/vs/base/common/winjs.base.d.ts @@ -27,7 +27,10 @@ export declare class Promise { static join(promises:{[name:string]:Promise;}):Promise; static join(promises:Promise[]):Promise; static any(promises:Promise[]):Promise; - static timeout(delay:number):Promise; + + // commented out to speed up adoption of TPromise + // static timeout(delay:number):Promise; + static wrapError(error:any):Promise; static is(value: any): boolean; static addEventListener(type:string, fn:EventCallback):void; diff --git a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts index c7fa486a229..a6e92d2b468 100644 --- a/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts +++ b/src/vs/base/parts/quickopen/browser/quickOpenWidget.ts @@ -6,7 +6,7 @@ import 'vs/css!./quickopen'; import nls = require('vs/nls'); -import {Promise} from 'vs/base/common/winjs.base'; +import {TPromise} from 'vs/base/common/winjs.base'; import platform = require('vs/base/common/platform'); import browser = require('vs/base/browser/browser'); import {EventType} from 'vs/base/common/events'; @@ -589,7 +589,7 @@ export class QuickOpenWidget implements IModelProvider { }); } - private setTreeHeightForInput(input: IModel): Promise { + private setTreeHeightForInput(input: IModel): TPromise { let newHeight = this.getHeight(input) + 'px'; let oldHeight = this.treeContainer.style('height'); @@ -598,11 +598,11 @@ export class QuickOpenWidget implements IModelProvider { // Return instantly if we don't CSS transition or the height is the same as old if (!this.treeContainer.hasClass('transition') || oldHeight === newHeight) { - return Promise.as(null); + return TPromise.as(null); } // Otherwise return promise that only fulfills when the CSS transition has ended - return new Promise((c, e) => { + return new TPromise((c, e) => { let unbind: IDisposable[] = []; let complete = false; let completeHandler = () => { @@ -821,7 +821,7 @@ export class QuickOpenWidget implements IModelProvider { } this.isLoosingFocus = true; - Promise.timeout(0).then(() => { + TPromise.timeout(0).then(() => { if (!this.isLoosingFocus) { return; } diff --git a/src/vs/base/parts/tree/browser/treeView.ts b/src/vs/base/parts/tree/browser/treeView.ts index 06adef57e80..2156ca958ed 100644 --- a/src/vs/base/parts/tree/browser/treeView.ts +++ b/src/vs/base/parts/tree/browser/treeView.ts @@ -888,7 +888,7 @@ export class TreeView extends HeightMap implements IScrollable { var viewItem = this.items[item.id]; if (viewItem) { - viewItem.loadingPromise = WinJS.Promise.timeout(TreeView.LOADING_DECORATION_DELAY).then(() => { + viewItem.loadingPromise = WinJS.TPromise.timeout(TreeView.LOADING_DECORATION_DELAY).then(() => { viewItem.loadingPromise = null; viewItem.loading = true; }); @@ -1500,7 +1500,7 @@ export class TreeView extends HeightMap implements IScrollable { } } - this.currentDropPromise = WinJS.Promise.timeout(500).then(() => { + this.currentDropPromise = WinJS.TPromise.timeout(500).then(() => { return this.context.tree.expand(this.currentDropElement).then(() => { this.shouldInvalidateDropReaction = true; }); diff --git a/src/vs/base/parts/tree/test/browser/treeModel.test.ts b/src/vs/base/parts/tree/test/browser/treeModel.test.ts index c13eb21d694..bdd57df3f85 100644 --- a/src/vs/base/parts/tree/test/browser/treeModel.test.ts +++ b/src/vs/base/parts/tree/test/browser/treeModel.test.ts @@ -1347,7 +1347,7 @@ suite('TreeModel - Dynamic data model', () => { dataModel.addChild('father', 'brother'); dataModel.addChild('mother', 'sister'); - dataModel.promiseFactory = () => { return WinJS.Promise.timeout(0); }; + dataModel.promiseFactory = () => { return WinJS.TPromise.timeout(0); }; var getTimes = 0; var gotTimes = 0; @@ -1618,7 +1618,7 @@ suite('TreeModel - Dynamic data model', () => { model.setInput('root').then(() => { // delay expansions and refreshes - dataModel.promiseFactory = () => { return WinJS.Promise.timeout(0); }; + dataModel.promiseFactory = () => { return WinJS.TPromise.timeout(0); }; var promises: WinJS.Promise[] = []; @@ -1671,9 +1671,9 @@ suite('TreeModel - bugs', () => { let listeners = []; // helpers - var getGetRootChildren = (children: string[], timeout = 0) => () => WinJS.Promise.timeout(timeout).then(() => children); + var getGetRootChildren = (children: string[], timeout = 0) => () => WinJS.TPromise.timeout(timeout).then(() => children); var getRootChildren = getGetRootChildren(['homer', 'bart', 'lisa', 'marge', 'maggie'], 0); - var getGetBartChildren = (timeout = 0) => () => WinJS.Promise.timeout(timeout).then(() => ['milhouse', 'nelson']); + var getGetBartChildren = (timeout = 0) => () => WinJS.TPromise.timeout(timeout).then(() => ['milhouse', 'nelson']); var getBartChildren = getGetBartChildren(0); // item expanding should not exist! diff --git a/src/vs/base/test/browser/builder.test.ts b/src/vs/base/test/browser/builder.test.ts index b71d475b7a2..b170a971647 100644 --- a/src/vs/base/test/browser/builder.test.ts +++ b/src/vs/base/test/browser/builder.test.ts @@ -8,7 +8,7 @@ import * as assert from 'assert'; import { Build, Builder, MultiBuilder, Binding, Dimension, Position, Box, $ } from 'vs/base/browser/builder'; import * as Types from 'vs/base/common/types'; import * as DomUtils from 'vs/base/browser/dom'; -import { Promise } from 'vs/base/common/winjs.base'; +import { TPromise } from 'vs/base/common/winjs.base'; import { IDisposable } from 'vs/base/common/lifecycle'; var withElementsBySelector = function(selector: string, offdom: boolean = false) { @@ -810,7 +810,7 @@ suite("Builder", () => { b.showDelayed(20); assert(b.hasClass("hidden")); - Promise.timeout(30).then(function() { + TPromise.timeout(30).then(function() { assert(!b.hasClass("hidden")); done(); }); @@ -825,7 +825,7 @@ suite("Builder", () => { b.hide(); // Should cancel the visibility promise - Promise.timeout(30).then(function() { + TPromise.timeout(30).then(function() { assert(b.hasClass("hidden")); done(); }); diff --git a/src/vs/base/test/common/async.test.ts b/src/vs/base/test/common/async.test.ts index 112c94f4f33..c3ffc58f554 100644 --- a/src/vs/base/test/common/async.test.ts +++ b/src/vs/base/test/common/async.test.ts @@ -5,7 +5,7 @@ 'use strict'; import * as assert from 'assert'; -import { Promise } from 'vs/base/common/winjs.base'; +import { Promise, TPromise } from 'vs/base/common/winjs.base'; import Async = require('vs/base/common/async'); suite('Async', () => { @@ -29,7 +29,7 @@ suite('Async', () => { test('Throttler', function(done) { var count = 0; var factory = () => { - return Promise.timeout(0).then(() => { + return TPromise.timeout(0).then(() => { return ++count; }); }; @@ -56,7 +56,7 @@ suite('Async', () => { test('Throttler - cancel should not cancel other promises', function(done) { var count = 0; var factory = () => { - return Promise.timeout(0).then(() => { + return TPromise.timeout(0).then(() => { return ++count; }); }; @@ -77,7 +77,7 @@ suite('Async', () => { test('Throttler - cancel the first queued promise should not cancel other promises', function(done) { var count = 0; var factory = () => { - return Promise.timeout(0).then(() => { + return TPromise.timeout(0).then(() => { return ++count; }); }; @@ -98,7 +98,7 @@ suite('Async', () => { test('Throttler - cancel in the middle should not cancel other promises', function(done) { var count = 0; var factory = () => { - return Promise.timeout(0).then(() => { + return TPromise.timeout(0).then(() => { return ++count; }); }; @@ -118,7 +118,7 @@ suite('Async', () => { test('Throttler - last factory should be the one getting called', function(done) { var factoryFactory = (n: number) => () => { - return Promise.timeout(0).then(() => n); + return TPromise.timeout(0).then(() => n); }; var throttler = new Async.Throttler(); @@ -135,7 +135,7 @@ suite('Async', () => { test('Throttler - progress should work', function(done) { var order = 0; var factory = () => new Promise((c, e, p) => { - Promise.timeout(0).done(() => { + TPromise.timeout(0).done(() => { p(order++); c(true); }); @@ -308,7 +308,7 @@ suite('Async', () => { test('Delayer - progress should work', function(done) { var order = 0; var factory = () => new Promise((c, e, p) => { - Promise.timeout(0).done(() => { + TPromise.timeout(0).done(() => { p(order++); c(true); }); @@ -333,7 +333,7 @@ suite('Async', () => { test('ThrottledDelayer - progress should work', function(done) { var order = 0; var factory = () => new Promise((c, e, p) => { - Promise.timeout(0).done(() => { + TPromise.timeout(0).done(() => { p(order++); c(true); }); @@ -403,7 +403,7 @@ suite('Async', () => { test('Limiter - async', function(done) { var factoryFactory = (n: number) => () => { - return Promise.timeout(0).then(() => n); + return TPromise.timeout(0).then(() => n); }; var limiter = new Async.Limiter(1); @@ -429,7 +429,7 @@ suite('Async', () => { var factoryFactory = (n: number) => () => { activePromises++; assert(activePromises < 6); - return Promise.timeout(0).then(() => { activePromises--; return n; }); + return TPromise.timeout(0).then(() => { activePromises--; return n; }); }; var limiter = new Async.Limiter(5); diff --git a/src/vs/base/test/node/service/testService.ts b/src/vs/base/test/node/service/testService.ts index f4ca6626756..ac743a9e9ea 100644 --- a/src/vs/base/test/node/service/testService.ts +++ b/src/vs/base/test/node/service/testService.ts @@ -15,7 +15,7 @@ export class TestService { } public cancelMe(): winjs.TPromise { - return winjs.Promise.timeout(100).then(() => { + return winjs.TPromise.timeout(100).then(() => { return true; }); } diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index 096c92d689a..83bc723df89 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -587,7 +587,7 @@ export class ChangeEncodingAction extends Action { return; } - return Promise.timeout(50 /* quick open is sensitive to being opened so soon after another */).then(() => { + return TPromise.timeout(50 /* quick open is sensitive to being opened so soon after another */).then(() => { let isReopenWithEncoding = (action === reopenWithEncodingPick); return this.configurationService.loadConfiguration().then((configuration: IFilesConfiguration) => { diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index 13b75339a57..fc576c307b9 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -446,7 +446,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe }); // Progress if task takes a long time - Promise.timeout(800).then(() => { + TPromise.timeout(800).then(() => { if (!picksPromiseDone && this.currentPickerToken === currentPickerToken) { this.pickOpenWidget.getProgressBar().infinite().getContainer().show(); } @@ -663,7 +663,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe this.previousActiveHandlerDescriptor = handlerDescriptor; // Progress if task takes a long time - Promise.timeout(handlerDescriptor && handlerDescriptor.instantProgress ? 0 : 800).then(() => { + TPromise.timeout(handlerDescriptor && handlerDescriptor.instantProgress ? 0 : 800).then(() => { if (!resultPromiseDone && currentResultToken === this.currentResultToken) { this.quickOpenWidget.getProgressBar().infinite().getContainer().show(); } diff --git a/src/vs/workbench/common/editor/textEditorModel.ts b/src/vs/workbench/common/editor/textEditorModel.ts index 4fdcdb1027d..c036d3c5bc7 100644 --- a/src/vs/workbench/common/editor/textEditorModel.ts +++ b/src/vs/workbench/common/editor/textEditorModel.ts @@ -62,7 +62,7 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd let firstLineText = this.getFirstLineText(value); // To avoid flickering, give the mode at most 50ms to load. If the mode doesn't load in 50ms, proceed creating the model with a mode promise - return Promise.any([Promise.timeout(50), this.getOrCreateMode(this.modeService, mime, firstLineText)]).then(() => { + return Promise.any([TPromise.timeout(50), this.getOrCreateMode(this.modeService, mime, firstLineText)]).then(() => { let model = this.modelService.createModel(value, this.getOrCreateMode(this.modeService, mime, firstLineText), resource); this.createdEditorModel = true; diff --git a/src/vs/workbench/parts/files/browser/fileActions.ts b/src/vs/workbench/parts/files/browser/fileActions.ts index 395d0ef12e0..25ce7f06687 100644 --- a/src/vs/workbench/parts/files/browser/fileActions.ts +++ b/src/vs/workbench/parts/files/browser/fileActions.ts @@ -529,7 +529,7 @@ export abstract class BaseGlobalNewAction extends Action { public run(): Promise { return this.viewletService.openViewlet(Files.VIEWLET_ID, true).then((viewlet) => { - return Promise.timeout(100).then(() => { // use a timeout to prevent the explorer from revealing the active file + return TPromise.timeout(100).then(() => { // use a timeout to prevent the explorer from revealing the active file viewlet.focus(); let explorer = viewlet; diff --git a/src/vs/workbench/parts/files/browser/views/explorerView.ts b/src/vs/workbench/parts/files/browser/views/explorerView.ts index 0382db30348..bb991cd6308 100644 --- a/src/vs/workbench/parts/files/browser/views/explorerView.ts +++ b/src/vs/workbench/parts/files/browser/views/explorerView.ts @@ -490,7 +490,7 @@ export class ExplorerView extends CollapsibleViewletView { // Check if an explorer refresh is necessary (delayed to give internal events a chance to react first) // Note: there is no guarantee when the internal events are fired vs real ones. Code has to deal with the fact that one might // be fired first over the other or not at all. - Promise.timeout(ExplorerView.EXPLORER_FILE_CHANGES_REACT_DELAY).then(() => { + TPromise.timeout(ExplorerView.EXPLORER_FILE_CHANGES_REACT_DELAY).then(() => { if (!this.shouldRefresh && this.shouldRefreshFromEvent(e)) { this.refreshFromEvent(); } diff --git a/src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts b/src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts index 74c2e8731c5..3b0138d5cdc 100644 --- a/src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts +++ b/src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts @@ -376,7 +376,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements IEncodin this.cancelAutoSavePromises(); // Create new save promise and keep it - let promise: TPromise = Promise.timeout(this.autoSaveAfterMillies).then(() => { + let promise: TPromise = TPromise.timeout(this.autoSaveAfterMillies).then(() => { // Only trigger save if the version id has not changed meanwhile if (versionId === this.versionId) { diff --git a/src/vs/workbench/parts/files/test/browser/fileEditorModel.test.ts b/src/vs/workbench/parts/files/test/browser/fileEditorModel.test.ts index beea46a5358..1a3e1f56eae 100644 --- a/src/vs/workbench/parts/files/test/browser/fileEditorModel.test.ts +++ b/src/vs/workbench/parts/files/test/browser/fileEditorModel.test.ts @@ -6,7 +6,7 @@ 'use strict'; import * as assert from 'assert'; -import {Promise} from 'vs/base/common/winjs.base'; +import {TPromise} from 'vs/base/common/winjs.base'; import URI from 'vs/base/common/uri'; import paths = require('vs/base/common/paths'); import {FileEditorInput} from 'vs/workbench/parts/files/browser/editors/fileEditorInput'; @@ -201,7 +201,7 @@ suite('Files - TextFileEditorModel', () => { m1.load().then(() => { m1.textEditorModel.setValue("foo"); - return Promise.timeout(50).then(() => { + return TPromise.timeout(50).then(() => { assert.ok(!m1.isDirty()); assert.equal(eventCounter, 2); @@ -254,7 +254,7 @@ suite('Files - TextFileEditorModel', () => { m2.textEditorModel.setValue("foo"); assert.ok(textFileService.isDirty(toResource('/path/index_async.txt'))); - return Promise.timeout(10).then(() => { + return TPromise.timeout(10).then(() => { textFileService.saveAll().then(() => { assert.ok(!textFileService.isDirty(toResource('/path/index_async.txt'))); assert.ok(!textFileService.isDirty(toResource('/path/index_async2.txt'))); diff --git a/src/vs/workbench/parts/git/browser/gitServices.ts b/src/vs/workbench/parts/git/browser/gitServices.ts index e185cf886a0..f77713f4d14 100644 --- a/src/vs/workbench/parts/git/browser/gitServices.ts +++ b/src/vs/workbench/parts/git/browser/gitServices.ts @@ -351,7 +351,7 @@ export class AutoFetcher implements git.IAutoFetcher, lifecycle.IDisposable this.currentRequest.then(() => { this._state = git.AutoFetcherState.Active; - this.currentRequest = winjs.Promise.timeout(this.timeout); + this.currentRequest = winjs.TPromise.timeout(this.timeout); return this.currentRequest; }).then(() => this.loop(), (err) => this.deactivate()); } diff --git a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts index fb8b4dc54dd..cba0c22b8bd 100644 --- a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts +++ b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts @@ -212,7 +212,7 @@ class DirtyDiffModelDecorator { this.model.setProperty('original', contents); // wait a bit, for the 'original' property to propagate - return winjs.Promise.timeout(500).then(() => this.triggerDiff()); + return winjs.TPromise.timeout(500).then(() => this.triggerDiff()); }); } diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts index 2d51d732b7b..8d7bb8edb7b 100644 --- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts @@ -82,7 +82,7 @@ class BaseCommandEntry extends QuickOpenEntryGroup { protected runAction(action: IAction): void { // Use a timeout to give the quick open widget a chance to close itself first - Promise.timeout(50).done(() => { + TPromise.timeout(50).done(() => { if (action && action.enabled) { try { this.telemetryService.publicLog('workbenchActionExecuted', { id: action.id, from: 'quick open' }); diff --git a/src/vs/workbench/test/browser/services.test.ts b/src/vs/workbench/test/browser/services.test.ts index 54a30daef6c..603a90ef048 100644 --- a/src/vs/workbench/test/browser/services.test.ts +++ b/src/vs/workbench/test/browser/services.test.ts @@ -205,7 +205,7 @@ suite('Workbench UI Services', () => { }, updateContent: function(res) { - return Promise.timeout(1).then(() => { + return TPromise.timeout(1).then(() => { return { resource: res, etag: 'index.txt', diff --git a/src/vs/workbench/test/browser/servicesTestUtils.ts b/src/vs/workbench/test/browser/servicesTestUtils.ts index 2f7455b1103..3d39d8b9245 100644 --- a/src/vs/workbench/test/browser/servicesTestUtils.ts +++ b/src/vs/workbench/test/browser/servicesTestUtils.ts @@ -491,7 +491,7 @@ export const TestFileService = { }, updateContent: function(res) { - return Promise.timeout(1).then(() => { + return TPromise.timeout(1).then(() => { return { resource: res, etag: 'index.txt',