refactor(amazonq): remove redunant panel re-creation (#5729)

Will-ShaoHua · web-flow · commit 382801118793 · 2025-05-20T11:20:11.000-07:00
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt
@@ -66,7 +66,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
                     ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())?.let { qConn ->
                         openMeetQPage(project)
                     }
-                    prepareChatContent(project, qPanel)
+                    preparePanelContent(project, qPanel)
                 }
             }
         )
@@ -75,7 +75,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             RefreshQChatPanelButtonPressedListener.TOPIC,
             object : RefreshQChatPanelButtonPressedListener {
                 override fun onRefresh() {
-                    prepareChatContent(project, qPanel)
+                    preparePanelContent(project, qPanel)
                 }
             }
         )
@@ -85,8 +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).disposeAndRecreate()
-                        prepareChatContent(project, qPanel)
+                        preparePanelContent(project, qPanel)
                     }
                 }
             }
@@ -98,13 +97,12 @@ 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).disposeAndRecreate()
-                    prepareChatContent(project, qPanel)
+                    preparePanelContent(project, qPanel)
                 }
             }
         )
 
-        prepareChatContent(project, qPanel)
+        preparePanelContent(project, qPanel)
 
         val content = contentManager.factory.createContent(mainPanel, null, false).also {
             it.isCloseable = true
@@ -114,7 +112,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
         contentManager.addContent(content)
     }
 
-    private fun prepareChatContent(
+    private fun preparePanelContent(
         project: Project,
         qPanel: Wrapper,
     ) {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {`
`66`	`66`	`ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())?.let { qConn ->`
`67`	`67`	`openMeetQPage(project)`
`68`	`68`	`}`
`69`		`- prepareChatContent(project, qPanel)`
	`69`	`+ preparePanelContent(project, qPanel)`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`)`
`@@ -75,7 +75,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {`
`75`	`75`	`RefreshQChatPanelButtonPressedListener.TOPIC,`
`76`	`76`	`object : RefreshQChatPanelButtonPressedListener {`
`77`	`77`	`override fun onRefresh() {`
`78`		`- prepareChatContent(project, qPanel)`
	`78`	`+ preparePanelContent(project, qPanel)`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`)`
`@@ -85,8 +85,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {`
`85`	`85`	`object : BearerTokenProviderListener {`
`86`	`86`	`override fun onChange(providerId: String, newScopes: List<String>?) {`
`87`	`87`	`if (ToolkitConnectionManager.getInstance(project).connectionStateForFeature(QConnection.getInstance()) == BearerTokenAuthState.AUTHORIZED) {`
`88`		`- AmazonQToolWindow.getInstance(project).disposeAndRecreate()`
`89`		`- prepareChatContent(project, qPanel)`
	`88`	`+ preparePanelContent(project, qPanel)`
`90`	`89`	`}`
`91`	`90`	`}`
`92`	`91`	`}`
`@@ -98,13 +97,12 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {`
`98`	`97`	`// note we name myProject intentionally ow it will shadow the "project" provided by the IDE`
`99`	`98`	`override fun onProfileSelected(myProject: Project, profile: QRegionProfile?) {`
`100`	`99`	`if (project.isDisposed) return`
`101`		`- AmazonQToolWindow.getInstance(project).disposeAndRecreate()`
`102`		`- prepareChatContent(project, qPanel)`
	`100`	`+ preparePanelContent(project, qPanel)`
`103`	`101`	`}`
`104`	`102`	`}`
`105`	`103`	`)`
`106`	`104`
`107`		`- prepareChatContent(project, qPanel)`
	`105`	`+ preparePanelContent(project, qPanel)`
`108`	`106`
`109`	`107`	`val content = contentManager.factory.createContent(mainPanel, null, false).also {`
`110`	`108`	`it.isCloseable = true`
`@@ -114,7 +112,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {`
`114`	`112`	`contentManager.addContent(content)`
`115`	`113`	`}`
`116`	`114`
`117`		`- private fun prepareChatContent(`
	`115`	`+ private fun preparePanelContent(`
`118`	`116`	`project: Project,`
`119`	`117`	`qPanel: Wrapper,`
`120`	`118`	`) {`