Don't rely on WebviewPanelResourceScheme hack for reopen with

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

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<string, { light: URI, dark: URI }>();