Skip to content

Commit c03620f

Browse files
committed
error handling
1 parent 599df15 commit c03620f

File tree

3 files changed

+30
-8
lines changed

3 files changed

+30
-8
lines changed

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -425,14 +425,22 @@ class BrowserConnector(
425425
browser: Browser,
426426
) {
427427
result.whenComplete { value, error ->
428-
chatCommunicationManager.removePartialChatMessage(partialResultToken)
429-
val messageToChat = ChatCommunicationManager.convertToJsonToSendToChat(
430-
SEND_CHAT_COMMAND_PROMPT,
431-
tabId,
432-
encryptionManager?.decrypt(value).orEmpty(),
433-
isPartialResult = false
434-
)
435-
browser.postChat(messageToChat)
428+
try {
429+
if (error != null) {
430+
throw error
431+
}
432+
chatCommunicationManager.removePartialChatMessage(partialResultToken)
433+
val messageToChat = ChatCommunicationManager.convertToJsonToSendToChat(
434+
SEND_CHAT_COMMAND_PROMPT,
435+
tabId,
436+
encryptionManager?.decrypt(value).orEmpty(),
437+
isPartialResult = false
438+
)
439+
browser.postChat(messageToChat)
440+
441+
} catch (e: Exception) {
442+
443+
}
436444
}
437445
}
438446

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
5+
6+
import org.eclipse.lsp4j.TextDocumentIdentifier
7+
8+
data class ErrorParams(
9+
val tabID: String,
10+
val triggerType: String?,
11+
val message: String,
12+
val title: String
13+
)

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/FlareChatCommands.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ const val CHAT_SEND_UPDATE = "aws/chat/sendChatUpdate"
3131
const val CHAT_CREATE_PROMPT = "aws/chat/createPrompt"
3232
const val SHOW_SAVE_FILE_DIALOG_REQUEST_METHOD = "aws/showSaveFileDialog"
3333
const val GET_SERIALIZED_CHAT_REQUEST_METHOD = "aws/chat/getSerializedChat"
34+
const val CHAT_ERROR_PARAMS = "errorMessage"

0 commit comments

Comments
 (0)