Merge pull request #33 from CppCXY/master

CppCXY · web-flow · commit 8e26caa88ff9 · 2022-03-16T16:02:49.000+08:00
功能改进
diff --git a/EmmyLua-Common/build.gradle b/EmmyLua-Common/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 buildscript {
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.6.0'
     repositories {
         mavenCentral()
     }
diff --git a/EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LuaCompletionContributor.kt b/EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LuaCompletionContributor.kt
@@ -76,14 +76,19 @@ 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_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())
 
+        extend(CompletionType.BASIC, SHOW_CALLBACK, CallbackCompletionProvider())
     }
 
     /*override fun fillCompletionVariants(parameters: CompletionParameters, result: CompletionResultSet) {
@@ -121,57 +126,63 @@ class LuaCompletionContributor : CompletionContributor() {
         private val IGNORE_SET = TokenSet.create(LuaTypes.STRING, LuaTypes.NUMBER, LuaTypes.CONCAT)
 
         private val SHOW_CLASS_FIELD = psiElement(LuaTypes.ID)
-                .withParent(LuaIndexExpr::class.java)
+            .withParent(LuaIndexExpr::class.java)
 
         private val IN_FUNC_NAME = psiElement(LuaTypes.ID)
-                .withParent(LuaIndexExpr::class.java)
-                .inside(LuaClassMethodName::class.java)
+            .withParent(LuaIndexExpr::class.java)
+            .inside(LuaClassMethodName::class.java)
         private val AFTER_FUNCTION = psiElement()
-                .afterLeaf(psiElement(LuaTypes.FUNCTION))
+            .afterLeaf(psiElement(LuaTypes.FUNCTION))
         private val IN_CLASS_METHOD_NAME = psiElement().andOr(IN_FUNC_NAME, AFTER_FUNCTION)
 
         private val IN_NAME_EXPR = psiElement(LuaTypes.ID)
-                .withParent(LuaNameExpr::class.java)
+            .withParent(LuaNameExpr::class.java)
 
         private val SHOW_OVERRIDE = psiElement()
-                .withParent(LuaClassMethodName::class.java)
+            .withParent(LuaClassMethodName::class.java)
         private val IN_CLASS_METHOD = psiElement(LuaTypes.ID)
-                .withParent(LuaNameExpr::class.java)
-                .inside(LuaClassMethodDef::class.java)
+            .withParent(LuaNameExpr::class.java)
+            .inside(LuaClassMethodDef::class.java)
         private val SHOW_REQUIRE_PATH = psiElement(LuaTypes.STRING)
-                .withParent(
-                        psiElement(LuaTypes.LITERAL_EXPR).withParent(
-                                psiElement(LuaArgs::class.java).afterSibling(
-                                        psiElement().with(RequireLikePatternCondition())
-                                )
-                        )
+            .withParent(
+                psiElement(LuaTypes.LITERAL_EXPR).withParent(
+                    psiElement(LuaArgs::class.java).afterSibling(
+                        psiElement().with(RequireLikePatternCondition())
+                    )
                 )
+            )
 
         private val SHOW_ENUM = psiElement(LuaTypes.ID)
-                    .withParent(psiElement(LuaNameExpr::class.java)
-                            .withParent(psiElement(LuaArgs::class.java))
-                )
+            .withParent(
+                psiElement(LuaNameExpr::class.java)
+                    .withParent(psiElement(LuaArgs::class.java))
+            )
 
+        private val SHOW_CALLBACK = 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(
-                psiElement().withParent(
-                        psiElement(LuaTypes.NAME_EXPR).withParent(LuaTableField::class.java)
-                ),
-                psiElement(LuaTypes.ID).withParent(LuaTableField::class.java)
+            psiElement().withParent(
+                psiElement(LuaTypes.NAME_EXPR).withParent(LuaTableField::class.java)
+            ),
+            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)
-                                )
-                        )
+            psiElement(LuaTypes.STRING)
+                .withParent(
+                    psiElement(LuaTypes.LITERAL_EXPR).withParent(
+                        psiElement(LuaIndexExpr::class.java)
+                    )
+                )
         )
 
         private val ATTRIBUTE = psiElement(LuaTypes.ID).withParent(LuaAttribute::class.java)
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/editor/completion/CallbackCompletionProvider.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/editor/completion/CallbackCompletionProvider.kt
@@ -0,0 +1,75 @@
+package com.tang.intellij.lua.editor.completion
+
+import com.intellij.codeInsight.completion.CompletionResultSet
+import com.intellij.openapi.progress.ProgressManager
+import com.intellij.psi.PsiElement
+import com.intellij.util.Processor
+import com.tang.intellij.lua.comment.psi.LuaDocTagClass
+import com.tang.intellij.lua.psi.LuaCallExpr
+import com.tang.intellij.lua.psi.LuaTypes
+import com.tang.intellij.lua.psi.search.LuaShortNamesManager
+import com.tang.intellij.lua.search.SearchContext
+import com.tang.intellij.lua.ty.*
+import com.tang.lsp.ILuaFile
+import org.eclipse.lsp4j.CompletionItemKind
+
+class CallbackCompletionProvider : LuaCompletionProvider() {
+    override fun addCompletions(session: CompletionSession) {
+        val completionParameters = session.parameters
+        val completionResultSet = session.resultSet
+
+        val psi = completionParameters.position
+        val callExpr = psi.parent.parent.parent
+
+        if (callExpr is LuaCallExpr) {
+            var activeParameter = 0
+            var nCommas = 0
+
+            callExpr.args.firstChild?.let { firstChild ->
+                var child: PsiElement? = firstChild
+                while (child != null) {
+                    if (child.node.elementType == LuaTypes.COMMA) {
+                        activeParameter++
+                        nCommas++
+                    }
+                    child = child.nextSibling
+                }
+            }
+            val searchContext = SearchContext.get(callExpr.project)
+            callExpr.guessParentType(searchContext).let { parentType ->
+                parentType.each { ty ->
+                    if (ty is ITyFunction) {
+                        val active = ty.findPerfectSignature(nCommas + 1)
+                        ty.process(Processor { sig ->
+                            if (sig == active) {
+                                if (activeParameter < sig.params.size) {
+                                    sig.params[activeParameter].let {
+                                        val paramType = it.ty
+                                        if (paramType is TyFunction) {
+                                            addCallback(paramType, searchContext, completionResultSet)
+                                        }
+                                    }
+                                }
+
+                            }
+
+                            true
+                        })
+                    }
+                }
+            }
+        }
+    }
+
+
+    private fun addCallback(
+        luaType: TyFunction,
+        searchContext: SearchContext,
+        completionResultSet: CompletionResultSet
+    ) {
+        val params = luaType.mainSignature.params
+        val element = LuaLookupElement("function(${params.map { it.name }.joinToString(", ")}) end")
+        element.kind = CompletionItemKind.Function
+        completionResultSet.addElement(element)
+    }
+}
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
@@ -132,7 +132,7 @@ abstract class FunSignatureBase(override val colonCall: Boolean,
                 paramSB.add("...:"+ it.displayName)
             }
         }
-        "fun(${paramSB.joinToString(", ")}):${returnTy.displayName}"
+        "(${paramSB.joinToString(", ")}) -> ${returnTy.displayName}"
     }
 
     override val paramSignature: String get() {
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/TyRenderer.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/TyRenderer.kt
@@ -100,8 +100,8 @@ open class TyRenderer : TyVisitor(), ITyRenderer {
                 "{ ${list.joinToString(", ")} }"
             }
             clazz.hasFlag(TyFlags.ANONYMOUS_TABLE) -> renderType(Constants.WORD_TABLE)
-            clazz.isAnonymous -> "[local ${clazz.varName}]"
-            clazz.isGlobal -> "[global ${clazz.varName}]"
+            clazz.isAnonymous -> clazz.varName
+            clazz.isGlobal -> clazz.varName
             else -> renderType(clazz.className)
         }
     }
diff --git a/EmmyLua-LS/build.gradle b/EmmyLua-LS/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.31'
+    ext.kotlin_version = '1.6.0'
     repositories {
         mavenCentral()
     }
@@ -9,8 +9,8 @@ buildscript {
 }
 
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.2.30"
-    id 'com.github.johnrengelman.shadow' version '4.0.3'
+    id "org.jetbrains.kotlin.jvm" version "1.6.0"
+    id 'com.github.johnrengelman.shadow' version '6.1.0'
 }
 
 apply plugin: "java"
diff --git a/EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaLanguageServer.kt b/EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaLanguageServer.kt
@@ -90,6 +90,7 @@ class LuaLanguageServer : LanguageServer, LanguageClientAware {
         capabilities.codeLensProvider = CodeLensOptions(true)
         capabilities.documentHighlightProvider = true
         capabilities.renameProvider = true
+
         capabilities.signatureHelpProvider = SignatureHelpOptions(listOf(",", "("))
         capabilities.documentSymbolProvider = true
         capabilities.workspaceSymbolProvider = true
@@ -99,7 +100,7 @@ class LuaLanguageServer : LanguageServer, LanguageClientAware {
         capabilities.workspace.workspaceFolders.supported = true
         capabilities.workspace.workspaceFolders.changeNotifications = Either.forLeft(WORKSPACE_FOLDERS_CAPABILITY_ID)
         capabilities.foldingRangeProvider = Either.forLeft(true)
-        capabilities.documentFormattingProvider = true
+//        capabilities.documentFormattingProvider = true
 
         capabilities.textDocumentSync = Either.forLeft(TextDocumentSyncKind.Full)
 
diff --git a/EmmyLua-LS/src/main/kotlin/com/tang/vscode/diagnostics/DiagnosticsOptions.kt b/EmmyLua-LS/src/main/kotlin/com/tang/vscode/diagnostics/DiagnosticsOptions.kt
@@ -2,7 +2,7 @@ package com.tang.vscode.diagnostics
 
 object DiagnosticsOptions {
     // 参数验证诊断
-    var parameterValidation = true
+    var parameterValidation = false
 
     // any 类型是否可以赋值给其他类型
     var anyTypeCanAssignToAnyDefineType = true
diff --git a/EmmyLua-LS/src/main/kotlin/com/tang/vscode/documentation/DocRenderer.kt b/EmmyLua-LS/src/main/kotlin/com/tang/vscode/documentation/DocRenderer.kt
@@ -85,7 +85,7 @@ internal fun renderTy(sb: StringBuilder, ty: ITy) {
 }
 
 internal fun renderSignature(sb: StringBuilder, sig: IFunSignature) {
-    sb.wrap("(", "): ") {
+    sb.wrap("(", ") -> ") {
         var idx = 0
         sig.params.forEach {
             if (idx++ != 0) sb.append(", ")
@@ -171,10 +171,11 @@ internal fun renderFieldDef(sb: StringBuilder, def: LuaDocTagField) {
 
 internal fun renderDocParam(sb: StringBuilder, child: LuaDocTagParam) {
     val paramNameRef = child.paramNameRef
-    if (paramNameRef != null) {
+    val commentString = child.commentString
+    if (paramNameRef != null && commentString != null && commentString.text.isNotEmpty()) {
         sb.appendLine("@_param_ `${paramNameRef.text}`: ")
         renderTypeUnion(null, null, sb, child.ty)
-        renderCommentString("  ", null, sb, child.commentString)
+        renderCommentString("  ", null, sb, commentString)
     }
 }
 
diff --git a/EmmyLua-LS/src/main/kotlin/com/tang/vscode/documentation/LuaDocumentationProvider.kt b/EmmyLua-LS/src/main/kotlin/com/tang/vscode/documentation/LuaDocumentationProvider.kt
diff --git a/EmmyLua-LS/src/main/kotlin/com/tang/vscode/formatter/FormattingFormatter.kt b/EmmyLua-LS/src/main/kotlin/com/tang/vscode/formatter/FormattingFormatter.kt
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ dependencies {`
`18`	`18`	`compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"`
`19`	`19`	`}`
`20`	`20`	`buildscript {`
`21`		`- ext.kotlin_version = '1.2.30'`
	`21`	`+ ext.kotlin_version = '1.6.0'`
`22`	`22`	`repositories {`
`23`	`23`	`mavenCentral()`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ abstract class FunSignatureBase(override val colonCall: Boolean,`
`132`	`132`	`paramSB.add("...:"+ it.displayName)`
`133`	`133`	`}`
`134`	`134`	`}`
`135`		`- "fun(${paramSB.joinToString(", ")}):${returnTy.displayName}"`
	`135`	`+ "(${paramSB.joinToString(", ")}) -> ${returnTy.displayName}"`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`override val paramSignature: String get() {`
Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,8 @@ open class TyRenderer : TyVisitor(), ITyRenderer {`
`100`	`100`	`"{ ${list.joinToString(", ")} }"`
`101`	`101`	`}`
`102`	`102`	`clazz.hasFlag(TyFlags.ANONYMOUS_TABLE) -> renderType(Constants.WORD_TABLE)`
`103`		`- clazz.isAnonymous -> "[local ${clazz.varName}]"`
`104`		`- clazz.isGlobal -> "[global ${clazz.varName}]"`
	`103`	`+ clazz.isAnonymous -> clazz.varName`
	`104`	`+ clazz.isGlobal -> clazz.varName`
`105`	`105`	`else -> renderType(clazz.className)`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`buildscript {`
`2`		`- ext.kotlin_version = '1.2.31'`
	`2`	`+ ext.kotlin_version = '1.6.0'`
`3`	`3`	`repositories {`
`4`	`4`	`mavenCentral()`
`5`	`5`	`}`
`@@ -9,8 +9,8 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`plugins {`
`12`		`- id "org.jetbrains.kotlin.jvm" version "1.2.30"`
`13`		`- id 'com.github.johnrengelman.shadow' version '4.0.3'`
	`12`	`+ id "org.jetbrains.kotlin.jvm" version "1.6.0"`
	`13`	`+ id 'com.github.johnrengelman.shadow' version '6.1.0'`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`apply plugin: "java"`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ internal fun renderTy(sb: StringBuilder, ty: ITy) {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`internal fun renderSignature(sb: StringBuilder, sig: IFunSignature) {`
`88`		`- sb.wrap("(", "): ") {`
	`88`	`+ sb.wrap("(", ") -> ") {`
`89`	`89`	`var idx = 0`
`90`	`90`	`sig.params.forEach {`
`91`	`91`	`if (idx++ != 0) sb.append(", ")`
`@@ -171,10 +171,11 @@ internal fun renderFieldDef(sb: StringBuilder, def: LuaDocTagField) {`
`171`	`171`
`172`	`172`	`internal fun renderDocParam(sb: StringBuilder, child: LuaDocTagParam) {`
`173`	`173`	`val paramNameRef = child.paramNameRef`
`174`		`- if (paramNameRef != null) {`
	`174`	`+ val commentString = child.commentString`
	`175`	`+ if (paramNameRef != null && commentString != null && commentString.text.isNotEmpty()) {`
`175`	`176`	sb.appendLine("@_param_ `${paramNameRef.text}`: ")
`176`	`177`	`renderTypeUnion(null, null, sb, child.ty)`
`177`		`- renderCommentString(" ", null, sb, child.commentString)`
	`178`	`+ renderCommentString(" ", null, sb, commentString)`
`178`	`179`	`}`
`179`	`180`	`}`
`180`	`181`