sync code from IntelliJ-EmmyLua

Author: tangzx

EmmyLua-Common/src/main/java/com/tang/intellij/lua/psi/PsiExtension.kt

@@ -452,6 +452,14 @@ val LuaFuncDef.forwardDeclaration: PsiElement? get() {
     }
 }
 
+val LuaCallExpr.prefixExpr: LuaExpr? get() {
+    val expr = this.expr
+    if (expr is LuaIndexExpr) {
+        return expr.prefixExpr
+    }
+    return null
+}
+
 val LuaCallExpr.argList: List<LuaExpr> get() {
     val args = this.args
     return when (args) {

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

@@ -112,11 +112,18 @@ private fun guessBinaryOpType(binaryExpr : LuaBinaryExpr, context:SearchContext)
 
 fun LuaCallExpr.createSubstitutor(sig: IFunSignature, context: SearchContext): ITySubstitutor? {
     if (sig.isGeneric()) {
-        val list = this.argList.map { it.guessType(context) }
+        val list = mutableListOf<ITy>()
+        // self type
+        if (this.isMethodColonCall) {
+            this.prefixExpr?.let { prefix ->
+                list.add(prefix.guessType(context))
+            }
+        }
+        this.argList.map { list.add(it.guessType(context)) }
         val map = mutableMapOf<String, ITy>()
         var processedIndex = -1
         sig.tyParameters.forEach { map[it.name] = Ty.UNKNOWN }
-        sig.processArgs(this) { index, param ->
+        sig.processArgs { index, param ->
             val arg = list.getOrNull(index)
             if (arg != null) {
                 GenericAnalyzer(arg, param.ty).analyze(map)

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

@@ -66,9 +66,6 @@ interface ITy : Comparable<ITy> {
 
     fun union(ty: ITy): ITy
 
-    @Deprecated("use `displayName` instead")
-    fun createTypeString(): String
-
     fun subTypeOf(other: ITy, context: SearchContext, strict: Boolean): Boolean
 
     fun getSuperClass(context: SearchContext): ITy?
@@ -136,11 +133,6 @@ abstract class Ty(override val kind: TyKind) : ITy {
         return TyUnion.union(this, ty)
     }
 
-    override fun createTypeString(): String {
-        val s = toString()
-        return if (s.isEmpty()) Constants.WORD_ANY else s
-    }
-
     override fun toString(): String {
         val list = mutableListOf<String>()
         TyUnion.each(this) { //尽量不使用Global

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

@@ -62,6 +62,15 @@ fun IFunSignature.processArgs(thisTy: ITy?, colonStyle: Boolean, processor: (ind
     }
 }
 
+fun IFunSignature.processArgs(processor: (index:Int, param: LuaParamInfo) -> Boolean) {
+    var index = 0
+    if (colonCall)
+        index++
+    for (i in params.indices) {
+        if (!processor(index++, params[i])) return
+    }
+}
+
 fun IFunSignature.processParams(thisTy: ITy?, colonStyle: Boolean, processor: (index:Int, param: LuaParamInfo) -> Boolean) {
     var index = 0
     if (colonCall) {

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

@@ -68,7 +68,7 @@ internal fun renderTy(sb: StringBuilder, ty: ITy) {
             sb.appendClassLink(ty.displayName)
         }
         else -> {
-            sb.append(ty.createTypeString())
+            sb.append(ty.displayName)
         }
     }
 }