Merge remote-tracking branch 'origin/feature/q-lsp-chat' into feature/remote-chat-lsp

Author: rli

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

@@ -479,7 +479,7 @@ class BrowserConnector(
             } catch (_: CancellationException) {
                 LOG.warn { "Cancelled chat generation" }
             } catch (e: Exception) {
-                LOG.error(e) { "Failed to send chat message" }
+                LOG.warn(e) { "Failed to send chat message" }
                 browser.postChat(chatCommunicationManager.getErrorUiMessage(tabId, e, partialResultToken))
             }
         }

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

@@ -42,10 +42,10 @@ class ThemeBrowserAdapter {
         append(CssVariable.TextColorWeak, theme.inactiveText)
         append(CssVariable.TextColorDisabled, theme.inactiveText)
 
-        append(CssVariable.Background, theme.background)
+        append(CssVariable.Background, theme.editorBackground)
         append(CssVariable.BackgroundAlt, theme.background)
         append(CssVariable.CardBackground, theme.editorBackground)
-        append(CssVariable.CardBackgroundAlt, theme.editorBackground)
+        append(CssVariable.CardBackgroundAlt, theme.background)
         append(CssVariable.BorderDefault, theme.border)
         append(CssVariable.TabActive, theme.activeTab)
 

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/CodeWhispererLanguageManager.kt

@@ -148,7 +148,7 @@ class CodeWhispererLanguageManager {
             listOf("vue") to CodeWhispererVue.INSTANCE,
             listOf("ps1", "psm1") to CodeWhispererPowershell.INSTANCE,
             listOf("r") to CodeWhispererR.INSTANCE,
-            listOf("abap", "acds") to CodeWhispererAbap.INSTANCE,
+            listOf("abap") to CodeWhispererAbap.INSTANCE,
         ).map {
             val exts = it.first
             val lang = it.second

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererLanguageManagerTest.kt

@@ -137,7 +137,7 @@ class CodeWhispererLanguageManagerTest {
         testGetProgrammingLanguageUtil<CodeWhispererSwift>(listOf("foo"), listOf("swift"))
         testGetProgrammingLanguageUtil<CodeWhispererSystemVerilog>(listOf("foo"), listOf("sv", "svh", "vh"))
         testGetProgrammingLanguageUtil<CodeWhispererVue>(listOf("foo"), listOf("vue"))
-        testGetProgrammingLanguageUtil<CodeWhispererAbap>(listOf("foo"), listOf("abap", "acds"))
+        testGetProgrammingLanguageUtil<CodeWhispererAbap>(listOf("foo"), listOf("abap"))
     }
 
     @Test

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

@@ -59,6 +59,8 @@ import software.aws.toolkits.jetbrains.utils.getCleanedContent
 import software.aws.toolkits.jetbrains.utils.notify
 import software.aws.toolkits.resources.message
 import java.io.File
+import java.net.URLDecoder
+import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.UUID
@@ -147,19 +149,22 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
                 return CompletableFuture.completedFuture(ShowDocumentResult(false))
             }
 
+            // The filepath sent by the server contains unicode characters which need to be
+            // decoded for JB file handling APIs to be handle to handle file operations
+            val fileToOpen = URLDecoder.decode(params.uri, StandardCharsets.UTF_8.name())
             if (params.external == true) {
-                BrowserUtil.open(params.uri)
+                BrowserUtil.open(fileToOpen)
                 return CompletableFuture.completedFuture(ShowDocumentResult(true))
             }
 
             ApplicationManager.getApplication().invokeLater {
                 try {
-                    val virtualFile = VirtualFileManager.getInstance().findFileByUrl(params.uri)
-                        ?: throw IllegalArgumentException("Cannot find file: ${params.uri}")
+                    val virtualFile = VirtualFileManager.getInstance().findFileByUrl(fileToOpen)
+                        ?: throw IllegalArgumentException("Cannot find file: $fileToOpen")
 
                     FileEditorManager.getInstance(project).openFile(virtualFile, true)
                 } catch (e: Exception) {
-                    LOG.warn { "Failed to show document: ${params.uri}" }
+                    LOG.warn { "Failed to show document: $fileToOpen" }
                 }
             }
 

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

@@ -4,14 +4,17 @@
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat
 
 import com.google.gson.Gson
+import com.google.gson.JsonObject
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.eclipse.lsp4j.ProgressParams
+import org.eclipse.lsp4j.jsonrpc.ResponseErrorException
 import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.core.utils.tryOrNull
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
@@ -22,6 +25,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.LSPAny
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.AuthFollowUpClickedParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.AuthFollowupType
 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.ChatMessage
 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.SEND_CHAT_COMMAND_PROMPT
@@ -122,8 +126,15 @@ class ChatCommunicationManager(private val cs: CoroutineScope) {
         token?.let {
             removePartialChatMessage(it)
         }
+        var errorMessage: String? = null
+        if (exception is ResponseErrorException) {
+            errorMessage = tryOrNull {
+                Gson().fromJson(exception.responseError.data as JsonObject, ChatMessage::class.java).body
+            } ?: exception.responseError.message
+        }
+
         val errorTitle = "An error occurred while processing your request."
-        val errorMessage = "Details: ${exception.message}"
+        errorMessage = errorMessage ?: "Details: ${exception.message}"
         val errorParams = Gson().toJson(ErrorParams(tabId, null, errorMessage, errorTitle)).toString()
         val isPartialResult = false
         val uiMessage = """