Merge branch 'feature/q-lsp-chat' into samgst/q-chat-feedback

samgst-amazon · web-flow · commit 62296ef88c71 · 2025-04-23T09:35:07.000-07:00
diff --git a/.changes/3.68.json b/.changes/3.68.json
@@ -0,0 +1,20 @@
+{
+  "date" : "2025-04-23",
+  "version" : "3.68",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q: Show visual indicator in status bar if profile selection is needed to continue with Q Inline / Q Chat"
+  }, {
+    "type" : "feature",
+    "description" : "Amazon Q /test: Remove unsupported message for non-java python languages"
+  }, {
+    "type" : "bugfix",
+    "description" : "/dev: Fix prompt to enable devfile build not triggering when devfile is present."
+  }, {
+    "type" : "bugfix",
+    "description" : "/review disable auto scan by default"
+  }, {
+    "type" : "bugfix",
+    "description" : "/review: disabled highlighter for ignored issues"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-2301aeeb-f36e-4776-8e9b-4238c55e43f4.json b/.changes/next-release/bugfix-2301aeeb-f36e-4776-8e9b-4238c55e43f4.json
diff --git a/.changes/next-release/bugfix-271e3abd-91e9-40a4-9a3d-7c7457ff6f22.json b/.changes/next-release/bugfix-271e3abd-91e9-40a4-9a3d-7c7457ff6f22.json
diff --git a/.changes/next-release/bugfix-2acb4142-8c33-475d-a57a-3445fa4a7725.json b/.changes/next-release/bugfix-2acb4142-8c33-475d-a57a-3445fa4a7725.json
diff --git a/.changes/next-release/feature-f49ee314-0987-45cd-84fe-d852e67c8723.json b/.changes/next-release/feature-f49ee314-0987-45cd-84fe-d852e67c8723.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# _3.68_ (2025-04-23)
+- **(Feature)** Amazon Q: Show visual indicator in status bar if profile selection is needed to continue with Q Inline / Q Chat
+- **(Feature)** Amazon Q /test: Remove unsupported message for non-java python languages
+- **(Bug Fix)** /dev: Fix prompt to enable devfile build not triggering when devfile is present.
+- **(Bug Fix)** /review disable auto scan by default
+- **(Bug Fix)** /review: disabled highlighter for ignored issues
+
 # _3.67_ (2025-04-18)
 - **(Bug Fix)** Amazon Q: Customization now resets with a warning if unavailable in the selected profile.
 - **(Bug Fix)** Q panel will get stuck while signin if users have multiple windows
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.68-SNAPSHOT
+toolkitVersion=3.69-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
@@ -32,10 +32,12 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_INFO_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_QUICK_ACTION
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_READY
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SOURCE_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatNotification
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatPrompt
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatReadyNotification
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CursorState
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
@@ -223,6 +225,11 @@ class BrowserConnector(
                     server.feedback(params)
                 }
             }
+            CHAT_READY -> {
+                handleChatNotification<ChatReadyNotification, Unit>(node) { server, _ ->
+                    server.chatReady()
+                }
+            }
             CHAT_LINK_CLICK -> {
                 handleChatNotification<LinkClickNotification, LinkClickParams>(node) { server, params ->
                     server.linkClick(params)
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanIssueDetailsPanel.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanIssueDetailsPanel.kt
@@ -37,8 +37,8 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.ope
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.sendCodeFixGeneratedTelemetryToServiceAPI
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.truncateIssueTitle
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.getHexString
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.getHexString
 import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.Component
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/listeners/CodeWhispererCodeScanEditorMouseMotionListener.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/listeners/CodeWhispererCodeScanEditorMouseMotionListener.kt
@@ -41,8 +41,8 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.sen
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.truncateIssueTitle
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererColorUtil.getHexString
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.getHexString
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CodeFixAction
 import software.aws.toolkits.telemetry.MetricResult
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/status/CodeWhispererStatusBarWidget.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/status/CodeWhispererStatusBarWidget.kt
@@ -23,6 +23,9 @@ import software.aws.toolkits.jetbrains.core.credentials.profiles.ProfileWatcher
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProviderListener
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.amazonq.gettingstarted.QActionGroups.Q_SIGNED_OUT_ACTION_GROUP
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileSelectedListener
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererCustomizationListener
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.QStatusBarLoggedInActionGroup
@@ -76,6 +79,20 @@ class CodeWhispererStatusBarWidget(project: Project) :
                 }
             }
         )
+
+        ApplicationManager.getApplication().messageBus.connect(this).subscribe(
+            QRegionProfileSelectedListener.TOPIC,
+            object : QRegionProfileSelectedListener {
+                override fun onProfileSelected(
+                    project: Project,
+                    profile: QRegionProfile?,
+                ) {
+                    if (project == this@CodeWhispererStatusBarWidget.project) {
+                        statusBar.updateWidget(ID)
+                    }
+                }
+            }
+        )
     }
 
     override fun ID(): String = ID
