Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

view descriptor created with containerTitle that is not a string #191842

Merged
merged 1 commit into from
Aug 30, 2023
Merged

view descriptor created with containerTitle that is not a string #191842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/vs/workbench/api/browser/viewsExtensionPoint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { Extensions as ViewletExtensions, PaneCompositeRegistry } from 'vs/workb
import { CustomTreeView, RawCustomTreeViewContextKey, TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
import { Extensions as ViewContainerExtensions, ICustomTreeViewDescriptor, ICustomViewDescriptor, IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ResolvableTreeItem, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
import { Extensions as ViewContainerExtensions, ICustomViewDescriptor, IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ResolvableTreeItem, ViewContainer, ViewContainerLocation } from 'vs/workbench/common/views';
import { VIEWLET_ID as DEBUG } from 'vs/workbench/contrib/debug/common/debug';
import { VIEWLET_ID as EXPLORER } from 'vs/workbench/contrib/files/common/files';
import { VIEWLET_ID as REMOTE } from 'vs/workbench/contrib/remote/browser/remoteExplorer';
Expand Down Expand Up @@ -530,14 +530,14 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
}
}

const viewDescriptor = <ICustomTreeViewDescriptor>{
const viewDescriptor: ICustomViewDescriptor = {
type: type,
ctorDescriptor: type === ViewType.Tree ? new SyncDescriptor(TreeViewPane) : new SyncDescriptor(WebviewViewPane),
id: item.id,
name: item.name,
when: ContextKeyExpr.deserialize(item.when),
containerIcon: icon || viewContainer?.icon,
containerTitle: item.contextualTitle || viewContainer?.title,
containerTitle: item.contextualTitle || (viewContainer && (typeof viewContainer.title === 'string' ? viewContainer.title : viewContainer.title.value)),
canToggleVisibility: true,
canMoveView: viewContainer?.id !== REMOTE,
treeView: type === ViewType.Tree ? this.instantiationService.createInstance(CustomTreeView, item.id, item.name, extension.description.identifier.value) : undefined,
Expand Down Expand Up @@ -587,7 +587,7 @@ class ViewsExtensionHandler implements IWorkbenchContribution {
if (removedViews.length) {
this.viewsRegistry.deregisterViews(removedViews, viewContainer);
for (const view of removedViews) {
const anyView = view as ICustomTreeViewDescriptor;
const anyView = view as ICustomViewDescriptor;
if (anyView.treeView) {
anyView.treeView.dispose();
}
Expand Down
10 changes: 2 additions & 8 deletions src/vs/workbench/common/views.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,18 +300,12 @@ export interface IViewDescriptor {
readonly openCommandActionDescriptor?: OpenCommandActionDescriptor;
}

export interface ICustomTreeViewDescriptor extends ITreeViewDescriptor {
export interface ICustomViewDescriptor extends IViewDescriptor {
readonly extensionId: ExtensionIdentifier;
readonly originalContainerId: string;
readonly treeView?: ITreeView;
}

export interface ICustomWebviewViewDescriptor extends IViewDescriptor {
readonly extensionId: ExtensionIdentifier;
readonly originalContainerId: string;
}

export type ICustomViewDescriptor = ICustomTreeViewDescriptor | ICustomWebviewViewDescriptor;

export interface IViewDescriptorRef {
viewDescriptor: IViewDescriptor;
index: number;
Expand Down