Persistance check should not activate background webview extensions

mjbvz · mjbvz · commit 766d321e42e5 · 2020-04-27T12:02:42.000-07:00
Fixes microsoft#95615 When checking if we can persist a webview, we check to see if any reviver is registered for it. However this may activate extensions that register the reviver For background webview that have been restored we can skip this check since we know they were persisted in the past
diff --git a/src/vs/workbench/contrib/webview/browser/webviewWorkbenchService.ts b/src/vs/workbench/contrib/webview/browser/webviewWorkbenchService.ts
@@ -267,13 +267,13 @@ export class WebviewEditorService implements IWebviewWorkbenchService {
 	public shouldPersist(
 		webview: WebviewInput
 	): boolean {
-		if (Iterable.some(this._revivers.values(), reviver => canRevive(reviver, webview))) {
+		// Revived webviews may not have an actively registered reviver but we still want to presist them
+		// since a reviver should exist when it is actually needed.
+		if (webview instanceof LazilyResolvedWebviewEditorInput) {
 			return true;
 		}
 
-		// Revived webviews may not have an actively registered reviver but we still want to presist them
-		// since a reviver should exist when it is actually needed.
-		return webview instanceof LazilyResolvedWebviewEditorInput;
+		return Iterable.some(this._revivers.values(), reviver => canRevive(reviver, webview));
 	}
 
 	private async tryRevive(
