SSO logout now keeps profile in config file, popup removed

.changes/next-release/bugfix-caf370b9-c943-4ece-a4c0-81bcefa7a4f5.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q Feature Dev: Add error messages when the upload URL expires"
+}

.changes/next-release/bugfix-e43f051f-5a66-4a46-ac6f-3f351f76cf6e.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix inability to sign out in reauth view in Q chat panel"
+}

.changes/next-release/feature-fd316552-7161-43bf-aaa5-e1ac1330b939.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Loosen inline completion support limitations for YAML/JSON"
+}

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

@@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.services.amazonq
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
@@ -177,13 +178,15 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
                     ToolkitConnectionManager.getInstance(project)
                         .activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
                     )?.let { connection ->
-                    SsoLogoutAction(connection).actionPerformed(
-                        AnActionEvent.createFromDataContext(
-                            "qBrowser",
-                            null,
-                            DataContext.EMPTY_CONTEXT
+                    runInEdt {
+                        SsoLogoutAction(connection).actionPerformed(
+                            AnActionEvent.createFromDataContext(
+                                "qBrowser",
+                                null,
+                                DataContext.EMPTY_CONTEXT
+                            )
                         )
-                    )
+                    }
                 }
             }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevExceptions.kt

@@ -16,6 +16,13 @@
 
 class MonthlyConversationLimitError(override val message: String, override val cause: Throwable?) : RuntimeException()
 
+class UploadURLExpired(
+    override val message: String = message(
+        "amazonqFeatureDev.exception.upload_url_expiry"
+    ),
+    override val cause: Throwable? = null,
+) : FeatureDevException(message, cause)
+
 internal fun featureDevServiceError(message: String?): Nothing =
     throw FeatureDevException(message)
 
@@ -23,7 +30,7 @@
     throw FeatureDevException(message("amazonqFeatureDev.code_generation.failed_generation"))
 
 internal fun uploadCodeError(): Nothing =
     throw FeatureDevException(message("amazonqFeatureDev.exception.upload_code"))
 
 internal fun conversationIdNotFound(): Nothing =
     throw FeatureDevException(message("amazonqFeatureDev.exception.conversation_not_found"))

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

@@ -36,6 +36,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevExce
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.InboundAppMessagesHandler
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ModifySourceFolderErrorReason
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.UploadURLExpired
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ZipFileError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.createUserFacingErrorMessage
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.denyListedErrors
@@ -444,6 +445,12 @@ class FeatureDevController(
                 messenger.sendMonthlyLimitError(tabId = tabId)
                 messenger.sendChatInputEnabledMessage(tabId, enabled = false)
             }
+            is UploadURLExpired -> messenger.sendAnswer(
+                tabId = tabId,
+                message = err.message,
+                messageType = FeatureDevMessageType.Answer,
+                canBeVoted = true
+            )
             is FeatureDevException -> {
                 messenger.sendError(
                     tabId = tabId,
@@ -471,7 +478,6 @@ class FeatureDevController(
                     ),
                 )
             }
-
             else -> {
                 var msg = createUserFacingErrorMessage("$FEATURE_NAME request failed: ${err.message ?: err.cause?.message}")
                 val isDenyListedError = denyListedErrors.any { msg?.contains(it) ?: false }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/UploadArtifact.kt

@@ -14,6 +14,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.CONTENT_SHA256
 import software.aws.toolkits.jetbrains.services.amazonq.SERVER_SIDE_ENCRYPTION
 import software.aws.toolkits.jetbrains.services.amazonq.SERVER_SIDE_ENCRYPTION_AWS_KMS_KEY_ID
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FEATURE_NAME
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.UploadURLExpired
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients.FeatureDevClient
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.uploadCodeError
 import java.io.File
@@ -36,9 +37,13 @@ fun uploadArtifactToS3(url: String, fileToUpload: File, checksumSha256: String,
                 connection.setFixedLengthStreamingMode(fileToUpload.length())
                 IoUtils.copy(fileToUpload.inputStream(), connection.outputStream)
             }
-    } catch (err: Exception) {
+    } catch (err: HttpRequests.HttpStatusException) {
         logger.warn(err) { "$FEATURE_NAME: Failed to upload code to S3" }
-        uploadCodeError()
+
+        when (err.statusCode) {
+            403 -> throw UploadURLExpired()
+            else -> uploadCodeError()
+        }
     }
 }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt

@@ -58,7 +58,14 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
             .onStart {
                 // The first thing we always send back is an AnswerStream message to indicate the beginning of a streaming answer
                 val response =
-                    ChatMessage(tabId = tabId, triggerId = triggerId, messageId = requestId, messageType = ChatMessageType.AnswerStream, message = "")
+                    ChatMessage(
+                        tabId = tabId,
+                        triggerId = triggerId,
+                        messageId = requestId,
+                        messageType = ChatMessageType.AnswerStream,
+                        message = "",
+                        userIntent = data.userIntent,
+                    )
 
                 telemetryHelper.setResponseStreamStartTime(tabId)
                 emit(response)
@@ -81,13 +88,20 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
                         messageType = ChatMessageType.AnswerPart,
                         message = responseText.toString(),
                         relatedSuggestions = relatedSuggestions,
+                        userIntent = data.userIntent,
                     )
                     emit(suggestionMessage)
                 }
 
                 // Send the Answer message to indicate the end of the response stream
