Merge pull request #28 from CppCXY/master

修改Annotator提供paramHint

Author: tangzx

EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LookupElementFactory.kt

@@ -11,6 +11,7 @@ import com.tang.intellij.lua.psi.LuaPsiElement
 import com.tang.intellij.lua.ty.IFunSignature
 import com.tang.intellij.lua.ty.ITy
 import com.tang.intellij.lua.ty.ITyFunction
+import com.tang.intellij.lua.ty.hasVarargs
 import com.tang.lsp.ILuaFile
 import org.eclipse.lsp4j.CompletionItemKind
 import javax.swing.Icon
@@ -88,6 +89,9 @@ object LookupElementFactory {
                 val p = params[i]
                 strings.add(p.name)
             }
+            if(signature.hasVarargs()){
+                strings.add("...")
+            }
             append(strings.joinToString(","))
             append(")")
         }

EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LuaCompletionContributor.kt

@@ -20,9 +20,14 @@ import com.intellij.codeInsight.completion.CompletionContributor
 import com.intellij.codeInsight.completion.CompletionInitializationContext
 import com.intellij.codeInsight.completion.CompletionParameters
 import com.intellij.codeInsight.completion.CompletionType
+import com.intellij.patterns.PatternCondition
 import com.intellij.patterns.PlatformPatterns.psiElement
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiNamedElement
 import com.intellij.psi.tree.TokenSet
+import com.intellij.util.ProcessingContext
 import com.tang.intellij.lua.Constants
+import com.tang.intellij.lua.project.LuaSettings
 import com.tang.intellij.lua.psi.*
 
 /**
@@ -31,6 +36,7 @@ import com.tang.intellij.lua.psi.*
  */
 class LuaCompletionContributor : CompletionContributor() {
     private var suggestWords = true
+
     init {
         //可以override
         /*extend(CompletionType.BASIC, SHOW_OVERRIDE, OverrideCompletionProvider())
@@ -71,6 +77,13 @@ class LuaCompletionContributor : CompletionContributor() {
         extend(CompletionType.BASIC, SHOW_CLASS_FIELD, ClassMemberCompletionProvider())
         //提示全局函数,local变量,local函数
         extend(CompletionType.BASIC, IN_NAME_EXPR, LocalAndGlobalCompletionProvider(LocalAndGlobalCompletionProvider.ALL))
+        // 表的[]索引方式提示
+        extend(CompletionType.BASIC, IN_TABLE_STRING_INDEX, TableStringIndexCompletionProvider())
+        // lua5.4
+        extend(CompletionType.BASIC, ATTRIBUTE, AttributeCompletionProvider())
+        // enum
+        extend(CompletionType.BASIC, SHOW_ENUM, EnumCompletionProvider())
+
     }
 
     /*override fun fillCompletionVariants(parameters: CompletionParameters, result: CompletionResultSet) {
@@ -129,11 +142,17 @@ class LuaCompletionContributor : CompletionContributor() {
                 .withParent(
                         psiElement(LuaTypes.LITERAL_EXPR).withParent(
                                 psiElement(LuaArgs::class.java).afterSibling(
-                                        psiElement().withName(Constants.WORD_REQUIRE)
+                                        psiElement().with(RequireLikePatternCondition())
                                 )
                         )
                 )
 
+        private val SHOW_ENUM = psiElement(LuaTypes.ID)
+                    .withParent(psiElement(LuaNameExpr::class.java)
+                            .withParent(psiElement(LuaArgs::class.java))
+                )
+
+
         private val GOTO = psiElement(LuaTypes.ID).withParent(LuaGotoStat::class.java)
 
         private val IN_TABLE_FIELD = psiElement().andOr(
@@ -143,6 +162,20 @@ class LuaCompletionContributor : CompletionContributor() {
                 psiElement(LuaTypes.ID).withParent(LuaTableField::class.java)
         )
 
+        private val IN_TABLE_STRING_INDEX = psiElement().andOr(
+//                psiElement(LuaTypes.LITERAL_EXPR).withParent(
+//                        psiElement(LuaIndexExpr::class.java)
+//                ),
+                psiElement(LuaTypes.STRING)
+                        .withParent(
+                                psiElement(LuaTypes.LITERAL_EXPR).withParent(
+                                        psiElement(LuaIndexExpr::class.java)
+                                )
+                        )
+        )
+
+        private val ATTRIBUTE = psiElement(LuaTypes.ID).withParent(LuaAttribute::class.java)
+
         private fun suggestWordsInFile(parameters: CompletionParameters) {
             /*val session = CompletionSession[parameters]!!
             val originalPosition = parameters.originalPosition
@@ -162,4 +195,11 @@ class LuaCompletionContributor : CompletionContributor() {
             }*/
         }
     }
