Merge branch 'main' into add-file-creation-error

Author: akhamis-amzn

.changes/3.70.json

@@ -0,0 +1,20 @@
+{
+  "date" : "2025-05-08",
+  "version" : "3.70",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q: Support selecting customizations across all Q profiles with automatic profile switching for enterprise users"
+  }, {
+    "type" : "bugfix",
+    "description" : "Do not always show 'Amazon Q Code Issues' tab when switching to the 'Problems' tool window"
+  }, {
+    "type" : "bugfix",
+    "description" : "/dev: Fix missing Amazon Q feature dev auto build setting."
+  }, {
+    "type" : "bugfix",
+    "description" : "increase /review timeout"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix JavascriptLanguage not found on 2025.1+"
+  } ]
+}

.changes/next-release/bugfix-54c0cf8a-9df5-4673-bf16-61a650434abc.json

@@ -1,3 +1,10 @@
+# _3.70_ (2025-05-08)
+- **(Feature)** Amazon Q: Support selecting customizations across all Q profiles with automatic profile switching for enterprise users
+- **(Bug Fix)** Do not always show 'Amazon Q Code Issues' tab when switching to the 'Problems' tool window
+- **(Bug Fix)** /dev: Fix missing Amazon Q feature dev auto build setting.
+- **(Bug Fix)** increase /review timeout
+- **(Bug Fix)** Fix JavascriptLanguage not found on 2025.1+
+
 # _3.69_ (2025-04-28)
 - **(Bug Fix)** Amazon Q: Fix issue where context menu items are not available after re-opening projects or restarting the IDE
 - **(Bug Fix)** Fix LinkageError while attempting to do Amazon Q inline suggestions in certain environments

.changes/next-release/bugfix-7920ece4-99d6-4828-931e-29b66994dc10.json

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

.changes/next-release/bugfix-7e09465d-6cb8-4180-9131-7ec6543db20c.json

@@ -90,7 +90,9 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
                 override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
-                    switchCustomization(project, null)
+                    pluginAwareExecuteOnPooledThread {
+                        CodeWhispererModelConfigurator.getInstance().listCustomizations(project, passive = true)
+                    }
                 }
             }
         )

.changes/next-release/feature-ae7d15f4-ae07-4faf-963a-6d83a85852e4.json

@@ -615,7 +615,7 @@ class CodeWhispererModelConfiguratorTest {
     }
 
     @Test
-    fun `should switch to default customization on profile changed`() {
+    fun `profile switch should keep using existing customization if new list still contains that arn`() {
         val ssoConn = spy(LegacyManagedBearerSsoConnection(region = "us-east-1", startUrl = "url 1", scopes = Q_SCOPES))
         ToolkitConnectionManager.getInstance(projectRule.project).switchConnection(ssoConn)
         val oldCustomization = CodeWhispererCustomization("oldArn", "oldName", "oldDescription")
@@ -632,7 +632,7 @@ class CodeWhispererModelConfiguratorTest {
             .syncPublisher(QRegionProfileSelectedListener.TOPIC)
             .onProfileSelected(projectRule.project, null)
 
-        assertThat(sut.activeCustomization(projectRule.project)).isEqualTo(null)
+        assertThat(sut.activeCustomization(projectRule.project)).isEqualTo(oldCustomization)
     }
 
     @Test

CHANGELOG.md

@@ -3,6 +3,6 @@
 
 package compat.com.intellij.lang.javascript
 
-// probably not necessary, but inline to avoid loading this through core classpath
+// inline to avoid loading this through core classpath
 inline val JavascriptLanguage
     get() = com.intellij.lang.javascript.JavascriptLanguage.INSTANCE