handle error properly

Author: samgst-amazon

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

@@ -27,6 +27,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.cef.browser.CefBrowser
 import org.eclipse.lsp4j.TextDocumentIdentifier
+import org.eclipse.lsp4j.jsonrpc.ResponseErrorException
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
@@ -94,6 +95,7 @@ import software.aws.toolkits.jetbrains.settings.MeetQSettings
 import software.aws.toolkits.telemetry.MetricResult
 import software.aws.toolkits.telemetry.Telemetry
 import java.util.concurrent.CompletableFuture
+import java.util.concurrent.CompletionException
 import java.util.function.Function
 
 class BrowserConnector(
@@ -382,6 +384,7 @@ class BrowserConnector(
 
             CHAT_TAB_BAR_ACTIONS -> {
                 handleChat(AmazonQChatServer.tabBarActions, node) { params, invoke ->
+                    println("handling TabBarActions")
                     invoke()
                         .whenComplete { actions, error ->
                             try {
@@ -396,9 +399,14 @@ class BrowserConnector(
                                     )
                                 )
                             } catch (e: Exception) {
-                                LOG.error { "Failed to perform chat tab bar action $e" }
-                                params.tabId?.let {
-                                    browser.postChat(chatCommunicationManager.getErrorUiMessage(it, e, null))
+                                val cause = if (e is CompletionException) e.cause else e
+
+                                // dont post error to UI if user cancels export
+                                if (!(cause is ResponseErrorException && cause.responseError.message == "Export cancelled by user")) {
+                                    LOG.error { "Failed to perform chat tab bar action $e" }
+                                    params.tabId?.let {
+                                        browser.postChat(chatCommunicationManager.getErrorUiMessage(it, e, null))
+                                    }
                                 }
                             }
                         }

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

@@ -22,6 +22,9 @@ import org.eclipse.lsp4j.PublishDiagnosticsParams
 import org.eclipse.lsp4j.ShowDocumentParams
 import org.eclipse.lsp4j.ShowDocumentResult
 import org.eclipse.lsp4j.ShowMessageRequestParams
+import org.eclipse.lsp4j.jsonrpc.ResponseErrorException
+import org.eclipse.lsp4j.jsonrpc.messages.ResponseError
+import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode
 import org.slf4j.event.Level
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
@@ -215,8 +218,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
 
                 chosenFile?.let {
                     ShowSaveFileDialogResult(chosenFile.file.path)
-                    // TODO: Add error state shown in chat ui instead of throwing
-                } ?: throw Error("Export failed")
+                } ?: throw ResponseErrorException(ResponseError(ResponseErrorCode.RequestCancelled, "Export cancelled by user", null))
             },
             ApplicationManager.getApplication()::invokeLater
         )