detekt

Author: leigaol

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

@@ -91,7 +91,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.Promp
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.PromptInputOptionChangeParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.QuickChatActionRequest
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_CHAT_COMMAND_PROMPT
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_ERROR_PARAMS
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.STOP_CHAT_RESPONSE
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendChatPromptRequest
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SourceLinkClickNotification
@@ -212,8 +211,6 @@ class BrowserConnector(
         }
     }
 
-
-
     private fun handleFlareChatMessages(browser: Browser, node: JsonNode) {
         when (node.command) {
             SEND_CHAT_COMMAND_PROMPT -> {
@@ -285,21 +282,14 @@ class BrowserConnector(
                     server.listConversations(requestFromUi.params)
                 } ?: (CompletableFuture.failedFuture(IllegalStateException("LSP Server not running")))
 
-                result.whenComplete { response, error ->
-                    try {
-                        if (error != null) {
-                            throw error
-                        }
-                        val uiMessage = """
+                result.whenComplete { response, _ ->
+                    val uiMessage = """
                         {
                             "command": "$CHAT_LIST_CONVERSATIONS",
                             "params": ${Gson().toJson(response)}
                         }
                     """.trimIndent()
-                        browser.postChat(uiMessage)
-                    } catch (e: Exception) {
-                        LOG.error { "Failed to perform list conversation $e" }
-                    }
+                    browser.postChat(uiMessage)
                 }
             }
             CHAT_CONVERSATION_CLICK -> {
@@ -308,21 +298,14 @@ class BrowserConnector(
                     server.conversationClick(requestFromUi.params)
                 } ?: (CompletableFuture.failedFuture(IllegalStateException("LSP Server not running")))
 
-                result.whenComplete { response, error ->
-                    try {
-                        if (error != null) {
-                            throw error
-                        }
-                        val uiMessage = """
+                result.whenComplete { response, _ ->
+                    val uiMessage = """
                         {
                             "command": "$CHAT_CONVERSATION_CLICK",
                             "params": ${Gson().toJson(response)}
                         }
                     """.trimIndent()
-                        browser.postChat(uiMessage)
-                    } catch (e: Exception) {
-                        LOG.error { "Failed to perform conversation click $e" }
-                    }
+                    browser.postChat(uiMessage)
                 }
             }
             CHAT_FEEDBACK -> {
@@ -506,11 +489,9 @@ class BrowserConnector(
                 LOG.error { "Failed to send chat message $e" }
                 browser.postChat(chatCommunicationManager.getErrorUiMessage(tabId, e, partialResultToken))
             }
-
         }
     }
 
-
     private fun cancelInflightRequests(tabId: String) {
         chatCommunicationManager.getInflightRequestForTab(tabId)?.let { request ->
             request.cancel(true)

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

@@ -4,18 +4,17 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat
 
 import com.google.gson.Gson
-import com.google.gson.JsonElement
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import org.eclipse.lsp4j.ProgressParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ProgressNotificationUtils.getObject
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_ERROR_PARAMS
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ErrorParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GetSerializedChatResult
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.OpenTabResult
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_CHAT_COMMAND_PROMPT
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_ERROR_PARAMS
 import java.util.UUID
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ConcurrentHashMap
@@ -81,18 +80,17 @@ class ChatCommunicationManager {
         val errorMessage = "Details: ${exception.message}"
         val errorParams = Gson().toJson(ErrorParams(tabId, null, errorMessage, errorTitle)).toString()
         val isPartialResult = false
-        val uiMessage =  """
+        val uiMessage = """
                 {
                 "command":"$CHAT_ERROR_PARAMS",
                 "tabId": "$tabId",
                 "params": $errorParams,
                 "isPartialResult": $isPartialResult
                 }
-            """.trimIndent()
+        """.trimIndent()
         return uiMessage
     }
 
-
     companion object {
         fun getInstance(project: Project) = project.service<ChatCommunicationManager>()
 

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

@@ -3,11 +3,9 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
 
-import org.eclipse.lsp4j.TextDocumentIdentifier
-
 data class ErrorParams(
     val tabId: String,
     val triggerType: String?,
     val message: String,
-    val title: String
+    val title: String,
 )