Skip to content

fix(amazonq): Prevent error messages from being shown on stop code generation #5703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: feat(amazonq): Agentic coding experience
merged 1 commit into from
May 9, 2025
Merged

fix(amazonq): Prevent error messages from being shown on stop code generation #5703

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions ...ommunity/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.intellij.openapi.options.ShowSettingsUtil
import com.intellij.openapi.project.Project
import com.intellij.ui.jcef.JBCefJSQuery.Response
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.coroutineScope
Expand Down Expand Up @@ -65,7 +66,6 @@
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatParams
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatPrompt
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatReadyNotification
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatUiMessageParams
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ConversationClickRequest
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardNotification
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardParams
Expand Down Expand Up @@ -114,7 +114,6 @@
import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.ThemeBrowserAdapter
import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererConfigurable
import software.aws.toolkits.jetbrains.settings.MeetQSettings
import software.aws.toolkits.resources.AwsCoreBundle
import software.aws.toolkits.telemetry.MetricResult
import software.aws.toolkits.telemetry.Telemetry
import java.util.concurrent.CompletableFuture
Expand Down Expand Up @@ -466,22 +465,6 @@
}
cancelInflightRequests(stopResponseRequest.params.tabId)
chatCommunicationManager.removePartialChatMessage(stopResponseRequest.params.tabId)

val paramsJson = Gson().toJson(
// https://github.com/aws/language-servers/blob/1c0d88806087125b6fc561f610cc15e98127c6bf/server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts#L403
ChatUiMessageParams(
title = AwsCoreBundle.message("amazonqChat.stopChatResponse"),
body = ""
)
)

val uiMessage = ChatCommunicationManager.convertToJsonToSendToChat(
command = SEND_CHAT_COMMAND_PROMPT,
tabId = stopResponseRequest.params.tabId,
params = paramsJson.toString(),
isPartialResult = false
)
browser.postChat(uiMessage)
}
OPEN_SETTINGS -> {
val openSettingsNotification = serializer.deserializeChatMessages<OpenSettingsNotification>(node)
Expand Down Expand Up @@ -514,6 +497,8 @@
)
browser.postChat(messageToChat)
chatCommunicationManager.removeInflightRequestForTab(tabId)
} catch (e: CancellationException) {
LOG.warn { "Cancelled chat generation" }

Check warning on line 501 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

View check run for this annotation

Codecov / codecov/patch

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

Added lines #L500 - L501 were not covered by tests
} catch (e: Exception) {
LOG.error { "Failed to send chat message $e" }
browser.postChat(chatCommunicationManager.getErrorUiMessage(tabId, e, partialResultToken))
Expand Down
Loading