优化语言服务

Author: CppCXY

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

@@ -146,7 +146,8 @@ class LuaParserDefinition : ParserDefinition {
                 LuaDocTypes.TAG_NAME_SEE,
                 LuaDocTypes.TAG_NAME_GENERIC,
                 LuaDocTypes.TAG_NAME_VARARG,
-                LuaDocTypes.TAG_NAME_ALIAS
+                LuaDocTypes.TAG_NAME_ALIAS,
+                LuaDocTypes.TAG_NAME_INTERFACE
         )
         val DOC_KEYWORD_TOKENS = TokenSet.create(
                 LuaDocTypes.FUN,

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

@@ -222,7 +222,7 @@ open class ClassMemberCompletionProvider : LuaCompletionProvider() {
         val name = field.name
         if (name != null) {
             val element = LookupElementFactory.createFieldLookupElement(clazzName, name, field, ty, bold)
-            val ele = handlerProcessor?.process(element, field, null) ?: element
+            val ele = handlerProcessor?.process(element, field, ty) ?: element
             completionResultSet.addElement(ele)
             return
         }
@@ -275,6 +275,7 @@ open class ClassMemberCompletionProvider : LuaCompletionProvider() {
                     && callType is TyClass
                     && callType !is TySerializedClass
                     && callType !is TyTable
+                    && callType != TyClass.G
                 ) {
                     val colonElement = LookupElementFactory.createShouldBeMethodLookupElement(
                         clazzName,

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

@@ -48,7 +48,7 @@ class EnumCompletionProvider : LuaCompletionProvider() {
                         if (activeParameter < activeSig.params.size) {
                             activeSig.params[activeParameter].let {
                                 val paramType = it.ty
-                                if (paramType is TyClass && paramType.isEnum(callExpr.project, searchContext)) {
+                                if (paramType is TyClass && paramType.isEnum) {
                                     addEnum(paramType, searchContext, completionResultSet)
                                 }
                             }

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

@@ -28,11 +28,12 @@ import com.tang.intellij.lua.psi.LuaTableExpr
 import com.tang.intellij.lua.psi.shouldBe
 import com.tang.intellij.lua.search.SearchContext
 import com.tang.intellij.lua.ty.ITy
+import org.eclipse.lsp4j.CompletionItemKind
 
 class TableCompletionProvider : ClassMemberCompletionProvider() {
 
     companion object {
-        private val metaMethodNames = mapOf(
+        public val metaMethodNames = mapOf(
                 "__add" to "a + b",
                 "__sub" to "a - b",
                 "__mul" to "a * b",
@@ -56,9 +57,9 @@ class TableCompletionProvider : ClassMemberCompletionProvider() {
         val completionParameters = session.parameters
         val completionResultSet = session.resultSet
         metaMethodNames.forEach {
-            val b = LookupElementBuilder.create(it.key)
-                    //.withTypeText(it.value)
-                    .withIcon(LuaIcons.META_METHOD)
+            val b = LuaLookupElement(it.key)
+            b.kind = CompletionItemKind.Method
+            b.additionDetailDescription = "[${it.value}]"
             completionResultSet.addElement(b)
         }
 
@@ -77,9 +78,10 @@ class TableCompletionProvider : ClassMemberCompletionProvider() {
                             if (member is LuaClassField) {
                                 addField(completionResultSet, curType === luaType, className, member, null, object : HandlerProcessor() {
                                     override fun process(element: LuaLookupElement, member: LuaClassMember, memberTy: ITy?): LookupElement {
-                                        element.itemText = "$className = "
+                                        element.itemText = "[$className]"
                                         element.lookupString = element.lookupString + " = "
-
+                                        element.additionDetailDescription = memberTy?.displayName
+                                        element.kind = CompletionItemKind.Property
                                         return PrioritizedLookupElement.withPriority(element, 10.0)
                                     }
                                 })

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

@@ -44,7 +44,7 @@ enum class TyPrimitiveKind {
     Number,
     Boolean,
     Table,
-    Function
+    Function,
 }
 
 class TyFlags {

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

@@ -16,7 +16,6 @@
 
 package com.tang.intellij.lua.ty
 
-import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.stubs.StubInputStream
@@ -32,7 +31,6 @@ import com.tang.intellij.lua.psi.search.LuaClassInheritorsSearch
 import com.tang.intellij.lua.psi.search.LuaShortNamesManager
 import com.tang.intellij.lua.search.SearchContext
 import com.tang.intellij.lua.stubs.index.LuaClassMemberIndex
-import com.tang.lsp.nameRange
 
 interface ITyClass : ITy {
     val className: String
@@ -41,6 +39,7 @@ interface ITyClass : ITy {
     var interfaceNames: List<String>?
     var aliasName: String?
     var isInterface: Boolean
+    var isEnum: Boolean
     fun processAlias(processor: Processor<String>): Boolean
     fun lazyInit(searchContext: SearchContext)
     fun processMembers(context: SearchContext, processor: (ITyClass, LuaClassMember) -> Unit, deep: Boolean = true)
@@ -113,7 +112,8 @@ abstract class TyClass(
     override val varName: String = "",
     override var superClassName: String? = null,
     override var interfaceNames: List<String>? = null,
-    override var isInterface: Boolean = false
+    override var isInterface: Boolean = false,
+    override var isEnum: Boolean = false
 ) : Ty(TyKind.Class), ITyClass {
     final override var aliasName: String? = null
     private var _lazyInitialized: Boolean = false
@@ -165,7 +165,6 @@ abstract class TyClass(
     }
 
     override fun getIndexResultType(element: LuaLiteralExpr): ITy? {
-
         val context = SearchContext.get(element.project)
         when (element.kind) {
             LuaLiteralKind.Number -> {
@@ -229,6 +228,7 @@ abstract class TyClass(
             superClassName = tyClass.superClassName
             interfaceNames = tyClass.interfaceNames
             isInterface = tyClass.isInterface
+            isEnum = tyClass.isEnum
         }
     }
 
@@ -309,12 +309,6 @@ abstract class TyClass(
         return substitutor.substitute(this)
     }
 
-    fun isEnum(project: Project, searchContext: SearchContext): Boolean{
-        val enumClass = LuaShortNamesManager.getInstance(project)
-            .findClass(className, searchContext)
-        return enumClass is LuaDocTagClass && enumClass.enum != null
-    }
-
     companion object {
         // for _G
         val G: TyClass = createSerializedClass(Constants.WORD_G)
@@ -418,6 +412,9 @@ class TyPsiDocClass(tagClass: LuaDocTagClass) : TyClass(tagClass.name) {
         if (tagClass.`interface` != null) {
             isInterface = true
         }
+        else if(tagClass.enum != null){
+            isEnum = true
+        }
 
         aliasName = tagClass.aliasName
     }

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

@@ -293,8 +293,7 @@ fun ITyFunction.findPerfectSignature(call: LuaCallExpr, paramSize: Int = 0): IFu
                 }
                 true
             })
-        }
-        else if(firstParamTy.subTypeOf(Ty.NUMBER, searchContext, true)){
+        } else if (firstParamTy.subTypeOf(Ty.NUMBER, searchContext, true)) {
             process(Processor {
                 val params = it.params
                 if (params.isNotEmpty()) {
@@ -308,8 +307,7 @@ fun ITyFunction.findPerfectSignature(call: LuaCallExpr, paramSize: Int = 0): IFu
                 }
                 true
             })
-        }
-        else if (firstParamTy is TyClass && firstParamTy.isEnum(call.project, searchContext)) {
+        } else if (firstParamTy is TyClass && firstParamTy.isEnum) {
             process(Processor {
                 val params = it.params
                 if (params.isNotEmpty()) {
@@ -348,7 +346,7 @@ fun ITyFunction.findPerfectSignature(call: LuaCallExpr, paramSize: Int = 0): IFu
         else if (!isColonCall && call.isMethodColonCall) {
             val originSig = findPerfectSignature(nArgs + 1)
 
-            if(originSig.params.isNotEmpty()) {
+            if (originSig.params.isNotEmpty()) {
                 val luaParamInfoList = originSig.params.toMutableList()
                 luaParamInfoList.removeAt(0)
                 val luaParamInfoArray = luaParamInfoList.toTypedArray()
@@ -358,8 +356,7 @@ fun ITyFunction.findPerfectSignature(call: LuaCallExpr, paramSize: Int = 0): IFu
                     originSig.varargTy,
                     luaParamInfoArray
                 )
-            }
-            else{
+            } else {
                 sig = FunSignature(
                     true,
                     originSig.returnTy,

EmmyLua-LS/src/main/kotlin/com/tang/vscode/diagnostics/inspections/FunctionInspection.kt

@@ -121,15 +121,14 @@ object FunctionInspection {
             if (isUnionCheckPass) {
                 return true
             }
-        } else if (defineType is TyClass && defineType.isEnum(context.project, context)) {
+        } else if (defineType is TyClass && defineType.isEnum) {
             val superClass = defineType.getSuperClass(context)
             return if (superClass != null) {
                 variableType.subTypeOf(superClass, context, true)
             } else {
                 false
             }
-        }
-        else if(defineType is TyStringLiteral){
+        } else if (defineType is TyStringLiteral) {
             return true
         }
 

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

@@ -177,7 +177,7 @@ internal fun renderDocParam(sb: StringBuilder, child: LuaDocTagParam) {
     val paramNameRef = child.paramNameRef
     val commentString = child.commentString
     if (paramNameRef != null && commentString != null && commentString.text.isNotEmpty()) {
-        sb.appendLine("@_param_ `${paramNameRef.text}${if (child.isNullable) "?" else ""}`: ")
+        sb.appendLine("(parameter) `${paramNameRef.text}${if (child.isNullable) "?" else ""}`: ")
         renderTypeUnion(null, null, sb, child.ty)
         renderCommentString("  ", null, sb, commentString)
     }

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

@@ -246,7 +246,7 @@ class LuaDocumentationProvider : DocumentationProvider {
             renderDocParam(sb, docParamDef)
         } else {
             val ty = infer(paramNameDef, SearchContext.get(paramNameDef.project))
-            sb.appendLine("@param `${paramNameDef.name}`:")
+            sb.appendLine("(parameter) `${paramNameDef.name}`:")
             renderTy(sb, ty)
         }
     }