Merge conflicts resolved

Author: manodnyab

.changes/3.67.json

@@ -0,0 +1,20 @@
+{
+  "date" : "2025-04-18",
+  "version" : "3.67",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Customization now resets with a warning if unavailable in the selected profile."
+  }, {
+    "type" : "bugfix",
+    "description" : "Q panel will get stuck while signin if users have multiple windows"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix integer overflow when local context index input is larger than 2GB"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix workspace index process quits when hitting a race condition"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix infinite loop when workspace indexing server fails to initialize"
+  } ]
+}

.changes/next-release/bugfix-2acb4142-8c33-475d-a57a-3445fa4a7725.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/review: disabled highlighter for ignored issues"
+}

.changes/next-release/feature-f49ee314-0987-45cd-84fe-d852e67c8723.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q /test: Remove unsupported message for non-java python languages"
+}

CHANGELOG.md

@@ -1,3 +1,10 @@
+# _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
+- **(Bug Fix)** Fix integer overflow when local context index input is larger than 2GB
+- **(Bug Fix)** Fix workspace index process quits when hitting a race condition
+- **(Bug Fix)** Fix infinite loop when workspace indexing server fails to initialize
+
 # _3.66_ (2025-04-11)
 - **(Feature)** The logs emitted by the Agent during user command execution will be accepted and written to `.amazonq/dev/run_command.log` file in the user's local repository.
 - **(Bug Fix)** Unit test generation now completes successfully when using the `/test` command

gradle.properties

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.67-SNAPSHOT
+toolkitVersion=3.68-SNAPSHOT
 
 # Publish Settings
 publishToken=

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

@@ -95,7 +95,8 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
         project.messageBus.connect(toolWindow.disposable).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
+                // note we name myProject intentionally ow it will shadow the "project" provided by the IDE
+                override fun onProfileSelected(myProject: Project, profile: QRegionProfile?) {
                     if (project.isDisposed) return
                     AmazonQToolWindow.getInstance(project).disposeAndRecreate()
                     qPanel.setContent(AmazonQToolWindow.getInstance(project).component)

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -244,26 +244,22 @@ class CodeTestChatController(
                     })
                 }
                 .build()
+            if (!fileInfo.fileInWorkspace) {
+                val messageContent =
+                    "<span style=\"color: #EE9D28;\">&#9888;<b> I can't generate tests for ${fileInfo.fileName}" +
+                        " because it's outside the project directory.</b><br></span> " +
+                        "I can still provide examples, instructions and code suggestions."
 
-            val messageContent = if (fileInfo.fileInWorkspace) {
-                "<span style=\"color: #EE9D28;\">&#9888;<b> ${fileInfo.fileLanguage.languageId} is not a " +
-                    "language I support specialized unit test generation for at the moment.</b><br></span>The languages " +
-                    "I support now are Python and Java. I can still provide examples, instructions and code suggestions."
-            } else {
-                "<span style=\"color: #EE9D28;\">&#9888;<b> I can't generate tests for ${fileInfo.fileName}" +
-                    " because it's outside the project directory.</b><br></span> " +
-                    "I can still provide examples, instructions and code suggestions."
+                codeTestChatHelper.addNewMessage(
+                    CodeTestChatMessageContent(
+                        message = messageContent,
+                        type = ChatMessageType.Answer,
+                        canBeVoted = false
+                    ),
+                    message.tabId,
+                    false
+                )
             }
-
-            codeTestChatHelper.addNewMessage(
-                CodeTestChatMessageContent(
-                    message = messageContent,
-                    type = ChatMessageType.Answer,
-                    canBeVoted = false
-                ),
-                message.tabId,
-                false
-            )
             testResponseMessageId = codeTestChatHelper.addAnswer(
                 CodeTestChatMessageContent(
                     message = "",

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt

@@ -361,6 +361,8 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
             } else {
                 null
             }
+        }.filter {
+            it.isVisible
         }.onEach { issue ->
             // Add range highlighters for all the issues found.
             runInEdt {

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt

@@ -22,6 +22,8 @@ import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.amazonq.calculateIfIamIdentityCenterConnection
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileSelectedListener
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.jetbrains.utils.notifyInfo
@@ -48,6 +50,7 @@ private fun notifyInvalidSelectedCustomization(project: Project) {
 }
 
 private fun notifyNewCustomization(project: Project) {
+    if (ApplicationManager.getApplication().isUnitTestMode) return
     notifyInfo(
         title = message("codewhisperer.custom.dialog.title"),
         content = message("codewhisperer.notification.custom.new_customization"),
@@ -81,6 +84,18 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
 
     private var customizationArnOverrideV2: String? = null
 
+    init {
+        ApplicationManager.getApplication().messageBus.connect(this).subscribe(
+            QRegionProfileSelectedListener.TOPIC,
+            object : QRegionProfileSelectedListener {
+                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
+                    pluginAwareExecuteOnPooledThread {
+                        CodeWhispererModelConfigurator.getInstance().listCustomizations(project, passive = true)
+                    }
+                }
+            }
+        )
+    }
     override fun showConfigDialog(project: Project) {
         runInEdt {
             calculateIfIamIdentityCenterConnection(project) {

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt

@@ -169,7 +169,7 @@ class CodeWhispererConfigurable(private val project: Project) :
 
             row(message("aws.settings.codewhisperer.project_context_index_thread")) {
                 intTextField(
-                    range = IntRange(0, 50)
+                    range = CodeWhispererSettings.CONTEXT_INDEX_THREADS
                 ).bindIntText(codeWhispererSettings::getProjectContextIndexThreadCount, codeWhispererSettings::setProjectContextIndexThreadCount)
                     .apply {
                         connect.subscribe(
@@ -186,7 +186,7 @@ class CodeWhispererConfigurable(private val project: Project) :
 
             row(message("aws.settings.codewhisperer.project_context_index_max_size")) {
                 intTextField(
-                    range = IntRange(1, 4096)
+                    range = CodeWhispererSettings.CONTEXT_INDEX_SIZE
                 ).bindIntText(codeWhispererSettings::getProjectContextIndexMaxSize, codeWhispererSettings::setProjectContextIndexMaxSize)
                     .apply {
                         connect.subscribe(