Merge branch 'feature/dev-execution' into feature/dev-execution

karanA-aws · web-flow · commit 350e461b0585 · 2025-01-24T10:51:48.000-08: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
@@ -58,7 +58,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
         }
         val contentManager = toolWindow.contentManager
 
-        project.messageBus.connect().subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             ToolkitConnectionManagerListener.TOPIC,
             object : ToolkitConnectionManagerListener {
                 override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
@@ -67,7 +67,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             }
         )
 
-        project.messageBus.connect().subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             RefreshQChatPanelButtonPressedListener.TOPIC,
             object : RefreshQChatPanelButtonPressedListener {
                 override fun onRefresh() {
@@ -78,7 +78,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
             }
         )
 
-        project.messageBus.connect().subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             BearerTokenProviderListener.TOPIC,
             object : BearerTokenProviderListener {
                 override fun onChange(providerId: String, newScopes: List<String>?) {
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsToolkitExplorerFactory.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsToolkitExplorerFactory.kt
@@ -112,7 +112,7 @@ class AwsToolkitExplorerFactory : ToolWindowFactory, DumbAware {
         toolWindow.activate(null)
         contentManager.setSelectedContent(content)
 
-        project.messageBus.connect().subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             ToolkitConnectionManagerListener.TOPIC,
             object : ToolkitConnectionManagerListener {
                 override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
@@ -121,7 +121,7 @@ class AwsToolkitExplorerFactory : ToolWindowFactory, DumbAware {
             }
         )
 
-        project.messageBus.connect().subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             AwsConnectionManager.CONNECTION_SETTINGS_STATE_CHANGED,
             object : ConnectionSettingsStateChangeNotifier {
                 override fun settingsStateChanged(newState: ConnectionState) {
@@ -130,7 +130,7 @@ class AwsToolkitExplorerFactory : ToolWindowFactory, DumbAware {
             }
         )
 
-        project.messageBus.connect().subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             BearerTokenProviderListener.TOPIC,
             object : BearerTokenProviderListener {
                 override fun onChange(providerId: String, newScopes: List<String>?) {
@@ -143,7 +143,7 @@ class AwsToolkitExplorerFactory : ToolWindowFactory, DumbAware {
             }
         )
 
-        project.messageBus.connect().subscribe(
+        project.messageBus.connect(toolWindow.disposable).subscribe(
             ShowToolkitListener.TOPIC,
             object : ShowToolkitListener {
                 override fun showWebview(project: Project) {

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {`
`58`	`58`	`}`
`59`	`59`	`val contentManager = toolWindow.contentManager`
`60`	`60`
`61`		`- project.messageBus.connect().subscribe(`
	`61`	`+ project.messageBus.connect(toolWindow.disposable).subscribe(`
`62`	`62`	`ToolkitConnectionManagerListener.TOPIC,`
`63`	`63`	`object : ToolkitConnectionManagerListener {`
`64`	`64`	`override fun activeConnectionChanged(newConnection: ToolkitConnection?) {`
`@@ -67,7 +67,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {`
`67`	`67`	`}`
`68`	`68`	`)`
`69`	`69`
`70`		`- project.messageBus.connect().subscribe(`
	`70`	`+ project.messageBus.connect(toolWindow.disposable).subscribe(`
`71`	`71`	`RefreshQChatPanelButtonPressedListener.TOPIC,`
`72`	`72`	`object : RefreshQChatPanelButtonPressedListener {`
`73`	`73`	`override fun onRefresh() {`
`@@ -78,7 +78,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {`
`78`	`78`	`}`
`79`	`79`	`)`
`80`	`80`
`81`		`- project.messageBus.connect().subscribe(`
	`81`	`+ project.messageBus.connect(toolWindow.disposable).subscribe(`
`82`	`82`	`BearerTokenProviderListener.TOPIC,`
`83`	`83`	`object : BearerTokenProviderListener {`
`84`	`84`	`override fun onChange(providerId: String, newScopes: List<String>?) {`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ class AwsToolkitExplorerFactory : ToolWindowFactory, DumbAware {`
`112`	`112`	`toolWindow.activate(null)`
`113`	`113`	`contentManager.setSelectedContent(content)`
`114`	`114`
`115`		`- project.messageBus.connect().subscribe(`
	`115`	`+ project.messageBus.connect(toolWindow.disposable).subscribe(`
`116`	`116`	`ToolkitConnectionManagerListener.TOPIC,`
`117`	`117`	`object : ToolkitConnectionManagerListener {`
`118`	`118`	`override fun activeConnectionChanged(newConnection: ToolkitConnection?) {`
`@@ -121,7 +121,7 @@ class AwsToolkitExplorerFactory : ToolWindowFactory, DumbAware {`
`121`	`121`	`}`
`122`	`122`	`)`
`123`	`123`
`124`		`- project.messageBus.connect().subscribe(`
	`124`	`+ project.messageBus.connect(toolWindow.disposable).subscribe(`
`125`	`125`	`AwsConnectionManager.CONNECTION_SETTINGS_STATE_CHANGED,`
`126`	`126`	`object : ConnectionSettingsStateChangeNotifier {`
`127`	`127`	`override fun settingsStateChanged(newState: ConnectionState) {`
`@@ -130,7 +130,7 @@ class AwsToolkitExplorerFactory : ToolWindowFactory, DumbAware {`
`130`	`130`	`}`
`131`	`131`	`)`
`132`	`132`
`133`		`- project.messageBus.connect().subscribe(`
	`133`	`+ project.messageBus.connect(toolWindow.disposable).subscribe(`
`134`	`134`	`BearerTokenProviderListener.TOPIC,`
`135`	`135`	`object : BearerTokenProviderListener {`
`136`	`136`	`override fun onChange(providerId: String, newScopes: List<String>?) {`
`@@ -143,7 +143,7 @@ class AwsToolkitExplorerFactory : ToolWindowFactory, DumbAware {`
`143`	`143`	`}`
`144`	`144`	`)`
`145`	`145`
`146`		`- project.messageBus.connect().subscribe(`
	`146`	`+ project.messageBus.connect(toolWindow.disposable).subscribe(`
`147`	`147`	`ShowToolkitListener.TOPIC,`
`148`	`148`	`object : ShowToolkitListener {`
`149`	`149`	`override fun showWebview(project: Project) {`