chat - use proper icon to move chat back into view (microsoft#250263)

Author: bpasero

src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts

@@ -4,11 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { localize2 } from '../../../../../nls.js';
-import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
-import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { localize, localize2 } from '../../../../../nls.js';
+import { Action2, MenuId, MenuRegistry, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, ContextKeyExpression } from '../../../../../platform/contextkey/common/contextkey.js';
 import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ActiveEditorContext } from '../../../../common/contextkeys.js';
+import { ViewContainerLocation } from '../../../../common/views.js';
 import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { ACTIVE_GROUP, AUX_WINDOW_GROUP, IEditorService } from '../../../../services/editor/common/editorService.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
@@ -30,7 +32,7 @@ export function registerMoveActions() {
 	registerAction2(class GlobalMoveToEditorAction extends Action2 {
 		constructor() {
 			super({
-				id: `workbench.action.chat.openInEditor`,
+				id: 'workbench.action.chat.openInEditor',
 				title: localize2('chat.openInEditor.label', "Open Chat in Editor"),
 				category: CHAT_CATEGORY,
 				precondition: ChatContextKeys.enabled,
@@ -53,7 +55,7 @@ export function registerMoveActions() {
 	registerAction2(class GlobalMoveToNewWindowAction extends Action2 {
 		constructor() {
 			super({
-				id: `workbench.action.chat.openInNewWindow`,
+				id: 'workbench.action.chat.openInNewWindow',
 				title: localize2('chat.openInNewWindow.label', "Open Chat in New Window"),
 				category: CHAT_CATEGORY,
 				precondition: ChatContextKeys.enabled,
@@ -76,25 +78,36 @@ export function registerMoveActions() {
 	registerAction2(class GlobalMoveToSidebarAction extends Action2 {
 		constructor() {
 			super({
-				id: `workbench.action.chat.openInSidebar`,
+				id: 'workbench.action.chat.openInSidebar',
 				title: localize2('interactiveSession.openInSidebar.label', "Open Chat in Side Bar"),
 				category: CHAT_CATEGORY,
-				icon: Codicon.layoutSidebarRight,
 				precondition: ChatContextKeys.enabled,
-				f1: true,
-				menu: [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].map(id => ({
-					id,
-					group: id === MenuId.CompactWindowEditorTitle ? 'navigation' : undefined,
-					when: ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID),
-					order: 0
-				}))
+				f1: true
 			});
 		}
 
 		async run(accessor: ServicesAccessor, ...args: any[]) {
 			return moveToSidebar(accessor);
 		}
 	});
+
+	function appendOpenChatInViewMenuItem(menuId: MenuId, title: string, icon: ThemeIcon, locationContextKey: ContextKeyExpression) {
+		MenuRegistry.appendMenuItem(menuId, {
+			command: { id: 'workbench.action.chat.openInSidebar', title, icon },
+			when: ContextKeyExpr.and(
+				ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID),
+				locationContextKey
+			),
+			group: menuId === MenuId.CompactWindowEditorTitle ? 'navigation' : undefined,
+			order: 0
+		});
+	}
+
+	[MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].forEach(id => {
+		appendOpenChatInViewMenuItem(id, localize('interactiveSession.openInSecondarySidebar.label', "Open Chat in Secondary Side Bar"), Codicon.layoutSidebarRightDock, ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar));
+		appendOpenChatInViewMenuItem(id, localize('interactiveSession.openInPrimarySidebar.label', "Open Chat in Primary Side Bar"), Codicon.layoutSidebarLeftDock, ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar));
+		appendOpenChatInViewMenuItem(id, localize('interactiveSession.openInPanel.label', "Open Chat in Panel"), Codicon.layoutPanelDock, ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel));
+	});
 }
 
 async function executeMoveToAction(accessor: ServicesAccessor, moveTo: MoveToNewLocation, _sessionId?: string) {

src/vs/workbench/contrib/chat/browser/actions/promptActions/chatAttachInstructionsAction.ts

@@ -167,7 +167,7 @@ class ManageInstructionsFilesAction extends Action2 {
 
 				when: ContextKeyExpr.equals('view', ChatViewId),
 				order: 11,
-				group: '1_open'
+				group: '2_manage'
 			},
 
 		});

src/vs/workbench/contrib/chat/browser/actions/promptActions/chatRunPromptAction.ts

@@ -251,7 +251,7 @@ class ManagePromptFilesAction extends Action2 {
 				id: MenuId.ViewTitle,
 				when: ContextKeyExpr.equals('view', ChatViewId),
 				order: 10,
-				group: '1_open'
+				group: '2_manage'
 			},
 
 		});

src/vs/workbench/contrib/chat/browser/chatViewPane.ts

@@ -23,9 +23,10 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { IViewPaneOptions, ViewPane } from '../../../browser/parts/views/viewPane.js';
 import { Memento } from '../../../common/memento.js';
 import { SIDE_BAR_FOREGROUND } from '../../../common/theme.js';
-import { IViewDescriptorService } from '../../../common/views.js';
+import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
 import { IChatViewTitleActionContext } from '../common/chatActions.js';
 import { IChatAgentService } from '../common/chatAgents.js';
+import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatModel } from '../common/chatModel.js';
 import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
 import { IChatService } from '../common/chatService.js';
@@ -120,6 +121,9 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 
 			this._onDidChangeViewWelcomeState.fire();
 		}));
+
+		// Location context key
+		ChatContextKeys.panelLocation.bindTo(contextKeyService).set(viewDescriptorService.getViewLocationById(options.id) ?? ViewContainerLocation.AuxiliaryBar);
 	}
 
 	override getActionsContext(): IChatViewTitleActionContext | undefined {

src/vs/workbench/contrib/chat/common/chatContextKeys.ts

@@ -7,6 +7,7 @@ import { localize } from '../../../../nls.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
 import { RemoteNameContext } from '../../../common/contextkeys.js';
+import { ViewContainerLocation } from '../../../common/views.js';
 import { ChatAgentLocation, ChatMode } from './constants.js';
 
 export namespace ChatContextKeys {
@@ -81,6 +82,8 @@ export namespace ChatContextKeys {
 	export const Modes = {
 		hasCustomChatModes: new RawContextKey<boolean>('chatHasCustomChatModes', false, { type: 'boolean', description: localize('chatHasCustomChatModes', "True when the chat has custom chat modes available.") }),
 	};
+
+	export const panelLocation = new RawContextKey<ViewContainerLocation>('chatPanelLocation', undefined, { type: 'number', description: localize('chatPanelLocation', "The location of the chat panel.") });
 }
 
 export namespace ChatContextKeyExprs {