Implement new shortcut Shift+Cmd+L for opening chat (#66)

* Implement new shortcut for opening chat * formatting * Doc/function rename --------- Co-authored-by: Duke Pan <59063950+Fryingpannn@users.noreply.github.com>
trypear · Oct 3, 2024 · 6a4ab22 · 6a4ab22
1 parent 26a7bb9
commit 6a4ab22
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 9 deletions.
diff --git a/extensions/pearai-extension/lib/common/src/webview-api/OutgoingMessage.ts b/extensions/pearai-extension/lib/common/src/webview-api/OutgoingMessage.ts
@@ -5,6 +5,9 @@ export const outgoingMessageSchema = zod.discriminatedUnion("type", [
 	zod.object({
 		type: zod.literal("startChat"),
 	}),
+	zod.object({
+		type: zod.literal("openChat"),
+	}),
 	zod.object({
 		type: zod.literal("enterOpenAIApiKey"),
 	}),

diff --git a/extensions/pearai-extension/lib/extension/src/chat/ChatController.ts b/extensions/pearai-extension/lib/extension/src/chat/ChatController.ts
@@ -50,11 +50,15 @@ export class ChatController {
 		await this.chatPanel.update(this.chatModel);
 	}
 
-	private async addAndShowConversation<T extends Conversation>(
+	/**
+	 * Opens and displays the specified conversation.
+	 * @param conversation The conversation to show.
+	 * @returns The specified conversation.
+	 */
+	private async showConversation<T extends Conversation>(
 		conversation: T
 	): Promise<T> {
-		this.chatModel.addAndSelectConversation(conversation);
-
+		this.chatModel.selectConversation(conversation);
 		await this.showChatPanel();
 		await this.updateChatPanel();
 
@@ -75,8 +79,13 @@ export class ChatController {
 				break;
 			}
 			case "clickCollapsedConversation": {
-				this.chatModel.selectedConversationId = message.data.id;
-				await this.updateChatPanel();
+				const conversation = this.chatModel.getConversationById(
+					message.data.id
+				);
+				if (conversation) {
+					this.chatModel.selectConversation(conversation);
+					await this.updateChatPanel();
+				}
 				break;
 			}
 			case "sendMessage": {
@@ -89,6 +98,10 @@ export class ChatController {
 				await this.createConversation(this.basicChatTemplateId);
 				break;
 			}
+			case "openChat": {
+				await this.showLastSelectedConversationOrCreateNew();
+				break;
+			}
 			case "deleteConversation": {
 				this.chatModel.deleteConversation(message.data.id);
 				await this.updateChatPanel();
@@ -162,7 +175,8 @@ export class ChatController {
 				return;
 			}
 
-			await this.addAndShowConversation(result.conversation);
+			await this.chatModel.addAndSelectConversation(result.conversation);
+			await this.showConversation(result.conversation);
 
 			if (result.shouldImmediatelyAnswer) {
 				await result.conversation.answer();
@@ -173,4 +187,21 @@ export class ChatController {
 			await vscode.window.showErrorMessage(error?.message ?? error);
 		}
 	}
+
+	private getLastSelectedConversation() {
+		return this.chatModel.getLastSelectedConversation();
+	}
+
+	/**
+	 * Opens and displays the last selected conversation, if one exists.
+	 * If there is no last selected conversation, creates a new one first.
+	 */
+	async showLastSelectedConversationOrCreateNew() {
+		const lastSelectedConversation = this.getLastSelectedConversation();
+		if (!lastSelectedConversation) {
+			await this.createConversation("chat-en");
+			return;
+		}
+		await this.showConversation(lastSelectedConversation);
+	}
 }
diff --git a/extensions/pearai-extension/lib/extension/src/chat/ChatModel.ts b/extensions/pearai-extension/lib/extension/src/chat/ChatModel.ts
@@ -4,15 +4,29 @@ export class ChatModel {
 	conversations: Array<Conversation> = [];
 	selectedConversationId: string | undefined;
 
+	selectConversation(conversation: Conversation) {
+		this.selectedConversationId = conversation.id;
+	}
+
 	addAndSelectConversation(conversation: Conversation) {
 		this.conversations.push(conversation);
-		this.selectedConversationId = conversation.id;
+		this.selectConversation(conversation);
 	}
 
 	getConversationById(id: string): Conversation | undefined {
 		return this.conversations.find((conversation) => conversation.id === id);
 	}
 
+	/**
+	 * @returns The last selected conversation, if it exists.
+	 */
+	getLastSelectedConversation(): Conversation | undefined {
+		if (!this.selectedConversationId) {
+			return;
+		}
+		return this.getConversationById(this.selectedConversationId);
+	}
+
 	deleteConversation(id: string) {
 		this.conversations = this.conversations.filter(
 			(conversation) => conversation.id !== id

diff --git a/extensions/pearai-extension/lib/extension/src/extension.ts b/extensions/pearai-extension/lib/extension/src/extension.ts
@@ -97,6 +97,9 @@ export const activate = async (context: vscode.ExtensionContext) => {
 		vscode.commands.registerCommand("pearai.startChat", () => {
 			chatController.createConversation("chat-en");
 		}),
+		vscode.commands.registerCommand("pearai.openChat", () => {
+			chatController.showLastSelectedConversationOrCreateNew();
+		}),
 		vscode.commands.registerCommand("pearai.editCode", () => {
 			chatController.createConversation("edit-code");
 		}),

diff --git a/extensions/pearai-extension/package.json b/extensions/pearai-extension/package.json
@@ -60,6 +60,11 @@
         "category": "PearAI",
         "icon": "$(comment-discussion)"
       },
+      {
+        "command": "pearai.openChat",
+        "title": "Open Chat",
+        "category": "PearAI"
+      },
       {
         "command": "pearai.editCode",
         "title": "Edit Code 🖊️",
@@ -243,11 +248,21 @@
       {
         "command": "pearai.startChat",
         "when": "isMac",
-        "key": "Cmd+l"
+        "key": "Shift+Cmd+l"
       },
       {
         "command": "pearai.startChat",
         "when": "!isMac",
+        "key": "Shift+Alt+l"
+      },
+      {
+        "command": "pearai.openChat",
+        "when": "isMac",
+        "key": "Cmd+l"
+      },
+      {
+        "command": "pearai.openChat",
+        "when": "!isMac",
         "key": "Alt+l"
       },
       {
@@ -436,4 +451,4 @@
     "typescript": "4.9.5",
     "vitest": "0.28.3"
   }
-}
+}