fix(amazonq): fix issue where AmazonQLspService subservices are never disposed

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt

@@ -476,10 +476,18 @@ private class AmazonQServerInstance(private val project: Project, private val cs
             }
 
             [email protected] {
-                DefaultAuthCredentialsService(project, encryptionManager, this)
-                TextDocumentServiceHandler(project, this)
-                WorkspaceServiceHandler(project, lspInitResult, this)
-                DefaultModuleDependenciesService(project, this)
+                DefaultAuthCredentialsService(project, encryptionManager).also {
+                    Disposer.register(this, it)
+                }
+                TextDocumentServiceHandler(project).also {
+                    Disposer.register(this, it)
+                }
+                WorkspaceServiceHandler(project, lspInitResult).also {
+                    Disposer.register(this, it)
+                }
+                DefaultModuleDependenciesService(project).also {
+                    Disposer.register(this, it)
+                }
             }
         }
     }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/auth/DefaultAuthCredentialsService.kt

@@ -38,7 +38,6 @@ import java.util.concurrent.TimeUnit
 class DefaultAuthCredentialsService(
     private val project: Project,
     private val encryptionManager: JwtEncryptionManager,
-    serverInstance: Disposable,
 ) : AuthCredentialsService,
     BearerTokenProviderListener,
     ToolkitConnectionManagerListener,
@@ -50,7 +49,7 @@ class DefaultAuthCredentialsService(
     private val tokenSyncIntervalMinutes = 5L
 
     init {
-        project.messageBus.connect(serverInstance).apply {
+        project.messageBus.connect(this).apply {
             subscribe(BearerTokenProviderListener.TOPIC, this@DefaultAuthCredentialsService)
             subscribe(ToolkitConnectionManagerListener.TOPIC, this@DefaultAuthCredentialsService)
             subscribe(QRegionProfileSelectedListener.TOPIC, this@DefaultAuthCredentialsService)

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt

@@ -15,12 +15,12 @@ import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread
 
 class DefaultModuleDependenciesService(
     private val project: Project,
-    serverInstance: Disposable,
 ) : ModuleDependenciesService,
-    ModuleRootListener {
-
+    ModuleRootListener,
+    Disposable
+{
     init {
-        project.messageBus.connect(serverInstance).subscribe(
+        project.messageBus.connect(this).subscribe(
             ModuleRootListener.TOPIC,
             this
         )
@@ -52,4 +52,7 @@ class DefaultModuleDependenciesService(
             }
         }
     }
+
+    override fun dispose() {
+    }
 }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt

@@ -32,27 +32,27 @@ import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread
 
 class TextDocumentServiceHandler(
     private val project: Project,
-    private val serverInstance: Disposable,
 ) : FileDocumentManagerListener,
     FileEditorManagerListener,
     BulkFileListener,
-    DocumentListener {
-
+    DocumentListener,
+    Disposable
+{
     init {
         // didOpen & didClose events
-        project.messageBus.connect(serverInstance).subscribe(
+        project.messageBus.connect(this).subscribe(
             FileEditorManagerListener.FILE_EDITOR_MANAGER,
             this
         )
 
         // didChange events
-        project.messageBus.connect(serverInstance).subscribe(
+        project.messageBus.connect(this).subscribe(
             VirtualFileManager.VFS_CHANGES,
             this
         )
 
         // didSave events
-        project.messageBus.connect(serverInstance).subscribe(
+        project.messageBus.connect(this).subscribe(
             FileDocumentManagerListener.TOPIC,
             this
         )
@@ -72,7 +72,7 @@ class TextDocumentServiceHandler(
                         realTimeEdit(event)
                     }
                 },
-                serverInstance
+                this
             )
         }
         AmazonQLspService.executeIfRunning(project) { languageServer ->
@@ -183,4 +183,7 @@ class TextDocumentServiceHandler(
         }
         // Process document changes here
     }
+
+    override fun dispose() {
+    }
 }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandler.kt

@@ -45,22 +45,21 @@ import java.nio.file.Paths
 class WorkspaceServiceHandler(
     private val project: Project,
     initializeResult: InitializeResult,
-    serverInstance: Disposable,
 ) : BulkFileListener,
-    ModuleRootListener {
+    ModuleRootListener, Disposable {
 
     private var lastSnapshot: List<WorkspaceFolder> = emptyList()
     private val operationMatchers: MutableMap<FileOperationType, List<Pair<PathMatcher, String>>> = mutableMapOf()
 
     init {
         operationMatchers.putAll(initializePatterns(initializeResult))
 
-        project.messageBus.connect(serverInstance).subscribe(
+        project.messageBus.connect(this).subscribe(
             VirtualFileManager.VFS_CHANGES,
             this
         )
 
-        project.messageBus.connect(serverInstance).subscribe(
+        project.messageBus.connect(this).subscribe(
             ModuleRootListener.TOPIC,
             this
         )
@@ -313,4 +312,7 @@ class WorkspaceServiceHandler(
             lastSnapshot = currentSnapshot
         }
     }
+
+    override fun dispose() {
+    }
 }