From 1bcfc3e9e1dec9ac654cea28f2041a422c1a4889 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Tue, 26 Mar 2024 06:51:48 -0700 Subject: [PATCH 1/2] fix #208731 --- .../terminalContrib/chat/browser/terminalChatWidget.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts index e166624b6e8..4ccb7167f21 100644 --- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts +++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts @@ -159,7 +159,7 @@ export class TerminalChatWidget extends Disposable { this._inlineChatWidget.focus(); } focusResponse(): void { - const responseElement = this._inlineChatWidget.domNode.querySelector(ChatElementSelectors.ResponseEditor) || this._inlineChatWidget.domNode.querySelector(ChatElementSelectors.ResponseMessage); + const responseElement = this._inlineChatWidget.domNode.querySelector('.monaco-list'); if (responseElement instanceof HTMLElement) { responseElement.focus(); } @@ -190,7 +190,3 @@ export class TerminalChatWidget extends Disposable { } } -const enum ChatElementSelectors { - ResponseEditor = '.chatMessageContent textarea', - ResponseMessage = '.chatMessageContent', -} From c0c2a8ae723bc95ea302a955a5e287b00f81d4c2 Mon Sep 17 00:00:00 2001 From: meganrogge Date: Tue, 26 Mar 2024 07:33:11 -0700 Subject: [PATCH 2/2] use focus last message --- .../terminalContrib/chat/browser/terminalChatActions.ts | 2 +- .../terminalContrib/chat/browser/terminalChatWidget.ts | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts index 52b45f38e57..719bd28e497 100644 --- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts +++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts @@ -91,7 +91,7 @@ registerActiveXtermAction({ return; } const contr = TerminalChatController.activeChatWidget || TerminalChatController.get(activeInstance); - contr?.chatWidget?.focusResponse(); + contr?.chatWidget?.inlineChatWidget.chatWidget.focusLastMessage(); } }); diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts index 4ccb7167f21..360f6d0d20f 100644 --- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts +++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts @@ -158,12 +158,6 @@ export class TerminalChatWidget extends Disposable { focus(): void { this._inlineChatWidget.focus(); } - focusResponse(): void { - const responseElement = this._inlineChatWidget.domNode.querySelector('.monaco-list'); - if (responseElement instanceof HTMLElement) { - responseElement.focus(); - } - } hasFocus(): boolean { return this._inlineChatWidget.hasFocus(); }