Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-14 23:30:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #106348

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-11-13 09:06:10 +01:00
parent f1560e9a19
commit 336b58c8a2
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/api/browser/viewsExtensionPoint.ts
+10 -2
View File
@@ -33,6 +33,7 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { Codicon } from 'vs/base/common/codicons';
import { CustomTreeView } from 'vs/workbench/contrib/views/browser/treeView';
import { WebviewViewPane } from 'vs/workbench/contrib/webviewView/browser/webviewViewPane';
import { ThemeIcon } from 'vs/platform/theme/common/themeService';
export interface IUserFriendlyViewsContainerDescriptor {
id: string;
@@ -356,7 +357,9 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
private registerCustomViewContainers(containers: IUserFriendlyViewsContainerDescriptor[], extension: IExtensionDescription, order: number, existingViewContainers: ViewContainer[], location: ViewContainerLocation): number {
containers.forEach(descriptor => {
const icon = resources.joinPath(extension.extensionLocation, descriptor.icon);
const themeIcon = ThemeIcon.fromString(descriptor.icon);
const className = themeIcon ? ThemeIcon.asClassName(themeIcon) : undefined;
const icon = className || resources.joinPath(extension.extensionLocation, descriptor.icon);
const id = `workbench.view.extension.${descriptor.id}`;
const viewContainer = this.registerCustomViewContainer(id, descriptor.title, icon, order++, extension.identifier, location);
@@ -470,7 +473,12 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
? container.viewOrderDelegate.getOrder(item.group)
: undefined;
const icon = item.icon ? resources.joinPath(extension.description.extensionLocation, item.icon) : undefined;
let icon: string | URI | undefined;
if (typeof item.icon === 'string') {
const themeIcon = ThemeIcon.fromString(item.icon);
icon = themeIcon ? ThemeIcon.asClassName(themeIcon) : resources.joinPath(extension.description.extensionLocation, item.icon);
}
const initialVisibility = this.convertInitialVisibility(item.visibility);
const type = this.getViewType(item.type);