升级kotlin gradle，修改函数签名显示

Author: CppCXY

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()
     }

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() {

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"

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(", ")

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

@@ -51,11 +51,19 @@ class LuaDocumentationProvider : DocumentationProvider {
         return null
     }
 
-    override fun getDocumentationElementForLookupItem(psiManager: PsiManager, obj: Any, element: PsiElement): PsiElement? {
+    override fun getDocumentationElementForLookupItem(
+        psiManager: PsiManager,
+        obj: Any,
+        element: PsiElement
+    ): PsiElement? {
         return null
     }
 
-    override fun getDocumentationElementForLink(psiManager: PsiManager, link: String, context: PsiElement?): PsiElement? {
+    override fun getDocumentationElementForLink(
+        psiManager: PsiManager,
+        link: String,
+        context: PsiElement?
+    ): PsiElement? {
         return LuaClassIndex.find(link, SearchContext.get(psiManager.project))
     }
 
@@ -67,28 +75,27 @@ class LuaDocumentationProvider : DocumentationProvider {
             is LuaDocTagClass -> renderClassDef(sb, element)
             is LuaClassMember -> renderClassMember(sb, element)
             is LuaNameDef -> { //local xx
-                sb.wrapLanguage("typescript") {
+                sb.wrapLanguage("lua") {
                     sb.append("local ${element.name}:")
                     val ty = element.guessType(SearchContext.get(element.project))
                     renderTy(sb, ty)
                     sb.append("\n")
+
                 }
 
                 val owner = PsiTreeUtil.getParentOfType(element, LuaCommentOwner::class.java)
                 owner?.let { renderComment(sb, owner.comment) }
             }
             is LuaLocalFuncDef -> {
-                sb.wrapLanguage("typescript") {
+                sb.wrapLanguage("lua") {
                     sb.append("local function ${element.name}")
                     val type = element.guessType(SearchContext.get(element.project)) as ITyFunction
                     renderSignature(sb, type.mainSignature)
                 }
                 renderComment(sb, element.comment)
             }
             is LuaPsiFile -> {
-                sb.wrapLanguage("typescript") {
-                    sb.append("module \"${element.virtualFile.path.substringAfter("file:/")}\"")
-                }
+                sb.append(element.virtualFile.path.substringAfter("file:/"))
             }
 
         }
@@ -104,10 +111,17 @@ class LuaDocumentationProvider : DocumentationProvider {
 
         //base info
         if (parentType != null) {
-            sb.wrapLanguage("typescript") {
+            sb.wrapLanguage("lua") {
                 when (ty) {
                     is TyFunction -> {
                         sb.append("function ")
+                        if(parentType.displayName != "_G") {
+                            renderTy(sb, parentType)
+                            sb.append(if (ty.isColonCall) ":" else ".")
+                        }
+                        sb.append(classMember.name)
+                        renderSignature(sb, ty.mainSignature)
+                        return@wrapLanguage
                     }
                     is TyClass -> {
                         sb.append("class ")
@@ -120,25 +134,14 @@ class LuaDocumentationProvider : DocumentationProvider {
                     }
                 }
                 renderTy(sb, parentType)
-                with(sb) {
-                    when (ty) {
-                        is TyFunction -> {
-                            append(if (ty.isColonCall) ":" else ".")
-                            append(classMember.name)
-                            renderSignature(sb, ty.mainSignature)
-                        }
-                        else -> {
-                            append(".${classMember.name}:")
-                            renderTy(sb, ty)
-                        }
-                    }
-                }
+                sb.append(".${classMember.name}:")
+                renderTy(sb, ty)
             }
         } else {
             //NameExpr
             if (classMember is LuaNameExpr) {
                 val nameExpr: LuaNameExpr = classMember
-                sb.wrapLanguage("typescript") {
+                sb.wrapLanguage("lua") {
                     sb.append("global ")
                     with(sb) {
                         append(nameExpr.name)

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists