sync code from IntelliJ-EmmyLua

Author: tangzx

EmmyLua-Common/src/main/ext/com/tang/intellij/lua/project/LuaSettings.kt

@@ -61,7 +61,7 @@ class LuaSettings {
             return instance.constructorNames.contains(name.toLowerCase())
         }
 
-        fun isImporterName(name: String): Boolean {
+        fun isRequireLikeFunctionName(name: String): Boolean {
             return name == Constants.WORD_REQUIRE
         }
     }

EmmyLua-Common/src/main/java/com/tang/intellij/lua/editor/completion/ClassMemberCompletionProvider.kt

@@ -142,7 +142,9 @@ open class ClassMemberCompletionProvider : LuaCompletionProvider() {
         val bold = thisType == callType
         val className = thisType.displayName
         if (type is ITyFunction) {
-            addFunction(completionResultSet, bold, completionMode != MemberCompletionMode.Dot, className, member, type, thisType, callType, handlerProcessor)
+            val fn = type.substitute(TySelfSubstitutor(project, null, callType))
+            if (fn is ITyFunction)
+                addFunction(completionResultSet, bold, completionMode != MemberCompletionMode.Dot, className, member, fn, thisType, callType, handlerProcessor)
         } else if (member is LuaClassField) {
             if (completionMode != MemberCompletionMode.Colon)
                 addField(completionResultSet, bold, className, member, type, handlerProcessor)

EmmyLua-Common/src/main/java/com/tang/intellij/lua/reference/LuaReferenceContributor.kt

@@ -61,7 +61,7 @@ class LuaReferenceContributor : PsiReferenceContributor() {
             val expr = psiElement as LuaCallExpr
             val nameRef = expr.expr
             if (nameRef is LuaNameExpr) {
-                if (LuaSettings.isImporterName(nameRef.getText())) {
+                if (LuaSettings.isRequireLikeFunctionName(nameRef.getText())) {
                     return arrayOf(LuaRequireReference(expr))
                 }
             }

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

@@ -151,12 +151,9 @@ fun LuaCallExpr.createSubstitutor(sig: IFunSignature, context: SearchContext): I
 }
 
 private fun LuaCallExpr.getReturnTy(sig: IFunSignature, context: SearchContext): ITy? {
-    var resultSig = sig
     val substitutor = createSubstitutor(sig, context)
-    if (substitutor != null) {
-        resultSig = sig.substitute(substitutor)
-    }
-    val returnTy = resultSig.returnTy
+    var returnTy = if (substitutor != null) sig.returnTy.substitute(substitutor) else sig.returnTy
+    returnTy = returnTy.substitute(TySelfSubstitutor(project, this))
     return if (returnTy is TyTuple) {
         if (context.guessTuple())
             returnTy
@@ -173,7 +170,7 @@ private fun LuaCallExpr.infer(context: SearchContext): ITy {
     // xxx()
     val expr = luaCallExpr.expr
     // 从 require 'xxx' 中获取返回类型
-    if (expr is LuaNameExpr && LuaSettings.isImporterName(expr.name)) {
+    if (expr is LuaNameExpr && LuaSettings.isRequireLikeFunctionName(expr.name)) {
         var filePath: String? = null
         val string = luaCallExpr.firstStringArg
         if (string is LuaLiteralExpr) {
@@ -362,11 +359,12 @@ private fun LuaIndexExpr.infer(context: SearchContext): ITy {
         val propName = indexExpr.name
         if (propName != null) {
             val prefixType = parentTy ?: indexExpr.guessParentType(context)
-
-            prefixType.eachTopClass(Processor {
-                result = result.union(guessFieldType(propName, it, context))
-                true
-            })
+            prefixType.each { ty ->
+                if (ty is ITyClass)
+                    result = result.union(guessFieldType(propName, ty, context))
+                else if (ty is ITyGeneric && ty.getParamTy(0) == Ty.STRING)
+                    result = result.union(ty.getParamTy(1))
+            }
         }
         result
     })