diff --git a/extensions/markdown-language-features/src/extension.ts b/extensions/markdown-language-features/src/extension.ts index 536a12d9f57..53e0c6286e1 100644 --- a/extensions/markdown-language-features/src/extension.ts +++ b/extensions/markdown-language-features/src/extension.ts @@ -59,12 +59,4 @@ export function activate(context: vscode.ExtensionContext) { logger.updateConfiguration(); previewManager.updateConfiguration(); })); - - vscode.commands.registerCommand('unicorn', () => { - if (vscode.window.activeTextEditor) { - vscode.window.showWebviewWidget(vscode.window.activeTextEditor, vscode.window.activeTextEditor.selection.active, 'unicorn', 'Webview', {}).then(webview => { - webview.html = ''; - }); - } - }); } diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index cc3bbbbac46..5e679fd39e0 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -692,8 +692,6 @@ declare module 'vscode' { * @param reviver Webview serializer. */ export function registerWebviewSerializer(viewType: string, reviver: WebviewSerializer): Disposable; - - export function showWebviewWidget(editor: TextEditor, position: Position, viewType: string, title: string, options: WebviewOptions): Thenable; } //#endregion diff --git a/src/vs/workbench/api/electron-browser/mainThreadComments.ts b/src/vs/workbench/api/electron-browser/mainThreadComments.ts index 1134d394162..4eaf10e729d 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadComments.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadComments.ts @@ -75,5 +75,4 @@ export class MainThreadComments extends Disposable implements MainThreadComments } return result; } - } diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index 39e7fc810d1..2136bd733e6 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -423,9 +423,6 @@ export function createApiFactory( }), registerWebviewSerializer: proposedApiFunction(extension, (viewType: string, serializer: vscode.WebviewSerializer) => { return extHostWebviews.registerWebviewSerializer(viewType, serializer); - }), - showWebviewWidget: proposedApiFunction(extension, (editor: vscode.TextEditor, position: vscode.Position, viewType: string, title: string, options: vscode.WebviewOptions) => { - return extHostWebviews.showWebviewWidget(editor, position, viewType, title, options); }) }; diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 549543189cf..babbea619af 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -364,8 +364,6 @@ export interface MainThreadWebviewsShape extends IDisposable { $registerSerializer(viewType: string): void; $unregisterSerializer(viewType: string): void; - - $showWebviewWidget(handle: WebviewHandle, editorId: string, position: IPosition, viewType: string, options: vscode.WebviewOptions): void; } export interface ExtHostWebviewsShape { diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts index 393af8d3101..6b7798bdc3d 100644 --- a/src/vs/workbench/api/node/extHostWebview.ts +++ b/src/vs/workbench/api/node/extHostWebview.ts @@ -3,14 +3,13 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { MainContext, MainThreadWebviewsShape, IMainContext, ExtHostWebviewsShape, WebviewHandle } from './extHost.protocol'; -import * as vscode from 'vscode'; -import { Event, Emitter } from 'vs/base/common/event'; -import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters'; -import { Position } from 'vs/platform/editor/common/editor'; +import { Emitter, Event } from 'vs/base/common/event'; import { TPromise } from 'vs/base/common/winjs.base'; +import { Position } from 'vs/platform/editor/common/editor'; +import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters'; +import * as vscode from 'vscode'; +import { ExtHostWebviewsShape, IMainContext, MainContext, MainThreadWebviewsShape, WebviewHandle } from './extHost.protocol'; import * as types from './extHostTypes'; -import { ExtHostTextEditor } from './extHostTextEditor'; export class ExtHostWebview implements vscode.Webview { @@ -179,15 +178,6 @@ export class ExtHostWebviews implements ExtHostWebviewsShape { }); } - async showWebviewWidget(editor: vscode.TextEditor, position: vscode.Position, viewType: string, title: string, options: vscode.WebviewOptions) { - const handle = ExtHostWebviews.webviewHandlePool++ + ''; - this._proxy.$showWebviewWidget(handle, (editor as ExtHostTextEditor).id, typeConverters.fromPosition(new types.Position(position.line, position.character)), viewType, options); - - const webview = new ExtHostWebview(handle, this._proxy, viewType, undefined, options); - this._webviews.set(handle, webview); - return webview; - } - $onMessage(handle: WebviewHandle, message: any): void { const webview = this.getWebview(handle); if (webview) {