aaa

Author: Will-ShaoHua

.changes/3.64.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-04-10",
+  "version" : "3.64",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Fix issue where IDE freezes when logging into Amazon Q"
+  } ]
+}

.changes/next-release/bugfix-1162ea20-1fcf-43a6-b502-16d8b7d588d7.json

@@ -1,4 +1,7 @@
-# _3.63_ (2025-04-09)
+# _3.64_ (2025-04-10)
+- **(Bug Fix)** Fix issue where IDE freezes when logging into Amazon Q
+
+# _3.63_ (2025-04-08)
 - **(Feature)** Enterprise users can choose their preferred Amazon Q profile to improve personalization and workflow across different business regions
 - **(Bug Fix)** Amazon Q /doc: close diff tab and open README file in preview mode after user accept changes
 

CHANGELOG.md

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

gradle.properties

@@ -18,6 +18,7 @@ import com.intellij.ui.dsl.builder.Align
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.jcef.JBCefJSQuery
 import org.cef.CefApp
+import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
@@ -293,6 +294,11 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
                         null
                     }
 
+                    if (profiles?.size == 1) {
+                        LOG.debug { "User only have access to 1 Q profile, auto-selecting profile ${profiles.first().profileName} for ${project.name}" }
+                        QRegionProfileManager.getInstance().switchProfile(project, profiles.first(), QProfileSwitchIntent.Update)
+                    }
+
                     // required EDT as this entire block is executed on thread pool
                     runInEdt {
                         val jsonData = """

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

@@ -97,7 +97,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
                 override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
                     if (project.isDisposed) return
                     AmazonQToolWindow.getInstance(project).disposeAndRecreate()
-                    prepareChatContent(project, qPanel)
+                    qPanel.setContent(AmazonQToolWindow.getInstance(project).component)
                 }
             }
         )