From 8532eb3206a9f6fac43d79bbd37571c8587de137 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 11 Sep 2019 20:44:20 -0700 Subject: [PATCH] Remove old-style webview state migration code --- .../workbench/api/browser/mainThreadWebview.ts | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/vs/workbench/api/browser/mainThreadWebview.ts b/src/vs/workbench/api/browser/mainThreadWebview.ts index c308d6f0788..85a52c8ec31 100644 --- a/src/vs/workbench/api/browser/mainThreadWebview.ts +++ b/src/vs/workbench/api/browser/mainThreadWebview.ts @@ -23,11 +23,6 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { extHostNamedCustomer } from '../common/extHostCustomers'; -interface OldMainThreadWebviewState { - readonly viewType: string; - state: any; -} - /** * Bi-directional map between webview handles and inputs. */ @@ -210,16 +205,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews let state = undefined; if (webviewEditorInput.webview.state) { try { - // Check for old-style webview state first which stored state inside another state object - // TODO: remove this after 1.37 ships. - if ( - typeof (webviewEditorInput.webview.state as unknown as OldMainThreadWebviewState).viewType === 'string' && - 'state' in (webviewEditorInput.webview.state as unknown as OldMainThreadWebviewState) - ) { - state = JSON.parse((webviewEditorInput.webview.state as any).state); - } else { - state = JSON.parse(webviewEditorInput.webview.state); - } + state = JSON.parse(webviewEditorInput.webview.state); } catch { // noop } -- GitLab