Skip to content

Commit 57bceb6

Browse files
authored
Move and rename webview.ts files (microsoft#166313)
Fixes microsoft#165889
1 parent d741dd2 commit 57bceb6

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

src/vs/workbench/api/common/extHostCodeInsets.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { DisposableStore } from 'vs/base/common/lifecycle';
88
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
99
import { ExtHostTextEditor } from 'vs/workbench/api/common/extHostTextEditor';
1010
import { ExtHostEditors } from 'vs/workbench/api/common/extHostTextEditors';
11-
import { asWebviewUri, webviewGenericCspSource, WebviewRemoteInfo } from 'vs/workbench/common/webview';
11+
import { asWebviewUri, webviewGenericCspSource, WebviewRemoteInfo } from 'vs/workbench/contrib/webview/common/webview';
1212
import type * as vscode from 'vscode';
1313
import { ExtHostEditorInsetsShape, MainThreadEditorInsetsShape } from './extHost.protocol';
1414

src/vs/workbench/api/common/extHostNotebookKernels.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { ExtHostNotebookController } from 'vs/workbench/api/common/extHostNotebo
1919
import { ExtHostCell } from 'vs/workbench/api/common/extHostNotebookDocument';
2020
import * as extHostTypeConverters from 'vs/workbench/api/common/extHostTypeConverters';
2121
import { NotebookCellExecutionState as ExtHostNotebookCellExecutionState, NotebookCellOutput, NotebookControllerAffinity2 } from 'vs/workbench/api/common/extHostTypes';
22-
import { asWebviewUri } from 'vs/workbench/common/webview';
22+
import { asWebviewUri } from 'vs/workbench/contrib/webview/common/webview';
2323
import { NotebookCellExecutionState } from 'vs/workbench/contrib/notebook/common/notebookCommon';
2424
import { CellExecutionUpdateType } from 'vs/workbench/contrib/notebook/common/notebookExecutionService';
2525
import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';

src/vs/workbench/api/common/extHostWebview.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'
1212
import { normalizeVersion, parseVersion } from 'vs/platform/extensions/common/extensionValidator';
1313
import { ILogService } from 'vs/platform/log/common/log';
1414
import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
15-
import { serializeWebviewMessage, deserializeWebviewMessage } from 'vs/workbench/api/common/extHostWebviewMessaging';
15+
import { deserializeWebviewMessage, serializeWebviewMessage } from 'vs/workbench/api/common/extHostWebviewMessaging';
1616
import { IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
17-
import { asWebviewUri, webviewGenericCspSource, WebviewRemoteInfo } from 'vs/workbench/common/webview';
17+
import { asWebviewUri, webviewGenericCspSource, WebviewRemoteInfo } from 'vs/workbench/contrib/webview/common/webview';
1818
import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/common/proxyIdentifier';
1919
import type * as vscode from 'vscode';
2020
import * as extHostProtocol from './extHost.protocol';

src/vs/workbench/api/test/browser/extHostWebview.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { NullApiDeprecationService } from 'vs/workbench/api/common/extHostApiDep
1515
import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
1616
import { ExtHostWebviews } from 'vs/workbench/api/common/extHostWebview';
1717
import { ExtHostWebviewPanels } from 'vs/workbench/api/common/extHostWebviewPanels';
18-
import { decodeAuthority, webviewResourceBaseHost } from 'vs/workbench/common/webview';
18+
import { decodeAuthority, webviewResourceBaseHost } from 'vs/workbench/contrib/webview/common/webview';
1919
import { EditorGroupColumn } from 'vs/workbench/services/editor/common/editorGroupColumn';
2020
import type * as vscode from 'vscode';
2121
import { SingleProxyRPCProtocol } from 'vs/workbench/api/test/common/testRPCProtocol';

src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { editorFindMatch, editorFindMatchHighlight } from 'vs/platform/theme/com
3232
import { IThemeService, Themable } from 'vs/platform/theme/common/themeService';
3333
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
3434
import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
35-
import { asWebviewUri, webviewGenericCspSource } from 'vs/workbench/common/webview';
35+
import { asWebviewUri, webviewGenericCspSource } from 'vs/workbench/contrib/webview/common/webview';
3636
import { CellEditState, ICellOutputViewModel, ICellViewModel, ICommonCellInfo, IDisplayOutputLayoutUpdateRequest, IDisplayOutputViewModel, IFocusNotebookCellOptions, IGenericCellViewModel, IInsetRenderOutput, INotebookEditorCreationOptions, INotebookWebviewMessage, RenderOutputType } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
3737
import { NOTEBOOK_WEBVIEW_BOUNDARY } from 'vs/workbench/contrib/notebook/browser/view/notebookCellList';
3838
import { preloadsScriptStr } from 'vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads';

src/vs/workbench/contrib/webview/browser/webviewElement.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remot
2929
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
3030
import { ITunnelService } from 'vs/platform/tunnel/common/tunnel';
3131
import { WebviewPortMappingManager } from 'vs/platform/webview/common/webviewPortMapping';
32-
import { parentOriginHash } from 'vs/workbench/browser/webview';
33-
import { decodeAuthority, webviewGenericCspSource, webviewRootResourceAuthority } from 'vs/workbench/common/webview';
32+
import { parentOriginHash } from 'vs/workbench/browser/iframe';
3433
import { loadLocalResource, WebviewResourceResponse } from 'vs/workbench/contrib/webview/browser/resourceLoading';
3534
import { WebviewThemeDataProvider } from 'vs/workbench/contrib/webview/browser/themeing';
3635
import { areWebviewContentOptionsEqual, IWebview, WebviewContentOptions, WebviewExtensionDescription, WebviewInitInfo, WebviewMessageReceivedEvent, WebviewOptions } from 'vs/workbench/contrib/webview/browser/webview';
3736
import { WebviewFindDelegate, WebviewFindWidget } from 'vs/workbench/contrib/webview/browser/webviewFindWidget';
3837
import { FromWebviewMessage, ToWebviewMessage } from 'vs/workbench/contrib/webview/browser/webviewMessages';
38+
import { decodeAuthority, webviewGenericCspSource, webviewRootResourceAuthority } from 'vs/workbench/contrib/webview/common/webview';
3939
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
4040

4141
interface IKeydownEvent {

src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedDetailsRenderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { URI } from 'vs/base/common/uri';
1111
import { locale } from 'vs/base/common/platform';
1212
import { joinPath } from 'vs/base/common/resources';
1313
import { assertIsDefined } from 'vs/base/common/types';
14-
import { asWebviewUri } from 'vs/workbench/common/webview';
14+
import { asWebviewUri } from 'vs/workbench/contrib/webview/common/webview';
1515
import { ResourceMap } from 'vs/base/common/map';
1616
import { IFileService } from 'vs/platform/files/common/files';
1717
import { INotificationService } from 'vs/platform/notification/common/notification';

src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { Barrier } from 'vs/base/common/async';
2929
import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
3030
import { COI, FileAccess } from 'vs/base/common/network';
3131
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
32-
import { parentOriginHash } from 'vs/workbench/browser/webview';
32+
import { parentOriginHash } from 'vs/workbench/browser/iframe';
3333
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
3434

3535
export interface IWebWorkerExtensionHostInitData {

0 commit comments

Comments
 (0)