From f1be6ea0a69cefb51af6e504ee8494e92511c493 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Thu, 27 Jul 2023 16:58:14 -0700 Subject: [PATCH] Set title and icon on chat view directly Fix microsoft/vscode-copilot-release#342 --- .../contrib/chat/browser/chatContributionServiceImpl.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/chat/browser/chatContributionServiceImpl.ts b/src/vs/workbench/contrib/chat/browser/chatContributionServiceImpl.ts index 0176f7c10b6..e018afb26b0 100644 --- a/src/vs/workbench/contrib/chat/browser/chatContributionServiceImpl.ts +++ b/src/vs/workbench/contrib/chat/browser/chatContributionServiceImpl.ts @@ -105,12 +105,15 @@ export class ChatContributionService implements IChatContributionService { } private registerChatProvider(extension: Readonly, providerDescriptor: IRawChatProviderContribution): IDisposable { + const icon = providerDescriptor.icon ? resources.joinPath(extension.extensionLocation, providerDescriptor.icon) : Codicon.commentDiscussion; + const title = localize('chat.viewContainer.label', "Chat"); + // Register View Container const viewContainerId = CHAT_SIDEBAR_PANEL_ID + '.' + providerDescriptor.id; const viewContainer: ViewContainer = Registry.as(ViewExtensions.ViewContainersRegistry).registerViewContainer({ id: viewContainerId, - title: localize('chat.viewContainer.label', "Chat"), - icon: providerDescriptor.icon ? resources.joinPath(extension.extensionLocation, providerDescriptor.icon) : Codicon.commentDiscussion, + title, + icon, ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [viewContainerId, { mergeViewWithContainerWhenSingleView: true }]), storageId: viewContainerId, hideIfEmpty: true, @@ -121,6 +124,8 @@ export class ChatContributionService implements IChatContributionService { const viewId = this.getViewIdForProvider(providerDescriptor.id); const viewDescriptor: IViewDescriptor[] = [{ id: viewId, + containerIcon: icon, + containerTitle: title, name: providerDescriptor.label, canToggleVisibility: false, canMoveView: true,