暂存

Author: CppCXY

EmmyLua-Common/src/main/ext/com/tang/lsp/workspace.kt

@@ -53,6 +53,7 @@ interface ILuaFile : IVirtualFile {
     fun unindex()
     fun getLine(offset: Int): Pair<Int, Int>
     fun didChange(params: DidChangeTextDocumentParams)
+    fun diagnose();
     fun getPosition(line:Int, char: Int): Int
     fun processWords(processor: (w: Word) -> Boolean)
 }

EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaTextDocumentService.kt

@@ -18,10 +18,7 @@ import com.tang.intellij.lua.project.LuaSettings
 import com.tang.intellij.lua.psi.*
 import com.tang.intellij.lua.reference.ReferencesSearch
 import com.tang.intellij.lua.search.SearchContext
-import com.tang.intellij.lua.ty.ITyFunction
-import com.tang.intellij.lua.ty.findPerfectSignature
-import com.tang.intellij.lua.ty.hasVarargs
-import com.tang.intellij.lua.ty.process
+import com.tang.intellij.lua.ty.*
 import com.tang.lsp.ILuaFile
 import com.tang.lsp.getRangeInFile
 import com.tang.lsp.nameRange
@@ -73,6 +70,7 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
         val notUse = mutableListOf<TextRange>()
         val paramHints = mutableListOf<RenderRange>()
         val localHints = mutableListOf<RenderRange>()
+        val overrideHint = mutableListOf<RenderRange>()
 
         // 认为所有local名称定义一开始都是未使用的
         val psiNotUse = mutableSetOf<PsiElement>()
@@ -130,6 +128,35 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
                 o.acceptChildren(this)
             }
 
+            override fun visitClassMethodDef(o: LuaClassMethodDef) {
+                val context = SearchContext.get(o.project)
+                val classType = o.guessClassType(context)
+                if(classType != null) {
+                    TyClass.processSuperClass(classType, context) { sup ->
+                        val id = o.classMethodName.id
+                        if(id != null) {
+                            val member = sup.findMember(id.text, context)
+                            if (member != null) {
+                                val funcBody = o.children.find { it is LuaFuncBody }
+                                if(funcBody is LuaFuncBody) {
+                                    var fchild = funcBody.firstChild
+                                    while(fchild != funcBody.lastChild){
+                                        if(fchild.text == ")"){
+                                            overrideHint.add(RenderRange(fchild.nameRange!!.toRange (file), null))
+                                        }
+
+                                        fchild = fchild.nextSibling
+                                    }
+                                }
+                            }
+                        }
+                        true
+                    }
+                }
+
+                o.acceptChildren(this)
+            }
+
             override fun visitNameDef(o: LuaNameDef) {
                 psiNotUse.add(o)
             }
@@ -308,6 +335,10 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
         if (localHints.isNotEmpty()) {
             all.add(Annotator(uri, localHints, AnnotatorType.LocalHint))
         }
+        if(overrideHint.isNotEmpty()){
+            all.add(Annotator(uri, overrideHint, AnnotatorType.OverrideHint))
+        }
+
         return all
     }
 
@@ -921,25 +952,29 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
         val file = workspace.findFile(params.textDocument.uri)
         if (file is ILuaFile) {
             file.didChange(params)
+
+            file.diagnose()
             val diagnosticsParams = PublishDiagnosticsParams(params.textDocument.uri, file.diagnostics)
             client?.publishDiagnostics(diagnosticsParams)
         }
     }
 
     override fun references(params: ReferenceParams): CompletableFuture<MutableList<out Location>> {
-        val list = mutableListOf<Location>()
-        withPsiFile(params.textDocument, params.position) { _, psiFile, pos ->
-            val element = TargetElementUtil.findTarget(psiFile, pos)
-            if (element != null) {
-                val target = element.reference?.resolve() ?: element
-                val query = ReferencesSearch.search(target)
-                query.forEach { ref ->
-                    val luaFile = ref.element.containingFile.virtualFile as LuaFile
-                    list.add(Location(luaFile.uri.toString(), ref.getRangeInFile(luaFile)))
+        return computeAsync {
+            val list = mutableListOf<Location>()
+            withPsiFile(params.textDocument, params.position) { _, psiFile, pos ->
+                val element = TargetElementUtil.findTarget(psiFile, pos)
+                if (element != null) {
+                    val target = element.reference?.resolve() ?: element
+                    val query = ReferencesSearch.search(target)
+                    query.forEach { ref ->
+                        val luaFile = ref.element.containingFile.virtualFile as LuaFile
+                        list.add(Location(luaFile.uri.toString(), ref.getRangeInFile(luaFile)))
+                    }
                 }
             }
+            list
         }
-        return CompletableFuture.completedFuture(list)
     }
 
     override fun foldingRange(params: FoldingRangeRequestParams?): CompletableFuture<MutableList<FoldingRange>> {

EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaWorkspaceService.kt

@@ -238,7 +238,8 @@ class LuaWorkspaceService : WorkspaceService, IWorkspace {
                 processedCount++
                 val file = uri.toFile()
                 if (file != null) {
-                    monitor.setProgress("Emmy parse file: ${file.canonicalPath}", processedCount / totalFileCount)
+                    monitor.setProgress("Emmy parse file[${(processedCount / totalFileCount * 100).toInt()}%]: ${file.canonicalPath}",
+                        processedCount / totalFileCount)
                 }
                 addFile(uri, null)
             }
@@ -253,8 +254,11 @@ class LuaWorkspaceService : WorkspaceService, IWorkspace {
     private fun sendAllDiagnostics() {
         project.process {
             val file = it.virtualFile
-            if (file is LuaFile && file.diagnostics.isNotEmpty()) {
-                client?.publishDiagnostics(PublishDiagnosticsParams(file.uri.toString(), file.diagnostics))
+            if (file is LuaFile) {
+                file.diagnose()
+                if(file.diagnostics.isNotEmpty()) {
+                    client?.publishDiagnostics(PublishDiagnosticsParams(file.uri.toString(), file.diagnostics))
+                }
             }
             true
         }

EmmyLua-LS/src/main/kotlin/com/tang/vscode/api/impl/LuaFile.kt

@@ -83,6 +83,13 @@ class LuaFile(override val uri: FileURI) : VirtualFileBase(uri), ILuaFile, Virtu
         onChanged()
     }
 
+    override fun diagnose(){
+        if(diagnostics.isEmpty()) {
+            // 索引建立完之后再诊断
+            DiagnosticsService.diagnosticFile(this, diagnostics)
+        }
+    }
+
     @Synchronized
     private fun updateLines() {
         _lines.clear()
@@ -131,11 +138,9 @@ class LuaFile(override val uri: FileURI) : VirtualFileBase(uri), ILuaFile, Virtu
         _myPsi?.virtualFile = this
 
         index()
-
-        // 索引建立完之后再诊断
-        DiagnosticsService.diagnosticFile(this, diagnostics)
     }
 
+
     /*private fun getLineStart(line: Int): Int {
         return _lines.firstOrNull { it.line == line } ?.startOffset ?: 0
     }*/

EmmyLua-LS/src/main/kotlin/com/tang/vscode/rpc.kt

@@ -12,7 +12,8 @@ enum class AnnotatorType {
     Upvalue,
     NotUse,
     ParamHint,
-    LocalHint
+    LocalHint,
+    OverrideHint
 }
 
 data class AnnotatorParams(val uri: String)