use serverInstance as messageBus disposable

Author: samgst-amazon

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

@@ -237,9 +237,11 @@ private class AmazonQServerInstance(private val project: Project, private val cs
             languageServer.initialized(InitializedParams())
         }
 
-        //may need to register listeners differently so their messageBus' don't get garbage collected
-        val workspaceServiceHandler = WorkspaceServiceHandler(project, languageServer)
-        workspaceServiceHandler.startWorkspaceServiceListeners()
+        WorkspaceServiceHandler(
+            project,
+            languageServer,
+            this
+        ).startWorkspaceServiceListeners()
     }
 
     override fun dispose() {

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

@@ -20,7 +20,8 @@ import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread
 class WorkspaceServiceHandler(
     private val project: Project,
     private val languageServer: AmazonQLanguageServer,
-) : Disposable {
+    private val serverInstance: Disposable
+){
 
     fun startWorkspaceServiceListeners() {
         startFileLifecycleListener()
@@ -55,7 +56,7 @@ class WorkspaceServiceHandler(
     }
 
     private fun startFileLifecycleListener() {
-        project.messageBus.connect(this).subscribe(
+        project.messageBus.connect(serverInstance).subscribe(
             VirtualFileManager.VFS_CHANGES,
             object : BulkFileListener {
                 override fun after(events: List<VFileEvent>) {
@@ -73,7 +74,4 @@ class WorkspaceServiceHandler(
     //private fun didChangeWorkspaceFolders() {
     //    languageServer.workspaceService.didChangeWorkspaceFolders()
     //}
-
-    override fun dispose() {
-    }
 }