avoid async and winjs.promise, microsoft#53442

jrieken · jrieken · commit 35f7a7b8177f · 2018-07-03T09:22:10.000+02:00
diff --git a/src/vs/code/electron-main/logUploader.ts b/src/vs/code/electron-main/logUploader.ts
@@ -37,7 +37,7 @@ export async function uploadLogs(
 	channel: ILaunchChannel,
 	requestService: IRequestService,
 	environmentService: IEnvironmentService
-): TPromise<any> {
+): Promise<any> {
 	const endpoint = Endpoint.getFromProduct();
 	if (!endpoint) {
 		console.error(localize('invalidEndpoint', 'Invalid log uploader endpoint'));
@@ -75,7 +75,7 @@ async function postLogs(
 	endpoint: Endpoint,
 	outZip: string,
 	requestService: IRequestService
-): TPromise<PostResult> {
+): Promise<PostResult> {
 	const dotter = setInterval(() => console.log('.'), 5000);
 	let result: IRequestContext;
 	try {
@@ -152,4 +152,4 @@ function doZip(
 		default:
 			return cp.execFile('zip', ['-r', outZip, '.'], { cwd: logsPath }, callback);
 	}
-}
+}
diff --git a/src/vs/platform/driver/electron-browser/driver.ts b/src/vs/platform/driver/electron-browser/driver.ts
@@ -220,7 +220,7 @@ export async function registerWindowDriver(
 	client: IPCClient,
 	windowId: number,
 	instantiationService: IInstantiationService
-): TPromise<IDisposable> {
+): Promise<IDisposable> {
 	const windowDriver = instantiationService.createInstance(WindowDriver);
 	const windowDriverChannel = new WindowDriverChannel(windowDriver);
 	client.registerChannel('windowDriver', windowDriverChannel);
@@ -236,4 +236,4 @@ export async function registerWindowDriver(
 
 	const disposable = toDisposable(() => windowDriverRegistry.reloadWindowDriver(windowId));
 	return combinedDisposable([disposable, client]);
-}
+}
diff --git a/src/vs/platform/driver/electron-main/driver.ts b/src/vs/platform/driver/electron-main/driver.ts
@@ -216,7 +216,7 @@ export async function serve(
 	handle: string,
 	environmentService: IEnvironmentService,
 	instantiationService: IInstantiationService
-): TPromise<IDisposable> {
+): Promise<IDisposable> {
 	const verbose = environmentService.driverVerbose;
 	const driver = instantiationService.createInstance(Driver, windowServer, { verbose });
 
@@ -228,4 +228,4 @@ export async function serve(
 	server.registerChannel('driver', channel);
 
 	return combinedDisposable([server, windowServer]);
-}
+}
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -77,7 +77,7 @@ export class ReleaseNotesManager {
 	public async show(
 		accessor: ServicesAccessor,
 		version: string
-	): TPromise<boolean> {
+	): Promise<boolean> {
 		const releaseNoteText = await this.loadReleaseNotes(version);
 		this._lastText = releaseNoteText;
 		const html = await this.renderBody(releaseNoteText);
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -73,11 +73,11 @@ export abstract class AbstractShowReleaseNotesAction extends Action {
 
 		this.enabled = false;
 
-		return showReleaseNotes(this.instantiationService, this.version)
+		return TPromise.wrap(showReleaseNotes(this.instantiationService, this.version)
 			.then(null, () => {
 				const action = this.instantiationService.createInstance(OpenLatestReleaseNotesInBrowserAction);
 				return action.run().then(() => false);
-			});
+			}));
 	}
 }
 
@@ -507,4 +507,4 @@ export class UpdateContribution implements IGlobalActivity {
 	dispose(): void {
 		this.disposables = dispose(this.disposables);
 	}
-}
+}
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
@@ -135,7 +135,7 @@ export class WebviewEditorService implements IWebviewEditorService {
 				return true;
 			},
 			reviveWebview: (webview: WebviewEditorInput): TPromise<void> => {
-				return this.tryRevive(webview).then(didRevive => {
+				return TPromise.wrap(this.tryRevive(webview)).then(didRevive => {
 					if (didRevive) {
 						return TPromise.as(void 0);
 					}
@@ -185,7 +185,7 @@ export class WebviewEditorService implements IWebviewEditorService {
 
 	private async tryRevive(
 		webview: WebviewEditorInput
-	): TPromise<boolean> {
+	): Promise<boolean> {
 		const revivers = this._revivers.get(webview.viewType);
 		if (!revivers) {
 			return false;
@@ -199,4 +199,4 @@ export class WebviewEditorService implements IWebviewEditorService {
 		}
 		return false;
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,11 @@ export abstract class AbstractShowReleaseNotesAction extends Action {`
`73`	`73`
`74`	`74`	`this.enabled = false;`
`75`	`75`
`76`		`- return showReleaseNotes(this.instantiationService, this.version)`
	`76`	`+ return TPromise.wrap(showReleaseNotes(this.instantiationService, this.version)`
`77`	`77`	`.then(null, () => {`
`78`	`78`	`const action = this.instantiationService.createInstance(OpenLatestReleaseNotesInBrowserAction);`
`79`	`79`	`return action.run().then(() => false);`
`80`		`- });`
	`80`	`+ }));`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`@@ -507,4 +507,4 @@ export class UpdateContribution implements IGlobalActivity {`
`507`	`507`	`dispose(): void {`
`508`	`508`	`this.disposables = dispose(this.disposables);`
`509`	`509`	`}`
`510`		`-}`
	`510`	`+}`