Properly await on revive

mjbvz · mjbvz · commit 00cc78d7bd9f · 2018-04-05T23:34:10.000-07:00
diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts
@@ -148,7 +148,6 @@ export class WebviewEditorService implements IWebviewEditorService {
 		this._revivers.set(viewType, reviver);
 
 		// Resolve any pending views
-
 		const toRevive = this._awaitingRevival.filter(x => x.input.viewType === viewType);
 		this._awaitingRevival = this._awaitingRevival.filter(x => x.input.viewType !== viewType);
 
@@ -168,15 +167,15 @@ export class WebviewEditorService implements IWebviewEditorService {
 		return this._revivers.has(viewType) && this._revivers.get(viewType).canRevive(webview);
 	}
 
-	tryRevive(
+	private async tryRevive(
 		webview: WebviewEditorInput
-	): boolean {
+	): TPromise<boolean> {
 		const reviver = this._revivers.get(webview.viewType);
 		if (!reviver) {
 			return false;
 		}
 
-		reviver.reviveWebview(webview);
+		await reviver.reviveWebview(webview);
 		return true;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,6 @@ export class WebviewEditorService implements IWebviewEditorService {`
`148`	`148`	`this._revivers.set(viewType, reviver);`
`149`	`149`
`150`	`150`	`// Resolve any pending views`
`151`		`-`
`152`	`151`	`const toRevive = this._awaitingRevival.filter(x => x.input.viewType === viewType);`
`153`	`152`	`this._awaitingRevival = this._awaitingRevival.filter(x => x.input.viewType !== viewType);`
`154`	`153`
`@@ -168,15 +167,15 @@ export class WebviewEditorService implements IWebviewEditorService {`
`168`	`167`	`return this._revivers.has(viewType) && this._revivers.get(viewType).canRevive(webview);`
`169`	`168`	`}`
`170`	`169`
`171`		`- tryRevive(`
	`170`	`+ private async tryRevive(`
`172`	`171`	`webview: WebviewEditorInput`
`173`		`- ): boolean {`
	`172`	`+ ): TPromise<boolean> {`
`174`	`173`	`const reviver = this._revivers.get(webview.viewType);`
`175`	`174`	`if (!reviver) {`
`176`	`175`	`return false;`
`177`	`176`	`}`
`178`	`177`
`179`		`- reviver.reviveWebview(webview);`
	`178`	`+ await reviver.reviveWebview(webview);`
`180`	`179`	`return true;`
`181`	`180`	`}`
`182`	`181`	`}`