Merge branch 'master' of github.com:EmmyLua/EmmyLua-LanguageServer

Author: CppCXY

EmmyLua-Common/src/main/gen/com/tang/intellij/lua/comment/lexer/_LuaDocLexer.java

@@ -212,11 +212,11 @@ tag_field ::= TAG_NAME_FIELD access_modifier? ((('<' class_name_ref '>')? ID nul
 }
 
 id_field ::= ID comment_string? {
-    implements = [
-        "com.tang.intellij.lua.comment.psi.LuaDocPsiElement"
-        "com.tang.intellij.lua.psi.LuaClassField"
-        "com.intellij.psi.PsiNameIdentifierOwner"
-    ]
+//    implements = [
+//        "com.tang.intellij.lua.comment.psi.LuaDocPsiElement"
+//        "com.tang.intellij.lua.psi.LuaClassField"
+//        "com.intellij.psi.PsiNameIdentifierOwner"
+//    ]
 
 
 }
@@ -266,7 +266,12 @@ class_name_ref_list ::= class_name_ref (',' class_name_ref)* {
     methods = [getClasses]
 }
 
-tag_class ::= (TAG_NAME_CLASS|TAG_NAME_MODULE|TAG_NAME_ENUM|TAG_NAME_INTERFACE) ID (EXTENDS class_name_ref_list)? comment_string? {
+
+private generic_define_list ::= '<' generic_def (',' generic_def)* '>' {
+    pin = 1
+}
+
+tag_class ::= (TAG_NAME_CLASS|TAG_NAME_MODULE|TAG_NAME_ENUM|TAG_NAME_INTERFACE) ID (generic_define_list)? (EXTENDS class_name_ref_list)? comment_string? {
     pin = 2
     implements = [
         "com.tang.intellij.lua.comment.psi.LuaDocPsiElement"

EmmyLua-Common/src/main/gen/com/tang/intellij/lua/comment/parser/LuaDocParser.java

@@ -135,7 +135,11 @@ SINGLE_QUOTED_STRING='([^\\\']|\\\S|\\[\r\n])*'?    //'([^\\'\r\n]|\\[^\r\n])*'?
     {ID}                       { yybegin(xCLASS_EXTEND); return ID; }
 }
 <xCLASS_EXTEND> {
-    ":"                        { beginType(); return EXTENDS;}
+    "<"                        { _typeLevel++; return LT; }
+    ","                        {  return COMMA; }
+    ">"                        { _typeLevel--; return GT; }
+    {ID}                       { if (_typeLevel > 0) { _typeReq = false; return ID; } else { yybegin(xCOMMENT_STRING); yypushback(yylength()); } }
+    ":"                        { if (_typeLevel == 0) {beginType(); return EXTENDS;} else { return EXTENDS; } }
     [^]                        { yybegin(xCOMMENT_STRING); yypushback(yylength()); }
 }
 

EmmyLua-Common/src/main/gen/com/tang/intellij/lua/comment/psi/LuaDocTagClass.java

@@ -268,8 +268,11 @@ open class ClassMemberCompletionProvider : LuaCompletionProvider() {
                 )
                 val ele = handlerProcessor?.process(element, classMember, fnTy) ?: element
                 completionResultSet.addElement(ele)
+
                 // correction completion
                 if (!isColonStyle && firstParamIsSelf
+                    // 前缀长度大于等于3才显示纠正
+                    && completionResultSet.prefixMatcher.prefix.length >= 3
                     && callType != Ty.STRING
                     // workaround now
                     && callType is TyClass

EmmyLua-Common/src/main/gen/com/tang/intellij/lua/comment/psi/impl/LuaDocTagClassImpl.java

@@ -83,6 +83,8 @@ interface ITyClass : ITy {
     fun recoverAlias(context: SearchContext, aliasSubstitutor: TyAliasSubstitutor): ITy {
         return this
     }
+
+    fun getClassCallType(context: SearchContext): ITyFunction?
 }
 
 fun ITyClass.isVisibleInScope(project: Project, contextTy: ITy, visibility: Visibility): Boolean {
@@ -261,6 +263,14 @@ abstract class TyClass(
         return result
     }
 
+    override fun getClassCallType(context: SearchContext): ITyFunction? {
+        val ty = findMemberType("ctor", context)
+        if(ty is ITyFunction){
+            return ty
+        }
+        return null
+    }
+
     override fun subTypeOf(other: ITy, context: SearchContext, strict: Boolean): Boolean {
         // class extends table
         if (other == Ty.TABLE) return true

EmmyLua-Common/src/main/gen/com/tang/intellij/lua/psi/LuaCallExpr.java

@@ -34,6 +34,7 @@ interface IFunSignature {
     val paramSignature: String
     val tyParameters: Array<TyParameter>
     val varargTy: ITy?
+    val document: String?
     fun substitute(substitutor: ITySubstitutor): IFunSignature
     fun subTypeOf(other: IFunSignature, context: SearchContext, strict: Boolean): Boolean
 }
@@ -183,7 +184,8 @@ class FunSignature(
     override val returnTy: ITy,
     override val varargTy: ITy?,
     params: Array<LuaParamInfo>,
-    tyParameters: Array<TyParameter> = emptyArray()
+    tyParameters: Array<TyParameter> = emptyArray(),
+    override val document: String = ""
 ) : FunSignatureBase(colonCall, params, tyParameters) {
 
     companion object {
@@ -446,6 +448,8 @@ class TyPsiFunction(private val colonCall: Boolean, val psi: LuaFuncBodyOwner, f
 
             override val varargTy: ITy?
                 get() = psi.varargType
+            override val document: String?
+                get() = null
         }
     }