@@ -121,7 +138,7 @@ class CodeWhispererStatusBarWidget(project: Project) :
     }
 
     override fun getIcon(): Icon =
-        if (isQExpired(project)) {
+        if (isQExpired(project) || QRegionProfileManager.getInstance().isPendingProfileSelection(project)) {
             AllIcons.General.BalloonWarning
         } else if (!isQConnected(project)) {
             AllIcons.RunConfigurations.TestState.Run
diff --git a/plugins/amazonq/shared/jetbrains-community/resources/software/aws/toolkits/resources/AmazonQBundle.properties b/plugins/amazonq/shared/jetbrains-community/resources/software/aws/toolkits/resources/AmazonQBundle.properties
@@ -12,6 +12,7 @@ amazonq.workspace.settings.open.prompt=Workspace index is now enabled. You can d
 action.q.profile.usage.text=You changed your profile
 action.q.profile.usage=You''re using the ''<b>{0}</b>'' profile for Amazon Q.
 action.q.switchProfiles.text=Change Profile
+action.q.switchProfiles.text.action_required=<html><body>Change Profile <font color="{0}}">Select a profile to proceed</font></body></html>
 action.q.switchProfiles.dialog.text=Amazon Q Developer Profile
 action.q.switchProfiles.dialog.account.label=Account: {0}
 action.q.switchProfiles.dialog.panel.text=Change your Q Developer profile
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/actions/QSwitchProfilesAction.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/actions/QSwitchProfilesAction.kt
@@ -8,8 +8,10 @@ import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.project.DumbAware
+import com.intellij.ui.JBColor
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileDialog
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.getHexString
 import software.aws.toolkits.resources.AmazonQBundle.message
 
 class QSwitchProfilesAction : AnAction(message("action.q.switchProfiles.text")), DumbAware {
@@ -18,6 +20,10 @@ class QSwitchProfilesAction : AnAction(message("action.q.switchProfiles.text")),
 
     override fun update(e: AnActionEvent) {
         e.presentation.icon = AllIcons.Actions.SwapPanels
+        val project = e.project ?: return
+        if (QRegionProfileManager.getInstance().isPendingProfileSelection(project)) {
+            e.presentation.text = message("action.q.switchProfiles.text.action_required", JBColor.GRAY.getHexString())
+        }
     }
 
     override fun actionPerformed(e: AnActionEvent) {
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageServer.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageServer.kt
@@ -14,6 +14,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_INFO_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_QUICK_ACTION
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_READY
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SOURCE_LINK_CLICK
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
@@ -55,6 +56,9 @@ interface AmazonQLanguageServer : LanguageServer {
     @JsonNotification(CHAT_FEEDBACK)
     fun feedback(params: FeedbackParams): CompletableFuture<Unit>
 
+    @JsonNotification(CHAT_READY)
+    fun chatReady(): CompletableFuture<Unit>
+
     @JsonNotification(CHAT_LINK_CLICK)
     fun linkClick(params: LinkClickParams): CompletableFuture<Unit>
 
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatReadyNotification.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatReadyNotification.kt
@@ -0,0 +1,9 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
+
+data class ChatReadyNotification(
+    override val command: String,
+    override val params: Unit = Unit,
+) : ChatNotification<Unit>
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/FlareChatCommands.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/FlareChatCommands.kt
@@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
 
 const val SEND_CHAT_COMMAND_PROMPT = "aws/chat/sendChatPrompt"
 const val CHAT_QUICK_ACTION = "aws/chat/sendChatQuickAction"
+const val CHAT_READY = "aws/chat/ready"
 const val CHAT_LINK_CLICK = "aws/chat/linkClick"
 const val CHAT_INFO_LINK_CLICK = "aws/chat/infoLinkClick"
 const val CHAT_SOURCE_LINK_CLICK = "aws/chat/sourceLinkClick"
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererColorUtil.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererColorUtil.kt
@@ -21,6 +21,6 @@ object CodeWhispererColorUtil {
     val EDITOR_CODE_REFERENCE_HOVER = JBColor(0x4B4D4D, 0x4B4D4D)
     val INACTIVE_TEXT_COLOR = UIUtil.getInactiveTextColor().getHexString()
     val TRY_EXAMPLE_EVEN_ROW_COLOR = JBColor(0xCACACA, 0x252525)
-
-    fun Color.getHexString() = String.format("#%02x%02x%02x", this.red, this.green, this.blue)
 }
+
+fun Color.getHexString() = String.format(null, "#%02x%02x%02x", this.red, this.green, this.blue)
