Make sure we properly restore uris for local resource roots

mjbvz · mjbvz · commit a42fc9031da1 · 2020-05-28T10:25:07.000-07:00
For microsoft#98746
diff --git a/src/vs/workbench/contrib/webview/browser/webviewEditorInputFactory.ts b/src/vs/workbench/contrib/webview/browser/webviewEditorInputFactory.ts
@@ -78,6 +78,7 @@ export class WebviewEditorInputFactory implements IEditorInputFactory {
 			extension: reviveWebviewExtensionDescription(data.extensionId, data.extensionLocation),
 			iconPath: reviveIconPath(data.iconPath),
 			state: reviveState(data.state),
+			options: reviveOptions(data.options)
 		};
 	}
 
@@ -143,3 +144,10 @@ function reviveUri(data: string | UriComponents | undefined): URI | undefined {
 function reviveState(state: unknown | undefined): undefined | string {
 	return typeof state === 'string' ? state : undefined;
 }
+
+function reviveOptions(options: WebviewInputOptions): WebviewInputOptions {
+	return {
+		...options,
+		localResourceRoots: options.localResourceRoots?.map(components => URI.from(components)),
+	};
+}
