Merge pull request #33 from aridclown/main

Bugfix: `LuaDocumentListener` being registered multiple times

Author: CppCXY

src/main/java/com/tang/intellij/lua/editor/LuaGutterCacheListener.kt

@@ -1,8 +1,14 @@
 package com.tang.intellij.lua.editor
 
+import com.cppcxy.ide.lsp.GutterInfo
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
+import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.Service.Level.PROJECT
+import com.intellij.openapi.components.service
 import com.intellij.openapi.editor.Document
+import com.intellij.openapi.editor.EditorFactory
 import com.intellij.openapi.editor.event.DocumentEvent
 import com.intellij.openapi.editor.event.DocumentListener
 import com.intellij.openapi.fileEditor.FileDocumentManager
@@ -11,41 +17,45 @@ import com.intellij.openapi.fileEditor.FileEditorManagerListener
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.ProjectActivity
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.openapi.vfs.VirtualFileManager
+import com.intellij.openapi.vfs.newvfs.BulkFileListener
+import com.intellij.openapi.vfs.newvfs.events.VFileEvent
 import com.intellij.psi.PsiManager
+import com.tang.intellij.lua.lang.LuaFileType
 import com.tang.intellij.lua.psi.LuaPsiFile
 import java.util.concurrent.ConcurrentHashMap
 
 /**
  * Manager to handle gutter cache and trigger updates
  */
 object LuaGutterCacheManager {
-    private val gutterCache = ConcurrentHashMap<String, List<com.cppcxy.ide.lsp.GutterInfo>>()
+    private val gutterCache = ConcurrentHashMap<String, List<GutterInfo>>()
     private val cacheTimestamps = ConcurrentHashMap<String, Long>()
-    
+
     fun clearCache(uri: String) {
         gutterCache.remove(uri)
         cacheTimestamps.remove(uri)
     }
-    
+
     fun clearAllCache() {
         gutterCache.clear()
         cacheTimestamps.clear()
     }
-    
-    fun getCache(uri: String): List<com.cppcxy.ide.lsp.GutterInfo>? {
+
+    fun getCache(uri: String): List<GutterInfo>? {
         return gutterCache[uri]
     }
-    
-    fun setCache(uri: String, infos: List<com.cppcxy.ide.lsp.GutterInfo>) {
+
+    fun setCache(uri: String, infos: List<GutterInfo>) {
         gutterCache[uri] = infos
         cacheTimestamps[uri] = System.currentTimeMillis()
     }
-    
+
     fun getCacheAge(uri: String): Long {
         val timestamp = cacheTimestamps[uri] ?: return Long.MAX_VALUE
         return System.currentTimeMillis() - timestamp
     }
-    
+
     fun isCacheStale(uri: String, maxAgeMs: Long = 1000): Boolean {
         return getCacheAge(uri) > maxAgeMs
     }
@@ -57,28 +67,28 @@ object LuaGutterCacheManager {
 class LuaDocumentListener(private val project: Project) : DocumentListener {
     private val updateScheduler = mutableMapOf<Document, Long>()
     private val pendingUpdates = mutableMapOf<Document, Runnable>()
-    
+
     override fun documentChanged(event: DocumentEvent) {
         val document = event.document
         val file = FileDocumentManager.getInstance().getFile(document) ?: return
-        
-        if (file.extension != "lua") return
-        
+
+        if (file.fileType !== LuaFileType.INSTANCE) return
+
         // Clear cache immediately for instant refresh
         LuaGutterCacheManager.clearCache(file.url)
-        
+
         // Cancel any pending update
-        pendingUpdates[document]?.let { 
+        pendingUpdates[document]?.let {
             // The runnable will be replaced
         }
-        
+
         // Schedule restart of code analysis with shorter debounce (200ms)
         val now = System.currentTimeMillis()
         val lastUpdate = updateScheduler[document] ?: 0
-        
+
         // Reduced debounce time to 200ms for better responsiveness
         val debounceTime = 200L
-        
+
         val updateRunnable = Runnable {
             ApplicationManager.getApplication().invokeLater {
                 val psiFile = PsiManager.getInstance(project).findFile(file)
@@ -87,9 +97,9 @@ class LuaDocumentListener(private val project: Project) : DocumentListener {
                 }
             }
         }
-        
+
         pendingUpdates[document] = updateRunnable
-        
+
         if (now - lastUpdate > debounceTime) {
             updateScheduler[document] = now
             // Execute immediately if enough time has passed
@@ -115,10 +125,10 @@ class LuaDocumentListener(private val project: Project) : DocumentListener {
  */
 class LuaFileEditorListener(private val project: Project) : FileEditorManagerListener {
     override fun fileOpened(source: FileEditorManager, file: VirtualFile) {
-        if (file.extension == "lua") {
+        if (file.fileType === LuaFileType.INSTANCE) {
             // Clear cache for newly opened file to ensure fresh data
             LuaGutterCacheManager.clearCache(file.url)
-            
+
             // Trigger code analysis
             ApplicationManager.getApplication().invokeLater {
                 val psiFile = PsiManager.getInstance(project).findFile(file)
@@ -137,38 +147,32 @@ class LuaGutterCacheStartupActivity : ProjectActivity {
     override suspend fun execute(project: Project) {
         // Register document listener
         val documentListener = LuaDocumentListener(project)
-        val connection = ApplicationManager.getApplication().messageBus.connect(project)
-        
+        val parentDisposable = project.service<LuaGutterCacheListenerDisposable>()
+        val appConnection = ApplicationManager.getApplication().messageBus.connect(parentDisposable)
+        val projectConnection = project.messageBus.connect(parentDisposable)
+
         // Listen to editor creation events to attach document listener
-        val editorFactory = com.intellij.openapi.editor.EditorFactory.getInstance()
-        editorFactory.addEditorFactoryListener(
-            object : com.intellij.openapi.editor.event.EditorFactoryListener {
-                override fun editorCreated(event: com.intellij.openapi.editor.event.EditorFactoryEvent) {
-                    event.editor.document.addDocumentListener(documentListener, project)
-                }
-            },
-            project
-        )
-        
+        EditorFactory.getInstance()
+            .eventMulticaster
+            .addDocumentListener(documentListener, parentDisposable)
+
         // Register file editor listener
-        project.messageBus
-            .connect()
-            .subscribe(
-                FileEditorManagerListener.FILE_EDITOR_MANAGER,
-                LuaFileEditorListener(project)
-            )
-        
+        projectConnection.subscribe(
+            FileEditorManagerListener.FILE_EDITOR_MANAGER,
+            LuaFileEditorListener(project)
+        )
+
         // Register bulk file listener to detect external changes
-        connection.subscribe(
-            com.intellij.openapi.vfs.VirtualFileManager.VFS_CHANGES,
-            object : com.intellij.openapi.vfs.newvfs.BulkFileListener {
-                override fun after(events: List<com.intellij.openapi.vfs.newvfs.events.VFileEvent>) {
+        appConnection.subscribe(
+            VirtualFileManager.VFS_CHANGES,
+            object : BulkFileListener {
+                override fun after(events: List<VFileEvent>) {
                     for (event in events) {
                         val file = event.file
-                        if (file != null && file.extension == "lua") {
+                        if (file != null && file.fileType === LuaFileType.INSTANCE) {
                             // Clear cache when file changes externally
                             LuaGutterCacheManager.clearCache(file.url)
-                            
+
                             // Trigger update
                             ApplicationManager.getApplication().invokeLater {
                                 val psiFile = PsiManager.getInstance(project).findFile(file)
@@ -183,3 +187,10 @@ class LuaGutterCacheStartupActivity : ProjectActivity {
         )
     }
 }
+
+@Service(PROJECT)
+class LuaGutterCacheListenerDisposable : Disposable {
+    override fun dispose() {
+        // IntelliJ will automatically dispose of it when the project is disposed
+    }
+}