From cd09f4a11e7108804a6f06fa654fbd3a0adade5e Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 23 Aug 2024 11:46:17 +0200 Subject: [PATCH] consider cancel state when recomputing response type context key (#226409) re https://github.com/microsoft/vscode-copilot/issues/7324 --- .../contrib/inlineChat/browser/inlineChatActions.ts | 7 ++++++- .../contrib/inlineChat/browser/inlineChatController.ts | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts index 804a273c5bc..a9b72ce72ed 100644 --- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts +++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts @@ -527,7 +527,12 @@ export class ReportIssueAction extends AbstractInlineChatAction { id: MENU_INLINE_CHAT_WIDGET_STATUS, group: '0_main', order: 6, - when: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_SUPPORT_REPORT_ISSUE, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate()) + when: ContextKeyExpr.and( + CTX_INLINE_CHAT_VISIBLE, + CTX_INLINE_CHAT_SUPPORT_REPORT_ISSUE, + CTX_INLINE_CHAT_RESPONSE_TYPE.notEqualsTo(InlineChatResponseType.None), + CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.negate() + ) }] }); } diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts index 2a26060e2b1..aaf3438cec5 100644 --- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts +++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts @@ -921,7 +921,7 @@ export class InlineChatController implements IEditorContribution { let responseType = InlineChatResponseType.None; for (const request of this._session.chatModel.getRequests()) { - if (!request.response) { + if (!request.response || request.response.isCanceled) { continue; } responseType = InlineChatResponseType.Messages;