From 611fd5cf88efac77f8fee0aed18bbef8aaeef768 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 13 Feb 2024 08:46:57 -0800
Subject: [PATCH] Move chat command IDs into contrib

---
 .../contrib/terminal/common/terminal.ts         |  7 -------
 .../chat/browser/terminal.chat.contribution.ts  | 17 ++++++++---------
 .../chat/browser/terminalChat.ts                | 10 ++++++++++
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts
index f2167db7f17..fc925b646bb 100644
--- a/src/vs/workbench/contrib/terminal/common/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminal.ts
@@ -500,13 +500,6 @@ export const enum TerminalCommandId {
 	FontZoomIn = 'workbench.action.terminal.fontZoomIn',
 	FontZoomOut = 'workbench.action.terminal.fontZoomOut',
 	FontZoomReset = 'workbench.action.terminal.fontZoomReset',
-	ChatFocus = 'workbench.action.terminal.chat.focus',
-	ChatHide = 'workbench.action.terminal.chat.close',
-	ChatMakeRequest = 'workbench.action.terminal.chat.makeRequest',
-	ChatCancel = 'workbench.action.terminal.chat.cancel',
-	ChatFeedbackHelpful = 'workbench.action.terminal.chat.feedbackHelpful',
-	ChatFeedbackUnhelpful = 'workbench.action.terminal.chat.feedbackUnhelpful',
-	ChatFeedbackReportIssue = 'workbench.action.terminal.chat.feedbackReportIssue',
 
 	// Developer commands
 
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.ts
index 2972104787f..f8a1dd4b111 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminal.chat.contribution.ts
@@ -13,15 +13,14 @@ import { TerminalSettingId } from 'vs/platform/terminal/common/terminal';
 import { isDetachedTerminalInstance } from 'vs/workbench/contrib/terminal/browser/terminal';
 import { registerActiveXtermAction } from 'vs/workbench/contrib/terminal/browser/terminalActions';
 import { registerTerminalContribution } from 'vs/workbench/contrib/terminal/browser/terminalExtensions';
-import { TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
 import { TerminalContextKeys } from 'vs/workbench/contrib/terminal/common/terminalContextKey';
-import { MENU_TERMINAL_CHAT_INPUT, MENU_TERMINAL_CHAT_WIDGET, MENU_TERMINAL_CHAT_WIDGET_FEEDBACK } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
+import { MENU_TERMINAL_CHAT_INPUT, MENU_TERMINAL_CHAT_WIDGET, MENU_TERMINAL_CHAT_WIDGET_FEEDBACK, TerminalChatCommandId } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 import { TerminalChatController } from 'vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController';
 
 registerTerminalContribution(TerminalChatController.ID, TerminalChatController, false);
 
 registerActiveXtermAction({
-	id: TerminalCommandId.ChatFocus,
+	id: TerminalChatCommandId.Focus,
 	title: localize2('workbench.action.terminal.focusChat', 'Focus Chat'),
 	keybinding: {
 		primary: KeyMod.CtrlCmd | KeyCode.KeyI,
@@ -43,7 +42,7 @@ registerActiveXtermAction({
 });
 
 registerActiveXtermAction({
-	id: TerminalCommandId.ChatHide,
+	id: TerminalChatCommandId.Hide,
 	title: localize2('workbench.action.terminal.closeChat', 'Close Chat'),
 	keybinding: {
 		primary: KeyCode.Escape,
@@ -72,7 +71,7 @@ registerActiveXtermAction({
 });
 
 registerActiveXtermAction({
-	id: TerminalCommandId.ChatMakeRequest,
+	id: TerminalChatCommandId.MakeRequest,
 	title: localize2('workbench.action.terminal.submitChat', 'Make Chat Request'),
 	precondition: ContextKeyExpr.and(
 		ContextKeyExpr.has(`config.${TerminalSettingId.ExperimentalInlineChat}`),
@@ -105,7 +104,7 @@ registerActiveXtermAction({
 });
 
 registerActiveXtermAction({
-	id: TerminalCommandId.ChatCancel,
+	id: TerminalChatCommandId.Cancel,
 	title: localize2('workbench.action.terminal.cancelChat', 'Cancel Chat'),
 	precondition: ContextKeyExpr.and(
 		ContextKeyExpr.has(`config.${TerminalSettingId.ExperimentalInlineChat}`),
@@ -126,7 +125,7 @@ registerActiveXtermAction({
 });
 
 registerActiveXtermAction({
-	id: TerminalCommandId.ChatFeedbackHelpful,
+	id: TerminalChatCommandId.FeedbackHelpful,
 	title: localize2('feedbackHelpful', 'Helpful'),
 	precondition: ContextKeyExpr.and(
 		ContextKeyExpr.has(`config.${TerminalSettingId.ExperimentalInlineChat}`),
@@ -146,7 +145,7 @@ registerActiveXtermAction({
 });
 
 registerActiveXtermAction({
-	id: TerminalCommandId.ChatFeedbackUnhelpful,
+	id: TerminalChatCommandId.FeedbackUnhelpful,
 	title: localize2('feedbackUnhelpful', 'Helpful'),
 	precondition: ContextKeyExpr.and(
 		ContextKeyExpr.has(`config.${TerminalSettingId.ExperimentalInlineChat}`),
@@ -166,7 +165,7 @@ registerActiveXtermAction({
 });
 
 registerActiveXtermAction({
-	id: TerminalCommandId.ChatFeedbackReportIssue,
+	id: TerminalChatCommandId.FeedbackReportIssue,
 	title: localize2('reportIssue', 'Report Issue'),
 	precondition: ContextKeyExpr.and(
 		ContextKeyExpr.has(`config.${TerminalSettingId.ExperimentalInlineChat}`),
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
index 8b74aae7aeb..431a0e9c715 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
@@ -5,6 +5,16 @@
 
 import { MenuId } from 'vs/platform/actions/common/actions';
 
+export const enum TerminalChatCommandId {
+	Focus = 'workbench.action.terminal.chat.focus',
+	Hide = 'workbench.action.terminal.chat.close',
+	MakeRequest = 'workbench.action.terminal.chat.makeRequest',
+	Cancel = 'workbench.action.terminal.chat.cancel',
+	FeedbackHelpful = 'workbench.action.terminal.chat.feedbackHelpful',
+	FeedbackUnhelpful = 'workbench.action.terminal.chat.feedbackUnhelpful',
+	FeedbackReportIssue = 'workbench.action.terminal.chat.feedbackReportIssue',
+}
+
 export const MENU_TERMINAL_CHAT_INPUT = MenuId.for('terminalChatInput');
 export const MENU_TERMINAL_CHAT_WIDGET = MenuId.for('terminalChatWidget');
 export const MENU_TERMINAL_CHAT_WIDGET_STATUS = MenuId.for('terminalChatWidget.status');