feedback

Author: manodnyab

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

@@ -17,7 +17,7 @@ class QRefreshPanelAction : DumbAwareAction(AmazonQBundle.message("amazonq.refre
     override fun actionPerformed(e: AnActionEvent) {
         val project = e.project ?: return
         // recreate chat browser
-        AmazonQToolWindow.getInstance(project).recreatePanel()
+        AmazonQToolWindow.getInstance(project).disposeAndRecreatePanel()
         // recreate signin browser
         QWebviewPanel.getInstance(project).disposeAndRecreate()
         RefreshQChatPanelButtonPressedListener.notifyRefresh()

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

@@ -8,6 +8,7 @@ import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.wm.ToolWindowManager
 import kotlinx.coroutines.CoroutineScope
 import software.aws.toolkits.jetbrains.services.amazonq.onboarding.OnboardingPageInteraction
@@ -24,7 +25,8 @@ class AmazonQToolWindow private constructor(
     val component
         get() = chatPanel.component
 
-    fun recreatePanel() {
+    fun disposeAndRecreatePanel() {
+        Disposer.dispose(chatPanel)
         chatPanel = AmazonQPanel(project, scope)
     }
 

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

@@ -85,7 +85,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             object : BearerTokenProviderListener {
                 override fun onChange(providerId: String, newScopes: List<String>?) {
                     if (ToolkitConnectionManager.getInstance(project).connectionStateForFeature(QConnection.getInstance()) == BearerTokenAuthState.AUTHORIZED) {
-                        AmazonQToolWindow.getInstance(project).recreatePanel()
+                        AmazonQToolWindow.getInstance(project).disposeAndRecreatePanel()
                         prepareChatContent(project, qPanel)
                     }
                 }
@@ -98,7 +98,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
                 // 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).recreatePanel()
+                    AmazonQToolWindow.getInstance(project).disposeAndRecreatePanel()
                     prepareChatContent(project, qPanel)
                 }
             }