Remove TPromise.as - #64597

src/vs/workbench/parts/experiments/node/experimentService.ts

@@ -171,16 +171,16 @@ export class ExperimentService extends Disposable implements IExperimentService
 
 	protected getExperiments(): TPromise<IRawExperiment[]> {
 		if (!product.experimentsUrl || this.configurationService.getValue('workbench.enableExperiments') === false) {
-			return TPromise.as([]);
+			return Promise.resolve([]);
 		}
 		return this.requestService.request({ type: 'GET', url: product.experimentsUrl }, CancellationToken.None).then(context => {
 			if (context.res.statusCode !== 200) {
-				return TPromise.as(null);
+				return Promise.resolve(null);
 			}
 			return asJson(context).then(result => {
 				return Array.isArray<IRawExperiment>(result['experiments']) ? result['experiments'] : [];
 			});
-		}, () => TPromise.as(null));
+		}, () => Promise.resolve(null));
 	}
 
 	private loadExperiments(): TPromise<any> {
@@ -201,7 +201,7 @@ export class ExperimentService extends Disposable implements IExperimentService
 						}
 					});
 				}
-				return TPromise.as(null);
+				return Promise.resolve(null);
 			}
 
 			// Clear disbaled/deleted experiments from storage
@@ -246,7 +246,7 @@ export class ExperimentService extends Disposable implements IExperimentService
 				this._experiments.push(processedExperiment);
 
 				if (!processedExperiment.enabled) {
-					return TPromise.as(null);
+					return Promise.resolve(null);
 				}
 
 				const storageKey = 'experiments.' + experiment.id;
@@ -267,7 +267,7 @@ export class ExperimentService extends Disposable implements IExperimentService
 					if (state === ExperimentState.Run) {
 						this.fireRunExperiment(processedExperiment);
 					}
-					return TPromise.as(null);
+					return Promise.resolve(null);
 				});
 
 			});
@@ -364,7 +364,7 @@ export class ExperimentService extends Disposable implements IExperimentService
 			experiment.condition.userProbability = 1;
 		}
 
-		let extensionsCheckPromise = TPromise.as(true);
+		let extensionsCheckPromise = Promise.resolve(true);
 		if (experiment.condition.installedExtensions) {
 			extensionsCheckPromise = this.extensionManagementService.getInstalled(LocalExtensionType.User).then(locals => {
 				let includesCheck = true;

src/vs/workbench/parts/experiments/test/electron-browser/experimentService.test.ts

@@ -792,7 +792,7 @@ suite('Experiment Service', () => {
 			assert.equal(result[1].state, ExperimentState.Run);
 			assert.equal(storageDataExperiment3.state, ExperimentState.NoRun);
 			assert.equal(storageDataExperiment4.state, ExperimentState.Run);
-			return TPromise.as(null);
+			return Promise.resolve(null);
 		});
 	});
 	// test('Experiment with condition type FileEdit should increment editcount as appropriate', () => {

src/vs/workbench/parts/experiments/test/electron-browser/experimentalPrompts.test.ts

@@ -4,21 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-
-import { IExperiment, ExperimentActionType, IExperimentService, ExperimentState, IExperimentActionPromptProperties } from 'vs/workbench/parts/experiments/node/experimentService';
-
-import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { Emitter } from 'vs/base/common/event';
-import { TestExperimentService } from 'vs/workbench/parts/experiments/test/electron-browser/experimentService.test';
-import { ExperimentalPrompts } from 'vs/workbench/parts/experiments/electron-browser/experimentalPrompt';
-import { INotificationService, Severity, IPromptChoice } from 'vs/platform/notification/common/notification';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { INotificationService, IPromptChoice, Severity } from 'vs/platform/notification/common/notification';
 import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IStorageService } from 'vs/platform/storage/common/storage';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
