@@ -12,6 +12,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager
1212import com.intellij.openapi.options.ShowSettingsUtil
1313import com.intellij.openapi.project.Project
1414import com.intellij.ui.jcef.JBCefJSQuery.Response
15+ import kotlinx.coroutines.CancellationException
1516import kotlinx.coroutines.CompletableDeferred
1617import kotlinx.coroutines.channels.awaitClose
1718import kotlinx.coroutines.coroutineScope
@@ -65,7 +66,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatN
6566import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatParams
6667import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatPrompt
6768import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatReadyNotification
68- import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatUiMessageParams
6969import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ConversationClickRequest
7070import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardNotification
7171import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardParams
@@ -114,7 +114,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQThe
114114import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.ThemeBrowserAdapter
115115import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererConfigurable
116116import software.aws.toolkits.jetbrains.settings.MeetQSettings
117- import software.aws.toolkits.resources.AwsCoreBundle
118117import software.aws.toolkits.telemetry.MetricResult
119118import software.aws.toolkits.telemetry.Telemetry
120119import java.util.concurrent.CompletableFuture
@@ -466,22 +465,6 @@ class BrowserConnector(
466465 }
467466 cancelInflightRequests(stopResponseRequest.params.tabId)
468467 chatCommunicationManager.removePartialChatMessage(stopResponseRequest.params.tabId)
469-
470- val paramsJson = Gson ().toJson(
471- // https://github.com/aws/language-servers/blob/1c0d88806087125b6fc561f610cc15e98127c6bf/server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts#L403
472- ChatUiMessageParams (
473- title = AwsCoreBundle .message(" amazonqChat.stopChatResponse" ),
474- body = " "
475- )
476- )
477-
478- val uiMessage = ChatCommunicationManager .convertToJsonToSendToChat(
479- command = SEND_CHAT_COMMAND_PROMPT ,
480- tabId = stopResponseRequest.params.tabId,
481- params = paramsJson.toString(),
482- isPartialResult = false
483- )
484- browser.postChat(uiMessage)
485468 }
486469 OPEN_SETTINGS -> {
487470 val openSettingsNotification = serializer.deserializeChatMessages<OpenSettingsNotification >(node)
@@ -514,6 +497,8 @@ class BrowserConnector(
514497 )
515498 browser.postChat(messageToChat)
516499 chatCommunicationManager.removeInflightRequestForTab(tabId)
500+ } catch (e: CancellationException ) {
501+ LOG .warn { " Cancelled chat generation" }
517502 } catch (e: Exception ) {
518503 LOG .error { " Failed to send chat message $e " }
519504 browser.postChat(chatCommunicationManager.getErrorUiMessage(tabId, e, partialResultToken))
0 commit comments