diff --git a/extensions/markdown-language-features/src/features/preview.ts b/extensions/markdown-language-features/src/features/preview.ts index 0c593430d60..1002bcf0fc5 100644 --- a/extensions/markdown-language-features/src/features/preview.ts +++ b/extensions/markdown-language-features/src/features/preview.ts @@ -189,8 +189,8 @@ export class MarkdownPreview { return this.matchesResource(otherPreview._resource, otherPreview.viewColumn, otherPreview.locked); } - public show(viewColumn: vscode.ViewColumn) { - this.webview.show(viewColumn); + public reveal(viewColumn: vscode.ViewColumn) { + this.webview.reveal(viewColumn); } public toggleLock() { diff --git a/extensions/markdown-language-features/src/features/previewManager.ts b/extensions/markdown-language-features/src/features/previewManager.ts index 882895d35bc..61fee517b43 100644 --- a/extensions/markdown-language-features/src/features/previewManager.ts +++ b/extensions/markdown-language-features/src/features/previewManager.ts @@ -63,7 +63,7 @@ export class MarkdownPreviewManager { ): void { let preview = this.getExistingPreview(resource, previewSettings); if (preview) { - preview.show(previewSettings.previewColumn); + preview.reveal(previewSettings.previewColumn); } else { preview = this.createNewPreview(resource, previewSettings); this.previews.push(preview); diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 158325fdb6b..344fe22f55f 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -634,10 +634,10 @@ declare module 'vscode' { /** * Shows the webview in a given column. * - * A webview may only show in a single column at a time. If it is already showing, this + * A webview may only be in a single column at a time. If it is already showing, this * command moves it to a new column. */ - show(viewColumn: ViewColumn): void; + reveal(viewColumn: ViewColumn): void; /** * Dispose of the the webview. diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts index c446bde4fd8..aba0f0c1621 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts @@ -87,7 +87,7 @@ export class MainThreadWebviews implements MainThreadWebviewsShape { webview.setHtml(value); } - $show(handle: WebviewHandle, column: Position): void { + $reveal(handle: WebviewHandle, column: Position): void { const webviewInput = this.getWebview(handle); if (webviewInput.position === column) { this._editorService.openEditor(webviewInput, { preserveFocus: true }, column); diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 3d4158a3151..d2e13087c51 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -352,7 +352,7 @@ export type WebviewHandle = number; export interface MainThreadWebviewsShape extends IDisposable { $createWebview(handle: WebviewHandle, viewType: string, title: string, column: EditorPosition, options: vscode.WebviewOptions, extensionFolderPath: string): void; $disposeWebview(handle: WebviewHandle): void; - $show(handle: WebviewHandle, column: EditorPosition): void; + $reveal(handle: WebviewHandle, column: EditorPosition): void; $setTitle(handle: WebviewHandle, value: string): void; $setHtml(handle: WebviewHandle, value: string): void; $sendMessage(handle: WebviewHandle, value: any): Thenable; diff --git a/src/vs/workbench/api/node/extHostWebview.ts b/src/vs/workbench/api/node/extHostWebview.ts index 25948743352..27f69d0ec1d 100644 --- a/src/vs/workbench/api/node/extHostWebview.ts +++ b/src/vs/workbench/api/node/extHostWebview.ts @@ -115,9 +115,9 @@ export class ExtHostWebview implements vscode.Webview { return this._proxy.$sendMessage(this._handle, message); } - public show(viewColumn: vscode.ViewColumn): void { + public reveal(viewColumn: vscode.ViewColumn): void { this.assertNotDisposed(); - this._proxy.$show(this._handle, typeConverters.fromViewColumn(viewColumn)); + this._proxy.$reveal(this._handle, typeConverters.fromViewColumn(viewColumn)); } private assertNotDisposed() {