sync code from IntelliJ-EmmyLua

tangzx · tangzx · commit b8fd57676bcd · 2019-10-09T22:16:01.000+08:00
diff --git a/EmmyLua-Common/src/main/ext/com/tang/intellij/lua/project/LuaSettings.kt b/EmmyLua-Common/src/main/ext/com/tang/intellij/lua/project/LuaSettings.kt
@@ -16,6 +16,7 @@
 
 package com.tang.intellij.lua.project
 
+import com.tang.intellij.lua.Constants
 import com.tang.intellij.lua.lang.LuaLanguageLevel
 
 /**
@@ -59,5 +60,9 @@ class LuaSettings {
         fun isConstructorName(name: String): Boolean {
             return instance.constructorNames.contains(name.toLowerCase())
         }
+
+        fun isImporterName(name: String): Boolean {
+            return name == Constants.WORD_REQUIRE
+        }
     }
 }
diff --git a/EmmyLua-Common/src/main/ext/com/tang/intellij/lua/psi/LuaPsiFile.kt b/EmmyLua-Common/src/main/ext/com/tang/intellij/lua/psi/LuaPsiFile.kt
@@ -54,6 +54,8 @@ class LuaPsiFile(private val myNode: ASTNode) : ASTDelegatePsiElement(), PsiFile
         return 0
     }
 
+    val isContentsLoaded: Boolean get() = true
+
     companion object {
         private var idCount = 0
     }
diff --git a/EmmyLua-Common/src/main/gen/com/tang/intellij/lua/lexer/_LuaLexer.java b/EmmyLua-Common/src/main/gen/com/tang/intellij/lua/lexer/_LuaLexer.java
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/editor/completion/ClassMemberCompletionProvider.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/editor/completion/ClassMemberCompletionProvider.kt
@@ -62,7 +62,7 @@ open class ClassMemberCompletionProvider : LuaCompletionProvider() {
                 complete(isColon, project, contextTy, prefixType, completionResultSet, completionResultSet.prefixMatcher, null)
             }
             //smart
-            /*val nameExpr = indexExpr.prefixExpr
+            val nameExpr = indexExpr.prefixExpr
             if (nameExpr is LuaNameExpr) {
                 val colon = if (isColon) ":" else "."
                 val prefixName = nameExpr.text
@@ -88,7 +88,7 @@ open class ClassMemberCompletionProvider : LuaCompletionProvider() {
                     }
                     true
                 }
-            }*/
+            }
         }
     }
 
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/lang/LuaLanguage.java b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/lang/LuaLanguage.java
@@ -19,8 +19,8 @@
 import com.intellij.lang.Language;
 
 /**
- * Created by TangZhiXu on 2015/11/15.
- * Email:272669294@qq.com
+ * Created by tangzx on 2015/11/15.
+ * Email:love.tangzx@qq.com
  */
 public class LuaLanguage extends Language {
 
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/lua.flex b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/lua.flex
@@ -68,7 +68,11 @@ n=[0-9]+
 h=[0-9a-fA-F]+
 exp=[Ee]([+-]?{n})?
 ppp=[Pp][+-]{n}
-NUMBER=(0[xX]({h}|{h}[.]{h})({exp}|{ppp})?|({n}|{n}[.]{n}){exp}?|[.]{n}|{n}[.])
+// 123ULL/123LL
+// 0x123FFULL/0x123FFLL
+JIT_EXT_NUMBER=(0[xX]{h}|{n})U?LL
+HEX_NUMBER=0[xX]({h}|{h}[.]{h})({exp}|{ppp})?
+NUMBER={JIT_EXT_NUMBER}|{HEX_NUMBER}|({n}|{n}[.]{n}){exp}?|[.]{n}|{n}[.]
 
 //Comments
 REGION_START =--(region|\{\{\{)([^\r\n]*)*
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/psi/LuaDeclarationTree.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/psi/LuaDeclarationTree.kt
@@ -33,8 +33,19 @@ interface LuaDeclarationTree {
                 ret = null
             }
             if (ret == null) {
-                val manager = if (file is LuaPsiFile && file.fileElement == null) LuaDeclarationTreeStub(file) else LuaDeclarationTreePsi(file)
-                manager.buildTree(file)
+                var manager: LuaDeclarationTree? = null
+                if (file is LuaPsiFile && !file.isContentsLoaded) {
+                    manager = LuaDeclarationTreeStub(file)
+                    try {
+                        manager.buildTree(file)
+                    } catch (e: Exception) {
+                        manager = null
+                    }
+                }
+                if (manager == null) {
+                    manager = LuaDeclarationTreePsi(file)
+                    manager.buildTree(file)
+                }
                 file.putUserData(key, manager)
                 ret = manager
             }
@@ -356,6 +367,7 @@ private class LuaDeclarationTreePsi(file: PsiFile) : LuaDeclarationTreeBase(file
     }
 
     override fun getPosition(psi: PsiElement): Int {
+        if (psi is PsiFile) return 0
         return psi.node.startOffset
     }
 }
@@ -365,7 +377,7 @@ private class LuaDeclarationTreeStub(file: PsiFile) : LuaDeclarationTreeBase(fil
     var count = 0
 
     override fun shouldRebuild(): Boolean {
-        return super.shouldRebuild() || (file as? LuaPsiFile)?.fileElement != null
+        return super.shouldRebuild() || (file as? LuaPsiFile)?.isContentsLoaded == true
     }
 
     override fun visitElementExt(element: PsiElement) {
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/psi/LuaParserUtil.java b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/psi/LuaParserUtil.java
@@ -191,14 +191,15 @@ private static boolean matchEnd(boolean advanced, PsiBuilder builder, int level,
             }
 
             while (!skips.contains(type)) {
-//                if (BRACE_R_SET.contains(type)) {
-//                    return false;
-//                }
                 if (types.contains(type)) {
                     if (level != 0)
                         builder.advanceLexer();
                     return true;
                 }
+                // bug fix https://github.com/EmmyLua/IntelliJ-EmmyLua/issues/276
+                // todo: optimize it
+                if (type == UNTIL)
+                    return true;
                 boolean isMatched = matchStart(false, builder, level + 1, type);
                 if (!isMatched)
                     break;
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/psi/LuaPsiResolveUtil.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/psi/LuaPsiResolveUtil.kt
@@ -118,6 +118,26 @@ fun multiResolve(ref: LuaNameExpr, context: SearchContext): Array<PsiElement> {
     return list.toTypedArray()
 }
 
+fun multiResolve(indexExpr: LuaIndexExpr, context: SearchContext): List<PsiElement> {
+    val list = mutableListOf<PsiElement>()
+    val name = indexExpr.name ?: return list
+    val type = indexExpr.guessParentType(context)
+    type.eachTopClass(Processor { ty ->
+        val m = ty.findMember(name, context)
+        if (m != null)
+            list.add(m)
+        true
+    })
+    if (list.isEmpty()) {
+        val tree = LuaDeclarationTree.get(indexExpr.containingFile)
+        val declaration = tree.find(indexExpr)
+        if (declaration != null) {
+            list.add(declaration.psi)
+        }
+    }
+    return list
+}
+
 fun resolve(indexExpr: LuaIndexExpr, context: SearchContext): PsiElement? {
     val name = indexExpr.name ?: return null
     return resolve(indexExpr, name, context)
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/psi/LuaTokenType.java b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/psi/LuaTokenType.java
@@ -20,8 +20,8 @@
 import com.tang.intellij.lua.lang.LuaLanguage;
 
 /**
- * Created by TangZhiXu on 2015/11/15.
- * Email:272669294@qq.com
+ * Created by tangzx on 2015/11/15.
+ * Email:love.tangzx@qq.com
  */
 public class LuaTokenType extends IElementType {
     public LuaTokenType(String debugName) {
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/psi/PsiExtension.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/psi/PsiExtension.kt
@@ -44,7 +44,6 @@ import com.tang.intellij.lua.ty.*
  * this table should be `MyClass`
  *
  * 2.
- *
  * ---@param callback fun(sender: any, type: string):void
  * local function addListener(type, callback)
  *      ...
@@ -53,6 +52,16 @@ import com.tang.intellij.lua.ty.*
  * addListener(function() end)
  *
  * this closure should be `fun(sender: any, type: string):void`
+ *
+ * 3.
+ * ---@class MyClass
+ * ---@field foo Bar
+ * local a = {}
+ *
+ * ---@type MyClass
+ * local tbl = {
+ *     foo = ?? -- foo should be type of `Bar`
+ * }
  */
 private fun LuaExpr.shouldBeInternal(context: SearchContext): ITy {
     val p1 = parent
@@ -67,7 +76,7 @@ private fun LuaExpr.shouldBeInternal(context: SearchContext): ITy {
             if (receiver != null)
                 return infer(receiver, context)
         }
-    } else if (p1 is LuaListArgs) {
+    } else if (p1 is LuaArgs) {
         val p2 = p1.parent
         if (p2 is LuaCallExpr) {
             val idx = p1.getIndexFor(this)
@@ -84,6 +93,18 @@ private fun LuaExpr.shouldBeInternal(context: SearchContext): ITy {
             }
             return ret
         }
+    } else if (p1 is LuaTableField) {
+        val fieldName = p1.name
+        val tbl = p1.parent
+        if (fieldName != null && tbl is LuaTableExpr) {
+            var fieldType: ITy = Ty.UNKNOWN
+            val tyTbl = tbl.shouldBe(context)
+            tyTbl.eachTopClass(Processor { cls ->
+                cls.findMemberType(fieldName, context)?.let { fieldType = fieldType.union(it) }
+                true
+            })
+            return fieldType
+        }
     }
     return Ty.UNKNOWN
 }
@@ -153,7 +174,9 @@ fun LuaAssignStat.getExprAt(index:Int) : LuaExpr? {
     return list.getOrNull(index)
 }
 
-fun LuaListArgs.getIndexFor(psi: LuaExpr): Int {
+fun LuaArgs.getIndexFor(psi: LuaExpr): Int {
+    if (this is LuaSingleArg)
+        return 0
     var idx = 0
     LuaPsiTreeUtilEx.processChildren(this, Processor {
         if (it is LuaExpr) {
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/reference/LuaReferenceContributor.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/reference/LuaReferenceContributor.kt
@@ -19,11 +19,12 @@ package com.tang.intellij.lua.reference
 import com.intellij.patterns.PlatformPatterns.psiElement
 import com.intellij.psi.*
 import com.intellij.util.ProcessingContext
+import com.tang.intellij.lua.project.LuaSettings
 import com.tang.intellij.lua.psi.*
 
 /**
  * reference contributor
- * Created by TangZX on 2016/12/14.
+ * Created by tangzx on 2016/12/14.
  */
 class LuaReferenceContributor : PsiReferenceContributor() {
     override fun registerReferenceProviders(psiReferenceRegistrar: PsiReferenceRegistrar) {
@@ -60,7 +61,7 @@ class LuaReferenceContributor : PsiReferenceContributor() {
             val expr = psiElement as LuaCallExpr
             val nameRef = expr.expr
             if (nameRef is LuaNameExpr) {
-                if (nameRef.getText() == "require") {
+                if (LuaSettings.isImporterName(nameRef.getText())) {
                     return arrayOf(LuaRequireReference(expr))
                 }
             }
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/search/SearchContext.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/search/SearchContext.kt
@@ -55,32 +55,41 @@ class SearchContext private constructor(val project: Project) {
         }
 
         fun infer(psi: LuaTypeGuessable, context: SearchContext): ITy {
-            return with(context) { it.inferAndCache(psi) }
+            return with(context, Ty.UNKNOWN) { it.inferAndCache(psi) }
         }
 
-        fun <T> with(ctx: SearchContext, action: (ctx: SearchContext) -> T): T {
+        private fun <T> with(ctx: SearchContext, defaultValue: T, action: (ctx: SearchContext) -> T): T {
             return if (ctx.myInStack) {
                 action(ctx)
             } else {
                 val stack = threadLocal.get()
                 val size = stack.size
                 stack.push(ctx)
                 ctx.myInStack = true
-                val result = action(ctx)
+                val result = try {
+                    action(ctx)
+                } catch (e: Exception) {
+                    defaultValue
+                }
                 ctx.myInStack = false
                 stack.pop()
                 assert(size == stack.size)
                 result
             }
         }
 
-        fun <T> with(project: Project, action: (ctx: SearchContext) -> T): T {
+        private fun <T> with(project: Project, action: (ctx: SearchContext) -> T): T {
             val ctx = get(project)
             return with(ctx, action)
         }
 
-        fun <T> withStub(project: Project, file: PsiFile, action: (ctx: SearchContext) -> T): T {
-            return with(project) {
+        fun <T> withStub(project: Project, file: PsiFile, defaultValue: T, action: (ctx: SearchContext) -> T): T {
+            val context = SearchContext(project)
+            return withStub(context, defaultValue, action)
+        }
+
+        private fun <T> withStub(ctx: SearchContext, defaultValue: T, action: (ctx: SearchContext) -> T): T {
+            return with(ctx, defaultValue) {
                 val dumb = it.myDumb
                 val stub = it.myForStub
                 it.myDumb = true
@@ -117,6 +126,8 @@ class SearchContext private constructor(val project: Project) {
     fun guessTuple() = index < 0
 
     val scope get(): GlobalSearchScope {
+        if (isDumb)
+            return GlobalSearchScope.EMPTY_SCOPE
         if (myScope == null) {
             myScope = ProjectAndLibrariesScope(project)
         }
@@ -151,12 +162,16 @@ class SearchContext private constructor(val project: Project) {
         return result
     }
 
-    private fun inferAndCache(psi: LuaTypeGuessable):  ITy {
+    private fun inferAndCache(psi: LuaTypeGuessable): ITy {
         /*if (inferCache.containsKey(psi)) {
             println("use cache!!!")
         }*/
         return myInferCache.getOrPut(psi) {
             ILuaTypeInfer.infer(psi, this)
         }
     }
+
+    fun getTypeFromCache(psi: LuaTypeGuessable): ITy {
+        return myInferCache.getOrElse(psi) { Ty.UNKNOWN }
+    }
 }
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/Declarations.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/Declarations.kt
@@ -130,7 +130,7 @@ private fun LuaNameDef.infer(context: SearchContext): ITy {
         val localDef = PsiTreeUtil.getParentOfType(this, LuaLocalDef::class.java)
         if (localDef != null) {
             //计算 expr 返回类型
-            if (Ty.isInvalid(type) && !context.forStub) {
+            if (Ty.isInvalid(type) /*&& !context.forStub*/) {
                 val nameList = localDef.nameList
                 val exprList = localDef.exprList
                 if (nameList != null && exprList != null) {
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/Expressions.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/Expressions.kt
@@ -166,7 +166,7 @@ private fun LuaCallExpr.infer(context: SearchContext): ITy {
     // xxx()
     val expr = luaCallExpr.expr
     // 从 require 'xxx' 中获取返回类型
-    if (expr is LuaNameExpr && expr.name == Constants.WORD_REQUIRE) {
+    if (expr is LuaNameExpr && LuaSettings.isImporterName(expr.name)) {
         var filePath: String? = null
         val string = luaCallExpr.firstStringArg
         if (string is LuaLiteralExpr) {
@@ -268,7 +268,7 @@ private fun getType(context: SearchContext, def: PsiElement): ITy {
 
             var type: ITy = def.docTy ?: Ty.UNKNOWN
             //guess from value expr
-            if (Ty.isInvalid(type) && !context.forStub) {
+            if (Ty.isInvalid(type) /*&& !context.forStub*/) {
                 val stat = def.assignStat
                 if (stat != null) {
                     val exprList = stat.valueExprList
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/Ty.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/Ty.kt
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/TyFunction.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/TyFunction.kt
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/TyGeneric.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/TyGeneric.kt
diff --git a/IntelliJ-Core/src/main/java/com/intellij/psi/search/GlobalSearchScope.java b/IntelliJ-Core/src/main/java/com/intellij/psi/search/GlobalSearchScope.java

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`package com.tang.intellij.lua.project`
`18`	`18`
	`19`	`+import com.tang.intellij.lua.Constants`
`19`	`20`	`import com.tang.intellij.lua.lang.LuaLanguageLevel`
`20`	`21`
`21`	`22`	`/**`
`@@ -59,5 +60,9 @@ class LuaSettings {`
`59`	`60`	`fun isConstructorName(name: String): Boolean {`
`60`	`61`	`return instance.constructorNames.contains(name.toLowerCase())`
`61`	`62`	`}`
	`63`	`+`
	`64`	`+ fun isImporterName(name: String): Boolean {`
	`65`	`+ return name == Constants.WORD_REQUIRE`
	`66`	`+ }`
`62`	`67`	`}`
`63`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ class LuaPsiFile(private val myNode: ASTNode) : ASTDelegatePsiElement(), PsiFile`
`54`	`54`	`return 0`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ val isContentsLoaded: Boolean get() = true`
	`58`	`+`
`57`	`59`	`companion object {`
`58`	`60`	`private var idCount = 0`
`59`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ open class ClassMemberCompletionProvider : LuaCompletionProvider() {`
`62`	`62`	`complete(isColon, project, contextTy, prefixType, completionResultSet, completionResultSet.prefixMatcher, null)`
`63`	`63`	`}`
`64`	`64`	`//smart`
`65`		`- /*val nameExpr = indexExpr.prefixExpr`
	`65`	`+ val nameExpr = indexExpr.prefixExpr`
`66`	`66`	`if (nameExpr is LuaNameExpr) {`
`67`	`67`	`val colon = if (isColon) ":" else "."`
`68`	`68`	`val prefixName = nameExpr.text`
`@@ -88,7 +88,7 @@ open class ClassMemberCompletionProvider : LuaCompletionProvider() {`
`88`	`88`	`}`
`89`	`89`	`true`
`90`	`90`	`}`
`91`		`- }*/`
	`91`	`+ }`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,19 @@ interface LuaDeclarationTree {`
`33`	`33`	`ret = null`
`34`	`34`	`}`
`35`	`35`	`if (ret == null) {`
`36`		`- val manager = if (file is LuaPsiFile && file.fileElement == null) LuaDeclarationTreeStub(file) else LuaDeclarationTreePsi(file)`
`37`		`- manager.buildTree(file)`
	`36`	`+ var manager: LuaDeclarationTree? = null`
	`37`	`+ if (file is LuaPsiFile && !file.isContentsLoaded) {`
	`38`	`+ manager = LuaDeclarationTreeStub(file)`
	`39`	`+ try {`
	`40`	`+ manager.buildTree(file)`
	`41`	`+ } catch (e: Exception) {`
	`42`	`+ manager = null`
	`43`	`+ }`
	`44`	`+ }`
	`45`	`+ if (manager == null) {`
	`46`	`+ manager = LuaDeclarationTreePsi(file)`
	`47`	`+ manager.buildTree(file)`
	`48`	`+ }`
`38`	`49`	`file.putUserData(key, manager)`
`39`	`50`	`ret = manager`
`40`	`51`	`}`
`@@ -356,6 +367,7 @@ private class LuaDeclarationTreePsi(file: PsiFile) : LuaDeclarationTreeBase(file`
`356`	`367`	`}`
`357`	`368`
`358`	`369`	`override fun getPosition(psi: PsiElement): Int {`
	`370`	`+ if (psi is PsiFile) return 0`
`359`	`371`	`return psi.node.startOffset`
`360`	`372`	`}`
`361`	`373`	`}`
`@@ -365,7 +377,7 @@ private class LuaDeclarationTreeStub(file: PsiFile) : LuaDeclarationTreeBase(fil`
`365`	`377`	`var count = 0`
`366`	`378`
`367`	`379`	`override fun shouldRebuild(): Boolean {`
`368`		`- return super.shouldRebuild() \|\| (file as? LuaPsiFile)?.fileElement != null`
	`380`	`+ return super.shouldRebuild() \|\| (file as? LuaPsiFile)?.isContentsLoaded == true`
`369`	`381`	`}`
`370`	`382`
`371`	`383`	`override fun visitElementExt(element: PsiElement) {`