format

Author: leigaol

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

@@ -442,7 +442,7 @@ class BrowserConnector(
                         } catch (e: Exception) {
                             LOG.error { "Failed to perform chat tab bar action $e" }
                             params.tabId?.let {
-                                chatCommunicationManager.sendErrorToUi(it, e, null)
+                                browser.postChat(chatCommunicationManager.getErrorUiMessage(it, e, null))
                             }
                         }
                     }
@@ -500,11 +500,14 @@ class BrowserConnector(
                     encryptionManager?.decrypt(value).orEmpty(),
                     isPartialResult = false
                 )
+                if (messageToChat.contains("abc")) {
+                    throw Exception("abc err")
+                }
                 browser.postChat(messageToChat)
                 chatCommunicationManager.removeInflightRequestForTab(tabId)
             } catch (e: Exception) {
                 LOG.error { "Failed to send chat message $e" }
-                chatCommunicationManager.sendErrorToUi(tabId, e, partialResultToken)
+                browser.postChat(chatCommunicationManager.getErrorUiMessage(tabId, e, partialResultToken))
             }
 
         }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt

@@ -73,28 +73,25 @@ class ChatCommunicationManager {
         }
     }
 
-    fun sendErrorToUi(tabId: String, exception: Exception, token: String?) {
+    fun getErrorUiMessage(tabId: String, exception: Exception, token: String?): String {
         token?.let {
             removePartialChatMessage(it)
         }
         val errorTitle = "An error occurred while processing your request."
         val errorMessage = "Details: ${exception.message}"
-        val errorParams = Gson().toJsonTree(ErrorParams(tabId, null, errorMessage, errorTitle))
-        sendErrorMessageToChatUi(CHAT_ERROR_PARAMS, tabId, errorParams, false)
-    }
-
-    private fun sendErrorMessageToChatUi(command: String, tabId: String, partialChatResult: JsonElement, isPartialResult: Boolean) {
+        val errorParams = Gson().toJson(ErrorParams(tabId, null, errorMessage, errorTitle)).toString()
         val uiMessage =  """
                 {
-                "command":"$command",
+                "command":"$CHAT_ERROR_PARAMS",
                 "tabId": "$tabId",
-                "params": $partialChatResult,
-                "isPartialResult": $isPartialResult
+                "params": "$errorParams",
+                "isPartialResult": "true"
                 }
             """.trimIndent()
-        AsyncChatUiListener.notifyPartialMessageUpdate(uiMessage)
+        return uiMessage
     }
 
+
     companion object {
         fun getInstance(project: Project) = project.service<ChatCommunicationManager>()