+}
+
+class RequireLikePatternCondition : PatternCondition<PsiElement>("requireLike") {
+    override fun accepts(psi: PsiElement, context: ProcessingContext?): Boolean {
+        val name = (psi as? PsiNamedElement)?.name
+        return if (name != null) LuaSettings.isRequireLikeFunctionName(name) else false
+    }
 }

EmmyLua-Common/src/main/ext/com/tang/intellij/lua/lang/LuaParserDefinition.kt

@@ -135,6 +135,7 @@ class LuaParserDefinition : ParserDefinition {
                 LuaDocTypes.TAG_NAME_RETURN,
                 LuaDocTypes.TAG_NAME_CLASS,
                 LuaDocTypes.TAG_NAME_MODULE,
+                LuaDocTypes.TAG_NAME_ENUM,
                 LuaDocTypes.TAG_NAME_TYPE,
                 LuaDocTypes.TAG_NAME_FIELD,
                 LuaDocTypes.TAG_NAME_LANGUAGE,

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

@@ -26,6 +26,8 @@ import com.tang.intellij.lua.lang.LuaLanguageLevel
 class LuaSettings {
     var constructorNames: Array<String> = arrayOf("new", "get")
 
+    var requireLikeFunctions : Array<String> = arrayOf("require")
+
     //Doc文档严格模式，对不合法的注解报错
     var isStrictDoc: Boolean = false
 
@@ -51,7 +53,13 @@ class LuaSettings {
      */
     var enableGeneric: Boolean = false
 
-    var languageLevel: LuaLanguageLevel = LuaLanguageLevel.LUA53
+    var languageLevel: LuaLanguageLevel = LuaLanguageLevel.LUA54
+
+    var paramHint = true
+
+    var localHint = false
+
+    var varargHint = false
 
     companion object {
 
@@ -62,7 +70,7 @@ class LuaSettings {
         }
 
         fun isRequireLikeFunctionName(name: String): Boolean {
-            return name == Constants.WORD_REQUIRE
+            return name == Constants.WORD_REQUIRE || instance.requireLikeFunctions.contains(name.toLowerCase())
         }
     }
 }

EmmyLua-Common/src/main/ext/com/tang/intellij/lua/psi/parser/LuaStatementParser.kt

@@ -231,16 +231,31 @@ object LuaStatementParser : GeneratedParserUtilBase() {
         return m
     }
 
+    // Lua 5.4
+    private fun parseAttribute(b: PsiBuilder): PsiBuilder.Marker? {
+        if (b.tokenType == LT) {
+            val m = b.mark()
+            b.advanceLexer()
+            expectError(b, ID) { "ID" }
+            expectError(b, GT) { ">" }
+            m.done(ATTRIBUTE)
+            return m
+        }
+        return null
+    }
+
     private fun parseNameList(b: PsiBuilder): PsiBuilder.Marker? {
         var m = b.mark()
         if (expectError(b, ID) { "ID" }) {
             m.done(NAME_DEF)
+            parseAttribute(b)
             while (b.tokenType == COMMA) {
                 b.advanceLexer()
                 val nameDef = b.mark()
-                if (expectError(b, ID) { "ID" })
+                if (expectError(b, ID) { "ID" }) {
                     nameDef.done(NAME_DEF)
-                else nameDef.drop()
+                    parseAttribute(b)
+                } else nameDef.drop()
             }
             m = m.precede()
         }