Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 22:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extract reviveWebviewExtension

Browse Source
This commit is contained in:
Matt Bierner
2019-10-14 17:00:11 -07:00
parent c142b04817
commit e08b22ba73
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/workbench/api/browser/mainThreadWebview.ts
View File

@@ -26,6 +26,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
import { extHostNamedCustomer } from '../common/extHostCustomers';
import { Schemas } from 'vs/base/common/network';
import { WebviewExtensionDescription } from 'vs/workbench/contrib/webview/browser/webview';
/**
* Bi-directional map between webview handles and inputs.
@@ -144,10 +145,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
mainThreadShowOptions.group = viewColumnToEditorGroup(this._editorGroupService, showOptions.viewColumn);
}
const webview = this._webviewWorkbenchService.createWebview(handle, webviewPanelViewType.fromExternal(viewType), title, mainThreadShowOptions, reviveWebviewOptions(options), {
location: URI.revive(extensionLocation),
id: extensionId
});
const webview = this._webviewWorkbenchService.createWebview(handle, webviewPanelViewType.fromExternal(viewType), title, mainThreadShowOptions, reviveWebviewOptions(options), reviveWebviewExtension(extensionId, extensionLocation));
this.hookupWebviewEventDelegate(handle, webview);
this._webviewInputs.add(handle, webview);
@@ -264,7 +262,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
throw new Error(`Provider for ${viewType} already registered`);
}
const extension = { id: extensionId, location: URI.revive(extensionLocation) };
const extension = reviveWebviewExtension(extensionId, extensionLocation);
this._editorProviders.set(viewType, this._webviewWorkbenchService.registerResolver({
canResolve: (webviewInput) => {
@@ -403,6 +401,10 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
}
}
function reviveWebviewExtension(extensionId: ExtensionIdentifier, extensionLocation: UriComponents): WebviewExtensionDescription {
return { id: extensionId, location: URI.revive(extensionLocation) };
}
function reviveWebviewOptions(options: modes.IWebviewOptions): WebviewInputOptions {
return {
...options,
@@ -411,7 +413,6 @@ function reviveWebviewOptions(options: modes.IWebviewOptions): WebviewInputOptio
};
}
function reviveWebviewIcon(
value: { light: UriComponents, dark: UriComponents; } | undefined
): { light: URI, dark: URI; } | undefined {