From 32738944f94c3e237e23beddc1d42d93e797f889 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 12 Sep 2019 18:03:50 -0700 Subject: [PATCH] Don't rely on WebviewPanelResourceScheme hack for reopen with --- src/vs/workbench/contrib/customEditor/browser/commands.ts | 5 ----- .../workbench/contrib/webview/browser/webviewEditorInput.ts | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/vs/workbench/contrib/customEditor/browser/commands.ts b/src/vs/workbench/contrib/customEditor/browser/commands.ts index 1e6552cec99..9f8b3d12703 100644 --- a/src/vs/workbench/contrib/customEditor/browser/commands.ts +++ b/src/vs/workbench/contrib/customEditor/browser/commands.ts @@ -14,7 +14,6 @@ import { IListService } from 'vs/platform/list/browser/listService'; import { ResourceContextKey } from 'vs/workbench/common/resources'; import { ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor'; import { getMultiSelectedResources } from 'vs/workbench/contrib/files/browser/files'; -import { WebviewPanelResourceScheme } from 'vs/workbench/contrib/webview/browser/webviewEditorInput'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; const viewCategory = nls.localize('viewCategory', "View"); @@ -73,10 +72,6 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ return; } - if (resource.scheme === WebviewPanelResourceScheme) { - resource = URI.parse(decodeURIComponent(resource.query)); - } - // Make sure the context menu has been dismissed before we prompt. // Otherwise with webviews, we will sometimes close the prompt instantly when the webview is // refocused by the workbench diff --git a/src/vs/workbench/contrib/webview/browser/webviewEditorInput.ts b/src/vs/workbench/contrib/webview/browser/webviewEditorInput.ts index 1b8ecebec3d..b9a22d9e37c 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewEditorInput.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewEditorInput.ts @@ -11,7 +11,7 @@ import { EditorInput, EditorModel, GroupIdentifier, IEditorInput, Verbosity } fr import { WebviewEditorOverlay } from 'vs/workbench/contrib/webview/browser/webview'; import { UnownedDisposable as Unowned } from 'vs/base/common/lifecycle'; -export const WebviewPanelResourceScheme = 'webview-panel'; +const WebviewPanelResourceScheme = 'webview-panel'; class WebviewIconsManager { private readonly _icons = new Map(); -- GitLab