优化代码补全的表现

CppCXY · CppCXY · commit 16890cfb56de · 2022-06-10T15:00:58.000+08:00
diff --git a/EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LookupElementFactory.kt b/EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LookupElementFactory.kt
@@ -4,6 +4,7 @@ package com.tang.intellij.lua.editor.completion
 
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.psi.tree.IElementType
+import com.tang.intellij.lua.lang.LuaIcons
 import com.tang.intellij.lua.psi.LuaClassField
 import com.tang.intellij.lua.psi.LuaClassMember
 import com.tang.intellij.lua.psi.LuaParamInfo
@@ -20,51 +21,68 @@ object LookupElementFactory {
 
     fun createGuessableLookupElement(name: String, psi: LuaPsiElement, ty: ITy, icon: Icon?): LookupElement {
         val element = LuaLookupElement(name)
-        element.kind = CompletionItemKind.Value
+        element.kind = when (icon) {
+            LuaIcons.LOCAL_VAR -> {
+                CompletionItemKind.Variable
+            }
+            LuaIcons.PARAMETER -> {
+                CompletionItemKind.TypeParameter
+            }
+            else -> {
+                CompletionItemKind.Value
+            }
+        }
+        element.additionDetailDescription = ty.displayName
         return element
     }
 
-    fun createFunctionLookupElement(name: String,
-                                    psi: LuaPsiElement,
-                                    signature: IFunSignature,
-                                    bold: Boolean,
-                                    ty: ITyFunction,
-                                    icon: Icon?): LookupElement {
+    fun createFunctionLookupElement(
+        name: String,
+        psi: LuaPsiElement,
+        signature: IFunSignature,
+        bold: Boolean,
+        ty: ITyFunction,
+        icon: Icon?
+    ): LookupElement {
         val item = buildSignatureCompletionItem(name, signature, false)
         item.kind = CompletionItemKind.Function
 
         return item
     }
 
-    fun createMethodLookupElement(clazzName: String,
-                                  lookupString: String,
-                                  classMember: LuaClassMember,
-                                  signature: IFunSignature,
-                                  bold: Boolean,
-                                  isColonStyle: Boolean,
-                                  fnTy: ITyFunction,
-                                  icon: Icon?): LuaLookupElement {
+    fun createMethodLookupElement(
+        clazzName: String,
+        lookupString: String,
+        classMember: LuaClassMember,
+        signature: IFunSignature,
+        bold: Boolean,
+        isColonStyle: Boolean,
+        fnTy: ITyFunction,
+        icon: Icon?
+    ): LuaLookupElement {
         val item = buildSignatureCompletionItem(lookupString, signature, isColonStyle)
         item.kind = CompletionItemKind.Method
         item.itemText = "[$clazzName]"
         val file = classMember.containingFile?.virtualFile as? ILuaFile
         if (file != null) {
             item.data = "${file.uri}|${classMember.textOffset}"
         }
-        if(classMember.isDeprecated){
+        if (classMember.isDeprecated) {
             item.deprecated = true
         }
 
         return item
     }
 
-    fun createShouldBeMethodLookupElement(clazzName: String,
-                                  lookupString: String,
-                                  classMember: LuaClassMember,
-                                  signature: IFunSignature,
-                                  bold: Boolean,
-                                  fnTy: ITyFunction,
-                                  icon: Icon?): LuaLookupElement {
+    fun createShouldBeMethodLookupElement(
+        clazzName: String,
+        lookupString: String,
+        classMember: LuaClassMember,
+        signature: IFunSignature,
+        bold: Boolean,
+        fnTy: ITyFunction,
+        icon: Icon?
+    ): LuaLookupElement {
         val item = buildSignatureCompletionItem(lookupString, signature, true)
         item.lookupString = ":${item.lookupString}"
         item.kind = CompletionItemKind.Method
@@ -73,32 +91,39 @@ object LookupElementFactory {
         if (file != null) {
             item.data = "${file.uri}|${classMember.textOffset}"
         }
-        if(classMember.isDeprecated){
+        if (classMember.isDeprecated) {
             item.deprecated = true
         }
 
         return item
     }
 
-    fun createFieldLookupElement(clazzName: String,
-                                 name: String,
-                                 field: LuaClassField,
-                                 ty: ITy?,
-                                 bold: Boolean): LuaLookupElement {
+    fun createFieldLookupElement(
+        clazzName: String,
+        name: String,
+        field: LuaClassField,
+        ty: ITy?,
+        bold: Boolean
+    ): LuaLookupElement {
         val element = LuaLookupElement(name)
         element.kind = CompletionItemKind.Field
+        element.additionDetailDescription = ty?.displayName
         val file = field.containingFile?.virtualFile as? ILuaFile
         if (file != null) {
             element.data = "${file.uri}|${field.textOffset}"
         }
-        if(field.isDeprecated){
+        if (field.isDeprecated) {
             element.deprecated = true
         }
 
         return element
     }
 
-    private fun buildSignatureCompletionItem(name: String, signature: IFunSignature, isColonStyle: Boolean): LuaLookupElement {
+    private fun buildSignatureCompletionItem(
+        name: String,
+        signature: IFunSignature,
+        isColonStyle: Boolean
+    ): LuaLookupElement {
         var pIndex = 0
         val params = mutableListOf<LuaParamInfo>()
         if (isColonStyle) { //a:b()
@@ -112,22 +137,22 @@ object LookupElementFactory {
         }
         params.addAll(signature.params)
 
-        val lookupString = buildString {
-            append(name)
+        val item = LuaLookupElement(name)
+        item.additionDetail = buildString {
             append("(")
             val strings = mutableListOf<String>()
             for (i in pIndex until params.size) {
                 val p = params[i]
                 strings.add(p.name)
             }
-            if(signature.hasVarargs()){
+            if (signature.hasVarargs()) {
                 strings.add("...")
             }
             append(strings.joinToString(","))
             append(")")
         }
+        item.additionDetailDescription = signature.returnTy.displayName
 
-        val item = LuaLookupElement(lookupString)
         if (pIndex >= params.size) {
             item.insertText = "$name()"
         } else {
diff --git a/EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LuaLookupElement.kt b/EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LuaLookupElement.kt
@@ -11,6 +11,7 @@ class LuaLookupElement(label: String) : LookupElement(label) {
     var textEdit: TextEdit? = null
     var deprecated = false
     var isEnumMember = false
+    var additionDetailDescription: String? = null
     var additionDetail: String? = null
 }
 
@@ -34,9 +35,10 @@ val LookupElement.asCompletionItem: CompletionItem
                 if (deprecated) {
                     completionItem.tags = listOf(CompletionItemTag.Deprecated)
                 }
-                if(additionDetail != null){
+                if(additionDetailDescription != null || additionDetail != null){
                     val labelDetail = CompletionItemLabelDetails()
-                    labelDetail.description = additionDetail
+                    labelDetail.description = additionDetailDescription
+                    labelDetail.detail = additionDetail
                     completionItem.labelDetails = labelDetail
                 }
 
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/editor/completion/ClassMemberCompletionProvider.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/editor/completion/ClassMemberCompletionProvider.kt
@@ -242,9 +242,10 @@ open class ClassMemberCompletionProvider : LuaCompletionProvider() {
         val name = classMember.name
         if (name != null) {
             fnTy.process(Processor {
+                val context = SearchContext.get(classMember.project)
                 val firstParam = it.getFirstParam(thisType, isColonStyle)
                 val firstParamIsSelf = if (firstParam != null) {
-                    callType.subTypeOf(firstParam.ty, SearchContext.get(classMember.project), true)
+                    callType.subTypeOf(firstParam.ty, context, true)
                 } else {
                     false
                 }
@@ -268,7 +269,13 @@ open class ClassMemberCompletionProvider : LuaCompletionProvider() {
                 val ele = handlerProcessor?.process(element, classMember, fnTy) ?: element
                 completionResultSet.addElement(ele)
                 // correction completion
-                if (!isColonStyle && firstParamIsSelf) {
+                if (!isColonStyle && firstParamIsSelf
+                    && callType != Ty.STRING
+                    // workaround now
+                    && callType is TyClass
+                    && callType !is TySerializedClass
+                    && callType !is TyTable
+                ) {
                     val colonElement = LookupElementFactory.createShouldBeMethodLookupElement(
                         clazzName,
                         lookupString,

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ class LuaLookupElement(label: String) : LookupElement(label) {`
`11`	`11`	`var textEdit: TextEdit? = null`
`12`	`12`	`var deprecated = false`
`13`	`13`	`var isEnumMember = false`
	`14`	`+ var additionDetailDescription: String? = null`
`14`	`15`	`var additionDetail: String? = null`
`15`	`16`	`}`
`16`	`17`
`@@ -34,9 +35,10 @@ val LookupElement.asCompletionItem: CompletionItem`
`34`	`35`	`if (deprecated) {`
`35`	`36`	`completionItem.tags = listOf(CompletionItemTag.Deprecated)`
`36`	`37`	`}`
`37`		`- if(additionDetail != null){`
	`38`	`+ if(additionDetailDescription != null \|\| additionDetail != null){`
`38`	`39`	`val labelDetail = CompletionItemLabelDetails()`
`39`		`- labelDetail.description = additionDetail`
	`40`	`+ labelDetail.description = additionDetailDescription`
	`41`	`+ labelDetail.detail = additionDetail`
`40`	`42`	`completionItem.labelDetails = labelDetail`
`41`	`43`	`}`
`42`	`44`