Remove TPromise#wrap calls #64596

microsoft · Dec 7, 2018 · 8697207 · 8697207
1 parent 9c653ad
commit 8697207
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/vs/workbench/parts/experiments/node/experimentService.ts b/src/vs/workbench/parts/experiments/node/experimentService.ts
@@ -130,7 +130,7 @@ export class ExperimentService extends Disposable implements IExperimentService
 	) {
 		super();
 
-		this._loadExperimentsPromise = TPromise.wrap(this.lifecycleService.when(LifecyclePhase.Eventually)).then(() => this.loadExperiments());
+		this._loadExperimentsPromise = Promise.resolve(this.lifecycleService.when(LifecyclePhase.Eventually)).then(() => this.loadExperiments());
 	}
 
 	public getExperimentById(id: string): TPromise<IExperiment> {
@@ -316,29 +316,29 @@ export class ExperimentService extends Disposable implements IExperimentService
 
 	private shouldRunExperiment(experiment: IRawExperiment, processedExperiment: IExperiment): TPromise<ExperimentState> {
 		if (processedExperiment.state !== ExperimentState.Evaluating) {
-			return TPromise.wrap(processedExperiment.state);
+			return Promise.resolve(processedExperiment.state);
 		}
 
 		if (!experiment.enabled) {
-			return TPromise.wrap(ExperimentState.NoRun);
+			return Promise.resolve(ExperimentState.NoRun);
 		}
 
 		if (!experiment.condition) {
-			return TPromise.wrap(ExperimentState.Run);
+			return Promise.resolve(ExperimentState.Run);
 		}
 
 		if (!this.checkExperimentDependencies(experiment)) {
-			return TPromise.wrap(ExperimentState.NoRun);
+			return Promise.resolve(ExperimentState.NoRun);
 		}
 
 		if (this.environmentService.appQuality === 'stable' && experiment.condition.insidersOnly === true) {
-			return TPromise.wrap(ExperimentState.NoRun);
+			return Promise.resolve(ExperimentState.NoRun);
 		}
 
 		const isNewUser = !this.storageService.get(lastSessionDateStorageKey, StorageScope.GLOBAL);
 		if ((experiment.condition.newUser === true && !isNewUser)
 			|| (experiment.condition.newUser === false && isNewUser)) {
-			return TPromise.wrap(ExperimentState.NoRun);
+			return Promise.resolve(ExperimentState.NoRun);
 		}
 
 		if (typeof experiment.condition.displayLanguage === 'string') {
@@ -355,7 +355,7 @@ export class ExperimentService extends Disposable implements IExperimentService
 					localeToCheck = localeToCheck.substr(0, b);
 				}
 				if (displayLanguage !== localeToCheck) {
-					return TPromise.wrap(ExperimentState.NoRun);
+					return Promise.resolve(ExperimentState.NoRun);
 				}
 			}
 		}

diff --git a/src/vs/workbench/parts/experiments/test/electron-browser/experimentService.test.ts b/src/vs/workbench/parts/experiments/test/electron-browser/experimentService.test.ts
@@ -45,7 +45,7 @@ function aLocalExtension(name: string = 'someext', manifest: any = {}, propertie
 
 export class TestExperimentService extends ExperimentService {
 	public getExperiments(): TPromise<any[]> {
-		return TPromise.wrap(experimentData.experiments);
+		return Promise.resolve(experimentData.experiments);
 	}
 }
 

diff --git a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts b/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
@@ -167,7 +167,7 @@ class TestTelemetryService implements ITelemetryService {
 
 	public publicLog(eventName: string, data?: any): TPromise<void> {
 		this.events.push({ name: eventName, data: data });
-		return TPromise.wrap<void>(null);
+		return Promise.resolve(null);
 	}
 
 	public getTelemetryInfo(): TPromise<ITelemetryInfo> {