+import { ExperimentalPrompts } from 'vs/workbench/parts/experiments/electron-browser/experimentalPrompt';
+import { ExperimentActionType, ExperimentState, IExperiment, IExperimentActionPromptProperties, IExperimentService } from 'vs/workbench/parts/experiments/node/experimentService';
+import { TestExperimentService } from 'vs/workbench/parts/experiments/test/electron-browser/experimentService.test';
+import { TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
 
 suite('Experimental Prompts', () => {
 	let instantiationService: TestInstantiationService;
@@ -104,7 +101,7 @@ suite('Experimental Prompts', () => {
 		experimentalPrompt = instantiationService.createInstance(ExperimentalPrompts);
 		onExperimentEnabledEvent.fire(experiment);
 
-		return TPromise.as(null).then(result => {
+		return Promise.resolve(null).then(result => {
 			assert.equal(storageData['state'], ExperimentState.Complete);
 		});
 
@@ -128,7 +125,7 @@ suite('Experimental Prompts', () => {
 		experimentalPrompt = instantiationService.createInstance(ExperimentalPrompts);
 		onExperimentEnabledEvent.fire(experiment);
 
-		return TPromise.as(null).then(result => {
+		return Promise.resolve(null).then(result => {
 			assert.equal(storageData['state'], ExperimentState.Complete);
 		});
 
@@ -152,7 +149,7 @@ suite('Experimental Prompts', () => {
 		experimentalPrompt = instantiationService.createInstance(ExperimentalPrompts);
 		onExperimentEnabledEvent.fire(experiment);
 
-		return TPromise.as(null).then(result => {
+		return Promise.resolve(null).then(result => {
 			assert.equal(storageData['state'], ExperimentState.Complete);
 		});
 

src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts

@@ -3,33 +3,32 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import 'vs/workbench/parts/search/electron-browser/search.contribution'; // load contributions
 import * as assert from 'assert';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { createSyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
-import { ISearchService } from 'vs/platform/search/common/search';
-import { ITelemetryService, ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry';
-import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import * as minimist from 'minimist';
 import * as path from 'path';
-import { IQuickOpenRegistry, Extensions } from 'vs/workbench/browser/quickopen';
-import { Registry } from 'vs/platform/registry/common/platform';
-import { SearchService } from 'vs/workbench/services/search/node/searchService';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { TestEnvironmentService, TestContextService, TestEditorService, TestEditorGroupsService, TestTextResourcePropertiesService } from 'vs/workbench/test/workbenchTestServices';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { TPromise } from 'vs/base/common/winjs.base';
+import { CancellationToken } from 'vs/base/common/cancellation';
 import { URI } from 'vs/base/common/uri';
-import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
 import { IModelService } from 'vs/editor/common/services/modelService';
-import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
-import { CancellationToken } from 'vs/base/common/cancellation';
+import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { createSyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
+import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { ISearchService } from 'vs/platform/search/common/search';
+import { ITelemetryInfo, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace';
+import { Extensions, IQuickOpenRegistry } from 'vs/workbench/browser/quickopen';
+import 'vs/workbench/parts/search/electron-browser/search.contribution'; // load contributions
+import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
+import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
+import { SearchService } from 'vs/workbench/services/search/node/searchService';
+import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
+import { TestContextService, TestEditorGroupsService, TestEditorService, TestEnvironmentService, TestTextResourcePropertiesService } from 'vs/workbench/test/workbenchTestServices';
 
 namespace Timer {
 	export interface ITimerEvent {
@@ -136,7 +135,7 @@ suite.skip('QuickOpen performance (integration)', () => {
 				if (testWorkspaceArg || verboseResults) { // Don't measure by default
 					const cachedEvents: Timer.ITimerEvent[] = [];
 					let i = n;
-					return (function iterate(): TPromise<Timer.ITimerEvent> {
+					return (function iterate(): Thenable<Timer.ITimerEvent> {
 						if (!i--) {
 							return undefined;
 						}
@@ -165,13 +164,13 @@ class TestTelemetryService implements ITelemetryService {
 
 	public events: any[] = [];
 
-	public publicLog(eventName: string, data?: any): TPromise<void> {
+	public publicLog(eventName: string, data?: any): Promise<void> {
 		this.events.push({ name: eventName, data: data });
 		return Promise.resolve(null);
 	}
 
-	public getTelemetryInfo(): TPromise<ITelemetryInfo> {
-		return TPromise.as({
+	public getTelemetryInfo(): Promise<ITelemetryInfo> {
+		return Promise.resolve({
 			instanceId: 'someValue.instanceId',
 			sessionId: 'someValue.sessionId',
 			machineId: 'someValue.machineId'