@@ -12,6 +12,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager
12
12
import com.intellij.openapi.options.ShowSettingsUtil
13
13
import com.intellij.openapi.project.Project
14
14
import com.intellij.ui.jcef.JBCefJSQuery.Response
15
+ import kotlinx.coroutines.CancellationException
15
16
import kotlinx.coroutines.CompletableDeferred
16
17
import kotlinx.coroutines.channels.awaitClose
17
18
import kotlinx.coroutines.coroutineScope
@@ -65,7 +66,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatN
65
66
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatParams
66
67
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatPrompt
67
68
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatReadyNotification
68
- import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatUiMessageParams
69
69
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ConversationClickRequest
70
70
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardNotification
71
71
import 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
114
114
import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.ThemeBrowserAdapter
115
115
import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererConfigurable
116
116
import software.aws.toolkits.jetbrains.settings.MeetQSettings
117
- import software.aws.toolkits.resources.AwsCoreBundle
118
117
import software.aws.toolkits.telemetry.MetricResult
119
118
import software.aws.toolkits.telemetry.Telemetry
120
119
import java.util.concurrent.CompletableFuture
@@ -466,22 +465,6 @@ class BrowserConnector(
466
465
}
467
466
cancelInflightRequests(stopResponseRequest.params.tabId)
468
467
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)
485
468
}
486
469
OPEN_SETTINGS -> {
487
470
val openSettingsNotification = serializer.deserializeChatMessages<OpenSettingsNotification >(node)
@@ -514,6 +497,8 @@ class BrowserConnector(
514
497
)
515
498
browser.postChat(messageToChat)
516
499
chatCommunicationManager.removeInflightRequestForTab(tabId)
500
+ } catch (e: CancellationException ) {
501
+ LOG .warn { " Cancelled chat generation" }
517
502
} catch (e: Exception ) {
518
503
LOG .error { " Failed to send chat message $e " }
519
504
browser.postChat(chatCommunicationManager.getErrorUiMessage(tabId, e, partialResultToken))
0 commit comments