From 4da73864453db509ad55f36b5ffc8a2aecc5b08f Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 5 Apr 2018 23:43:49 -0700 Subject: [PATCH] Rename webviewInput to webviewEditorInput --- .../workbench/api/electron-browser/mainThreadWebview.ts | 2 +- .../parts/update/electron-browser/releaseNotesEditor.ts | 2 +- .../webview/electron-browser/webview.contribution.ts | 8 ++++---- .../parts/webview/electron-browser/webviewEditor.ts | 2 +- .../{webviewInput.ts => webviewEditorInput.ts} | 0 ...ebviewInputFactory.ts => webviewEditorInputFactory.ts} | 4 ++-- .../webview/electron-browser/webviewEditorService.ts | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) rename src/vs/workbench/parts/webview/electron-browser/{webviewInput.ts => webviewEditorInput.ts} (100%) rename src/vs/workbench/parts/webview/electron-browser/{webviewInputFactory.ts => webviewEditorInputFactory.ts} (93%) diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts index 6bfdd804647..8e6bbf70df3 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts @@ -13,7 +13,7 @@ import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { ExtHostContext, ExtHostWebviewsShape, IExtHostContext, MainContext, MainThreadWebviewsShape, WebviewHandle } from 'vs/workbench/api/node/extHost.protocol'; import { WebviewEditor } from 'vs/workbench/parts/webview/electron-browser/webviewEditor'; -import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput'; +import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput'; import { IWebviewEditorService, WebviewInputOptions, WebviewReviver } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts index cb6672257ae..30e519743fc 100644 --- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts +++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts @@ -27,7 +27,7 @@ import { IWebviewEditorService } from 'vs/workbench/parts/webview/electron-brows import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO'; import { Position } from 'vs/platform/editor/common/editor'; -import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput'; +import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput'; function renderBody( body: string, diff --git a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts index ec1e97a3fc8..63f62ee1359 100644 --- a/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts +++ b/src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts @@ -13,12 +13,12 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; import { IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor'; -import { WebviewInputFactory } from 'vs/workbench/parts/webview/electron-browser/webviewInputFactory'; +import { WebviewEditorInputFactory } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory'; import { KEYBINDING_CONTEXT_WEBVIEWEDITOR_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_WEBVIEWEDITOR_FOCUS, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_VISIBLE } from './baseWebviewEditor'; import { HideWebViewEditorFindCommand, OpenWebviewDeveloperToolsAction, ReloadWebviewAction, ShowWebViewEditorFindTermCommand, ShowWebViewEditorFindWidgetCommand } from './webviewCommands'; import { WebviewEditor } from './webviewEditor'; import { IWebviewEditorService, WebviewEditorService } from './webviewEditorService'; -import { WebviewEditorInput } from './webviewInput'; +import { WebviewEditorInput } from './webviewEditorInput'; (Registry.as(EditorExtensions.Editors)).registerEditor(new EditorDescriptor( WebviewEditor, @@ -27,8 +27,8 @@ import { WebviewEditorInput } from './webviewInput'; [new SyncDescriptor(WebviewEditorInput)]); Registry.as(EditorInputExtensions.EditorInputFactories).registerEditorInputFactory( - WebviewInputFactory.ID, - WebviewInputFactory); + WebviewEditorInputFactory.ID, + WebviewEditorInputFactory); registerSingleton(IWebviewEditorService, WebviewEditorService); diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts index f7e00e4c9bb..c7fba7cb817 100644 --- a/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts +++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditor.ts @@ -18,7 +18,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment' import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import * as DOM from 'vs/base/browser/dom'; import { Event, Emitter } from 'vs/base/common/event'; -import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewInput'; +import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput'; import URI from 'vs/base/common/uri'; export class WebviewEditor extends BaseWebviewEditor { diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInput.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts similarity index 100% rename from src/vs/workbench/parts/webview/electron-browser/webviewInput.ts rename to src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts similarity index 93% rename from src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts rename to src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts index a19662206fe..3984cbd11d3 100644 --- a/src/vs/workbench/parts/webview/electron-browser/webviewInputFactory.ts +++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorInputFactory.ts @@ -8,7 +8,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IEditorInputFactory } from 'vs/workbench/common/editor'; import { IWebviewEditorService, WebviewInputOptions } from './webviewEditorService'; -import { WebviewEditorInput } from './webviewInput'; +import { WebviewEditorInput } from './webviewEditorInput'; interface SerializedWebview { readonly viewType: string; @@ -18,7 +18,7 @@ interface SerializedWebview { readonly state: any; } -export class WebviewInputFactory implements IEditorInputFactory { +export class WebviewEditorInputFactory implements IEditorInputFactory { public static readonly ID = WebviewEditorInput.typeId; diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts index 806b9f9640b..8a4bac0a396 100644 --- a/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts +++ b/src/vs/workbench/parts/webview/electron-browser/webviewEditorService.ts @@ -9,7 +9,7 @@ import { IInstantiationService, createDecorator } from 'vs/platform/instantiatio import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import * as vscode from 'vscode'; -import { WebviewEditorInput } from './webviewInput'; +import { WebviewEditorInput } from './webviewEditorInput'; import { TPromise } from 'vs/base/common/winjs.base'; export const IWebviewEditorService = createDecorator('webviewEditorService');