-                val response =
-                    ChatMessage(tabId = tabId, triggerId = triggerId, messageId = requestId, messageType = ChatMessageType.Answer, followUps = followUps)
+                val response = ChatMessage(
+                    tabId = tabId,
+                    triggerId = triggerId,
+                    messageId = requestId,
+                    messageType = ChatMessageType.Answer,
+                    followUps = followUps,
+                    userIntent = data.userIntent,
+                )
 
                 telemetryHelper.setResponseStreamTotalTime(tabId)
                 telemetryHelper.setResponseHasProjectContext(
@@ -119,11 +133,23 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
                 }
             }
             .collect { responseEvent ->
-                processChatEvent(tabId, triggerId, responseEvent, shouldAddIndexInProgressMessage)?.let { emit(it) }
+                processChatEvent(
+                    tabId,
+                    triggerId,
+                    data,
+                    responseEvent,
+                    shouldAddIndexInProgressMessage
+                )?.let { emit(it) }
             }
     }
 
-    private fun processChatEvent(tabId: String, triggerId: String, event: ChatResponseEvent, shouldAddIndexInProgressMessage: Boolean): ChatMessage? {
+    private fun processChatEvent(
+        tabId: String,
+        triggerId: String,
+        data: ChatRequestData,
+        event: ChatResponseEvent,
+        shouldAddIndexInProgressMessage: Boolean,
+    ): ChatMessage? {
         requestId = event.requestId
         statusCode = event.statusCode
 
@@ -190,6 +216,7 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
                 messageType = ChatMessageType.AnswerPart,
                 message = message,
                 codeReference = codeReferences,
+                userIntent = data.userIntent,
             )
         } else {
             null

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/messages/CwcMessage.kt

@@ -213,6 +213,7 @@ data class ChatMessage(
     val followUpsHeader: String? = null,
     val relatedSuggestions: List<Suggestion>? = null,
     val codeReference: List<CodeReference>? = null,
+    val userIntent: UserIntent? = null,
 ) : UiMessage(
     tabId = tabId,
     type = "chatMessage",

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/editor/CodeWhispererEditorUtil.kt

@@ -12,13 +12,14 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.psi.PsiFile
 import com.intellij.ui.popup.AbstractPopup
-import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJson
-import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererYaml
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretPosition
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.FileContextInfo
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.AWSTemplateCaseInsensitiveKeyWordsRegex
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.AWSTemplateKeyWordsRegex
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.JsonConfigFileNamingConvention
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.LEFT_CONTEXT_ON_CURRENT_LINE
 import java.awt.Point
 import java.util.Locale
@@ -106,16 +107,12 @@ object CodeWhispererEditorUtil {
     }
 
     /**
-     * Checks if the language is json or yaml and checks if left context contains keywords
+     * Check if left context contains keywords or file name follow config json file naming pattern
      */
-    fun checkLeftContextKeywordsForJsonAndYaml(leftContext: String, language: String): Boolean = (
-        (language == CodeWhispererJson.INSTANCE.languageId) ||
-            (language == CodeWhispererYaml.INSTANCE.languageId)
-        ) &&
-        (
-            (!CodeWhispererConstants.AWSTemplateKeyWordsRegex.containsMatchIn(leftContext)) &&
-                (!CodeWhispererConstants.AWSTemplateCaseInsensitiveKeyWordsRegex.containsMatchIn(leftContext.lowercase(Locale.getDefault())))
-            )
+    fun isSupportedJsonFormat(fileName: String, leftContext: String): Boolean =
+        JsonConfigFileNamingConvention.contains(fileName.lowercase()) ||
+            AWSTemplateKeyWordsRegex.containsMatchIn(leftContext) ||
+            AWSTemplateCaseInsensitiveKeyWordsRegex.containsMatchIn(leftContext.lowercase(Locale.getDefault()))
 
     /**
      * Checks if the [otherRange] overlaps this TextRange. Note that the comparison is `<` because the endOffset of TextRange is exclusive.

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

@@ -10,24 +10,31 @@ import com.intellij.psi.PsiFile
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererC
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererCpp
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererCsharp
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererDart
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererGo
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJava
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJavaScript
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJson
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJsx
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererKotlin
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererLua
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererPhp
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererPlainText
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererPowershell
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererPython
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererR
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererRuby
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererRust
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererScala
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererShell
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererSql
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererSwift
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererSystemVerilog
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererTf
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererTsx
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererTypeScript
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererUnknownLanguage
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererVue
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererYaml
 
 @Service
@@ -73,8 +80,15 @@ class CodeWhispererLanguageManager {
             fileTypeName.contains("php") -> CodeWhispererPhp.INSTANCE
             fileTypeName.contains("sql") -> CodeWhispererSql.INSTANCE
             fileTypeName.contains("go") -> CodeWhispererGo.INSTANCE
-            fileTypeName.contains("shell") -> CodeWhispererShell.INSTANCE
             fileTypeName.contains("rust") -> CodeWhispererRust.INSTANCE
+            fileTypeName.contains("swift") -> CodeWhispererSwift.INSTANCE
+            fileTypeName.contains("lua") -> CodeWhispererLua.INSTANCE
+            fileTypeName.contains("dart") -> CodeWhispererDart.INSTANCE
+            fileTypeName.contains("vue") -> CodeWhispererVue.INSTANCE
+            fileTypeName.contains("systemverilog") -> CodeWhispererSystemVerilog.INSTANCE
+            fileTypeName.contains("powershell") -> CodeWhispererPowershell.INSTANCE
+            fileTypeName.contains("shell") -> CodeWhispererShell.INSTANCE
+            fileTypeName == "r" -> CodeWhispererR.INSTANCE
             // fileTypeName.contains("plain_text") -> CodeWhispererPlainText.INSTANCE // This needs to be removed because Hcl files are recognised as plain_text by JB
             else -> null
         }
@@ -125,7 +139,14 @@ class CodeWhispererLanguageManager {
             listOf("go") to CodeWhispererGo.INSTANCE,
             listOf("php") to CodeWhispererPhp.INSTANCE,
             listOf("sql") to CodeWhispererSql.INSTANCE,
-            listOf("txt") to CodeWhispererPlainText.INSTANCE
+            listOf("txt") to CodeWhispererPlainText.INSTANCE,
+            listOf("sv", "svh", "vh") to CodeWhispererSystemVerilog.INSTANCE,
+            listOf("dart") to CodeWhispererDart.INSTANCE,
+            listOf("lua", "wlua") to CodeWhispererLua.INSTANCE,
+            listOf("swift") to CodeWhispererSwift.INSTANCE,
+            listOf("vue") to CodeWhispererVue.INSTANCE,
+            listOf("ps1", "psm1") to CodeWhispererPowershell.INSTANCE,
+            listOf("r") to CodeWhispererR.INSTANCE,
         ).map {
             val exts = it.first
             val lang = it.second

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

@@ -0,0 +1,22 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codewhisperer.language.languages
+
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
+import software.aws.toolkits.telemetry.CodewhispererLanguage
+
+class CodeWhispererDart private constructor() : CodeWhispererProgrammingLanguage() {
+    override val languageId: String = ID
+
+    override fun toTelemetryType(): CodewhispererLanguage = CodewhispererLanguage.Dart
+
+    override fun isCodeCompletionSupported(): Boolean = true
+
+    companion object {
+        // TODO: confirm with service team language id
+        const val ID = "dart"
+
+        val INSTANCE = CodeWhispererDart()
+    }
+}

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

@@ -0,0 +1,22 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codewhisperer.language.languages
+
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
+import software.aws.toolkits.telemetry.CodewhispererLanguage
+
+class CodeWhispererLua private constructor() : CodeWhispererProgrammingLanguage() {
+    override val languageId: String = ID
+
+    override fun toTelemetryType(): CodewhispererLanguage = CodewhispererLanguage.Lua
+
+    override fun isCodeCompletionSupported(): Boolean = true
+
+    companion object {
+        // TODO: confirm with service team language id
+        const val ID = "lua"
+
+        val INSTANCE = CodeWhispererLua()
+    }
+}

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

@@ -0,0 +1,22 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codewhisperer.language.languages
+
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
+import software.aws.toolkits.telemetry.CodewhispererLanguage
+
+class CodeWhispererPowershell private constructor() : CodeWhispererProgrammingLanguage() {
+    override val languageId: String = ID
+
+    override fun toTelemetryType(): CodewhispererLanguage = CodewhispererLanguage.Powershell
+
+    override fun isCodeCompletionSupported(): Boolean = true
+
+    companion object {
+        // TODO: confirm with service team language id
+        const val ID = "powershell"
+
+        val INSTANCE = CodeWhispererPowershell()
+    }
+}

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

@@ -0,0 +1,22 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codewhisperer.language.languages
+
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
+import software.aws.toolkits.telemetry.CodewhispererLanguage
+
+class CodeWhispererR private constructor() : CodeWhispererProgrammingLanguage() {
+    override val languageId: String = ID
+
+    override fun toTelemetryType(): CodewhispererLanguage = CodewhispererLanguage.R
+
+    override fun isCodeCompletionSupported(): Boolean = true
+
+    companion object {
+        // TODO: confirm with service team language id
+        const val ID = "r"
+
+        val INSTANCE = CodeWhispererR()
+    }
+}