Fix webview deserialization

microsoft · Mar 12, 2019 · 5570695 · 5570695
1 parent 1e6206f
commit 5570695
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewEditorInputFactory.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewEditorInputFactory.ts
@@ -22,6 +22,7 @@ interface SerializedWebview {
 	readonly extensionLocation: string | UriComponents | undefined;
 	readonly state: any;
 	readonly iconPath: SerializedIconPath | undefined;
+	readonly group?: number;
 }
 
 export class WebviewEditorInputFactory implements IEditorInputFactory {
@@ -53,6 +54,7 @@ export class WebviewEditorInputFactory implements IEditorInputFactory {
 			extensionLocation: input.extensionLocation,
 			state: input.state,
 			iconPath: input.iconPath ? { light: input.iconPath.light, dark: input.iconPath.dark, } : undefined,
+			group: input.group
 		};
 
 		try {
@@ -69,7 +71,7 @@ export class WebviewEditorInputFactory implements IEditorInputFactory {
 		const data: SerializedWebview = JSON.parse(serializedEditorInput);
 		const extensionLocation = reviveUri(data.extensionLocation);
 		const iconPath = reviveIconPath(data.iconPath);
-		return this._webviewService.reviveWebview(data.viewType, data.id, data.title, iconPath, data.state, data.options, extensionLocation);
+		return this._webviewService.reviveWebview(data.viewType, data.id, data.title, iconPath, data.state, data.options, extensionLocation, data.group);
 	}
 }
 function reviveIconPath(data: SerializedIconPath | undefined) {

diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewEditorService.ts
@@ -41,6 +41,7 @@ export interface IWebviewEditorService {
 		state: any,
 		options: WebviewInputOptions,
 		extensionLocation: URI | undefined,
+		group: number | undefined
 	): WebviewEditorInput;
 
 	revealWebview(
@@ -134,7 +135,8 @@ export class WebviewEditorService implements IWebviewEditorService {
 		iconPath: { light: URI, dark: URI } | undefined,
 		state: any,
 		options: WebviewInputOptions,
-		extensionLocation: URI
+		extensionLocation: URI,
+		group: number | undefined,
 	): WebviewEditorInput {
 		const webviewInput = this._instantiationService.createInstance(RevivedWebviewEditorInput, viewType, id, title, options, state, {}, extensionLocation, async (webview: WebviewEditorInput): Promise<void> => {
 			const didRevive = await this.tryRevive(webview);
@@ -149,6 +151,9 @@ export class WebviewEditorService implements IWebviewEditorService {
 			return promise;
 		});
 		webviewInput.iconPath = iconPath;
+		if (typeof group === 'number') {
+			webviewInput.updateGroup(group);
+		}
 		return webviewInput;
 	}