修复扩展类的方法定位错误的问题

Author: CppCXY

EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/TyClass.kt

@@ -83,6 +83,8 @@ interface ITyClass : ITy {
     fun recoverAlias(context: SearchContext, aliasSubstitutor: TyAliasSubstitutor): ITy {
         return this
     }
+
+    fun getClassCallType(context: SearchContext): ITyFunction?
 }
 
 fun ITyClass.isVisibleInScope(project: Project, contextTy: ITy, visibility: Visibility): Boolean {
@@ -261,6 +263,14 @@ abstract class TyClass(
         return result
     }
 
+    override fun getClassCallType(context: SearchContext): ITyFunction? {
+        val ty = findMemberType("ctor", context)
+        if(ty is ITyFunction){
+            return ty
+        }
+        return null
+    }
+
     override fun subTypeOf(other: ITy, context: SearchContext, strict: Boolean): Boolean {
         // class extends table
         if (other == Ty.TABLE) return true

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

@@ -14,7 +14,6 @@ import com.tang.intellij.lua.editor.completion.CompletionService
 import com.tang.intellij.lua.editor.completion.LuaLookupElement
 import com.tang.intellij.lua.editor.completion.asCompletionItem
 import com.tang.intellij.lua.psi.*
-import com.tang.intellij.lua.psi.search.LuaShortNamesManager
 import com.tang.intellij.lua.reference.ReferencesSearch
 import com.tang.intellij.lua.search.SearchContext
 import com.tang.intellij.lua.stubs.index.LuaClassMemberIndex
@@ -24,7 +23,6 @@ import com.tang.vscode.api.impl.LuaFile
 //import com.tang.vscode.color.ColorService
 import com.tang.vscode.documentation.LuaDocumentationProvider
 import com.tang.vscode.extendApi.ExtendApiService
-import com.tang.vscode.extendApi.LuaApiClass
 import com.tang.vscode.extendApi.LuaReportApiParams
 import com.tang.vscode.formatter.FormattingFormatter
 import com.tang.vscode.formatter.FormattingType
@@ -519,10 +517,16 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
 
                     callExpr?.guessParentType(SearchContext.get(psiFile.project))?.let { parentType ->
                         parentType.each { ty ->
-                            if (ty is ITyFunction) {
-                                val active = ty.findPerfectSignature(callExpr, nCommas + 1)
+                            var tyFunction: ITy? = ty
+                            if(tyFunction is ITyClass){
+                                val context = SearchContext.get(workspace.getProject())
+                                tyFunction = tyFunction.getClassCallType(context)
+                            }
+
+                            if (tyFunction is ITyFunction) {
+                                val active = tyFunction.findPerfectSignature(callExpr, nCommas + 1)
                                 var idx = 0
-                                ty.process(Processor { sig ->
+                                tyFunction.process(Processor { sig ->
                                     val information = SignatureInformation()
                                     information.parameters = mutableListOf()
                                     sig.params.forEach { pi ->

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

@@ -9,12 +9,14 @@ import com.tang.intellij.lua.ty.Ty
 import com.tang.intellij.lua.ty.TySerializedFunction
 
 object ExtendApiService {
+    private var rootNamespaceName = "_G"
     private var rootNamespace: Namespace? = null
     private var namespaceMap: MutableMap<String, Namespace> = mutableMapOf()
     private var classMap: MutableMap<String, ExtendClass> = mutableMapOf()
 
     fun loadApi(project: Project, api: LuaReportApiParams) {
         val mgr = PsiManager.getInstance(project)
+        rootNamespaceName = api.root
         rootNamespace = Namespace(api.root, null, mgr, false)
         namespaceMap.clear()
         classMap.clear()
@@ -59,7 +61,7 @@ object ExtendApiService {
                         emptyArray(),
                         luaMethod.comment
                     )
-                    extendClass.addMethod(luaMethod.name, signature)
+                    extendClass.addMethod(luaMethod.name, signature, luaMethod.comment, luaMethod.location)
                 }
             }
         }
@@ -70,7 +72,7 @@ object ExtendApiService {
     }
 
     fun getNsMember(name: String): NsMember? {
-        if (name == "_G" || name == "CS") {
+        if (name == rootNamespaceName) {
             return rootNamespace
         }
 
@@ -83,6 +85,14 @@ object ExtendApiService {
         if (member != null) {
             return member
         }
+        // generic workaround
+        val genericIndex = name.indexOf('<')
+        if(genericIndex != -1)
+        {
+            val baseTypeName = name.substring(0, genericIndex)
+            return classMap[baseTypeName]
+        }
+
         return null
     }
 

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

@@ -66,6 +66,17 @@ class TyExtendClass(val clazz: ExtendClass) : TyClass(
     override fun findMember(name: String, searchContext: SearchContext): LuaClassMember? {
         return clazz.findMember(name)
     }
+
+    override fun getClassCallType(context: SearchContext): ITyFunction? {
+        val ty = clazz.findMember(".ctor")
+        if(ty is ExtendClassMember){
+            val funTy = ty.type
+            if(funTy is ITyFunction){
+                return funTy
+            }
+        }
+        return null
+    }
 }
 
 class ExtendClass(
@@ -94,7 +105,7 @@ class ExtendClass(
         members.add(member)
     }
 
-    fun addMethod(name: String, signature: FunSignature) {
+    fun addMethod(name: String, signature: FunSignature, comment: String, location: String) {
         if (!methods.containsKey(name)) {
             val ty = TyExtendFunction(this, name)
             methods[name] = mutableListOf(signature)