From 51d83fad770feba863a65bdc18bd98efa039cd74 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 26 Mar 2025 16:02:49 +0100 Subject: [PATCH 1/3] Applying edits has a "..." but "Working" does not (fix microsoft/vscode-copilot#14838) --- .../chat/browser/chatContentParts/chatProgressContentPart.ts | 2 +- src/vs/workbench/contrib/chat/browser/chatListRenderer.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts index 047de06af812e..c0017f21f84c8 100644 --- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts +++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.ts @@ -108,7 +108,7 @@ export class ChatWorkingProgressContentPart extends ChatProgressContentPart impl kind: 'progressMessage', content: workingProgress.isPaused ? new MarkdownString().appendText(localize('pausedMessage', "Paused")) : - new MarkdownString().appendText(localize('workingMessage', "Working")) + new MarkdownString().appendText(localize('workingMessage', "Working...")) }; super(progressMessage, renderer, context, undefined, undefined, workingProgress.isPaused ? Codicon.debugPause : undefined, instantiationService, chatMarkdownAnchorService); } diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts index cfa511fc17c21..7e5e814a9ab01 100644 --- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts +++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts @@ -483,7 +483,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer Date: Wed, 26 Mar 2025 12:59:33 -0700 Subject: [PATCH 2/3] Remove extra ellipsis --- src/vs/workbench/contrib/chat/browser/chatListRenderer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts index 7e5e814a9ab01..cfa511fc17c21 100644 --- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts +++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts @@ -483,7 +483,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer Date: Wed, 26 Mar 2025 13:00:02 -0700 Subject: [PATCH 3/3] Restore progress message at top in Ask mode (because it doesn't autoscroll in that mode so top makes more sense) --- src/vs/workbench/contrib/chat/browser/chatEditor.ts | 2 +- src/vs/workbench/contrib/chat/browser/chatViewPane.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/chat/browser/chatEditor.ts b/src/vs/workbench/contrib/chat/browser/chatEditor.ts index db10b0f1b6709..843bd3bb9a3c0 100644 --- a/src/vs/workbench/contrib/chat/browser/chatEditor.ts +++ b/src/vs/workbench/contrib/chat/browser/chatEditor.ts @@ -78,7 +78,7 @@ export class ChatEditor extends EditorPane { return this.chatService.isEditingLocation(ChatAgentLocation.Panel); }, referencesExpandedWhenEmptyResponse: !this.chatService.isEditingLocation(ChatAgentLocation.Panel), - progressMessageAtBottomOfResponse: this.chatService.isEditingLocation(ChatAgentLocation.Panel), + progressMessageAtBottomOfResponse: mode => mode !== ChatMode.Ask, }, enableImplicitContext: true, enableWorkingSet: this.chatService.isEditingLocation(ChatAgentLocation.Panel) ? 'explicit' : undefined, diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts index c45389c3527c3..d9077ca586640 100644 --- a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts +++ b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts @@ -207,7 +207,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate { return this.chatService.isEditingLocation(this.chatOptions.location); }, referencesExpandedWhenEmptyResponse: !this.chatService.isEditingLocation(this.chatOptions.location), - progressMessageAtBottomOfResponse: this.chatService.isEditingLocation(this.chatOptions.location), + progressMessageAtBottomOfResponse: mode => mode !== ChatMode.Ask, }, editorOverflowWidgetsDomNode: editorOverflowNode, enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel || this.chatService.isEditingLocation(this.chatOptions.location),