Skip to content

Commit f72b7db

Browse files
authored
fix(amazonq): Prevent error messages from being shown on stop code generation (#5703)
1 parent 5f52add commit f72b7db

File tree

1 file changed

+3
-18
lines changed
  • plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview

1 file changed

+3
-18
lines changed

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager
1212
import com.intellij.openapi.options.ShowSettingsUtil
1313
import com.intellij.openapi.project.Project
1414
import com.intellij.ui.jcef.JBCefJSQuery.Response
15+
import kotlinx.coroutines.CancellationException
1516
import kotlinx.coroutines.CompletableDeferred
1617
import kotlinx.coroutines.channels.awaitClose
1718
import kotlinx.coroutines.coroutineScope
@@ -65,7 +66,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatN
6566
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatParams
6667
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatPrompt
6768
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
6969
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ConversationClickRequest
7070
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardNotification
7171
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
114114
import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.ThemeBrowserAdapter
115115
import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererConfigurable
116116
import software.aws.toolkits.jetbrains.settings.MeetQSettings
117-
import software.aws.toolkits.resources.AwsCoreBundle
118117
import software.aws.toolkits.telemetry.MetricResult
119118
import software.aws.toolkits.telemetry.Telemetry
120119
import 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

Comments
 (0)