From 9de89a03662f6675ebca9b6ccb9c726537500732 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Wed, 12 Jul 2017 14:13:18 -0700
Subject: [PATCH] Move webview dev tools command to contributions

---
 .../parts/html/browser/html.contribution.ts   | 19 +++++++++++++++++
 .../workbench/parts/html/browser/webview.ts   | 21 +------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/vs/workbench/parts/html/browser/html.contribution.ts b/src/vs/workbench/parts/html/browser/html.contribution.ts
index fd782f55d8f..ddb472e6a37 100644
--- a/src/vs/workbench/parts/html/browser/html.contribution.ts
+++ b/src/vs/workbench/parts/html/browser/html.contribution.ts
@@ -18,6 +18,8 @@ import { EditorDescriptor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/common/editor';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
+import { MenuRegistry } from "vs/platform/actions/common/actions";
+import { WebviewElement } from "vs/workbench/parts/html/browser/webview";
 
 // --- Register Editor
 (<IEditorRegistry>Registry.as(EditorExtensions.Editors)).registerEditor(new EditorDescriptor(HtmlPreviewPart.ID,
@@ -78,3 +80,20 @@ CommandsRegistry.registerCommand('_workbench.htmlPreview.postMessage', (accessor
 	}
 	return activePreviews.length > 0;
 });
+
+
+CommandsRegistry.registerCommand('_webview.openDevTools', function () {
+	const elements = document.querySelectorAll('webview.ready');
+	for (let i = 0; i < elements.length; i++) {
+		try {
+			(elements.item(i) as WebviewElement).openDevTools();
+		} catch (e) {
+			console.error(e);
+		}
+	}
+});
+
+MenuRegistry.addCommand({
+	id: '_webview.openDevTools',
+	title: localize('devtools.webview', "Developer: Webview Tools")
+});
diff --git a/src/vs/workbench/parts/html/browser/webview.ts b/src/vs/workbench/parts/html/browser/webview.ts
index 255495a714e..9d5020d9fb9 100644
--- a/src/vs/workbench/parts/html/browser/webview.ts
+++ b/src/vs/workbench/parts/html/browser/webview.ts
@@ -5,21 +5,18 @@
 
 'use strict';
 
-import { localize } from 'vs/nls';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import Event, { Emitter } from 'vs/base/common/event';
 import { addDisposableListener, addClass } from 'vs/base/browser/dom';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-import { MenuRegistry } from 'vs/platform/actions/common/actions';
 import { editorBackground, editorForeground } from 'vs/platform/theme/common/colorRegistry';
 import { ITheme, LIGHT, DARK } from 'vs/platform/theme/common/themeService';
 import { WebviewFindWidget } from './webviewFindWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
 
-declare interface WebviewElement extends HTMLElement {
+export declare interface WebviewElement extends HTMLElement {
 	src: string;
 	preload: string;
 	send(channel: string, ...args: any[]);
@@ -50,22 +47,6 @@ export interface FoundInPageResults {
 	selectionArea: any;
 }
 
-CommandsRegistry.registerCommand('_webview.openDevTools', function () {
-	const elements = document.querySelectorAll('webview.ready');
-	for (let i = 0; i < elements.length; i++) {
-		try {
-			(<WebviewElement>elements.item(i)).openDevTools();
-		} catch (e) {
-			console.error(e);
-		}
-	}
-});
-
-MenuRegistry.addCommand({
-	id: '_webview.openDevTools',
-	title: localize('devtools.webview', "Developer: Webview Tools")
-});
-
 type ApiThemeClassName = 'vscode-light' | 'vscode-dark' | 'vscode-high-contrast';
 
 export interface WebviewOptions {
-- 
GitLab