初步支持emitter风格重载

CppCXY · CppCXY · commit b4fd8de6fd19 · 2022-04-28T20:39:53.000+08:00
diff --git a/EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/CompletionService.kt b/EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/CompletionService.kt
@@ -33,9 +33,9 @@ class CompletionResultSetImpl(private val consumer: Consumer<LookupElement>) : C
 
 object CompletionService {
     private val contributors = arrayOf(
-            LuaCompletionContributor(),
-            SmartCompletionContributor(),
-            LuaDocCompletionContributor()
+        LuaCompletionContributor(),
+        SmartCompletionContributor(),
+        LuaDocCompletionContributor()
     )
 
     fun collectCompletion(file: PsiFile, caret: Int, consumer: Consumer<LookupElement>) {
@@ -50,7 +50,10 @@ object CompletionService {
         context.startOffset = caret
         context.dummyIdentifier = CompletionInitializationContext.DUMMY_IDENTIFIER
         contributors.forEach { it.beforeCompletion(context) }
-        parameters.position = if (context.dummyIdentifier.isEmpty()) file.findElementAt(caret) ?: return else insertDummyIdentifier(context)
+        parameters.position =
+            if (context.dummyIdentifier.isEmpty()) file.findElementAt(caret) ?: return else insertDummyIdentifier(
+                context
+            )
 
         val text = file.text
         val result = CompletionResultSetImpl(consumer)
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
@@ -26,7 +26,6 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNamedElement
 import com.intellij.psi.tree.TokenSet
 import com.intellij.util.ProcessingContext
-import com.tang.intellij.lua.Constants
 import com.tang.intellij.lua.project.LuaSettings
 import com.tang.intellij.lua.psi.*
 
@@ -92,7 +91,7 @@ class LuaCompletionContributor : CompletionContributor() {
 
         extend(CompletionType.BASIC, SHOW_STRING_INNER, StringInnerTypeCompletionProvider())
 
-        extend(CompletionType.BASIC, SHOW_CONST_EXPR, ConstExprProvider())
+        extend(CompletionType.BASIC, SHOW_CONST_EXPR, EmitterOverloadProvider())
     }
 
     /*override fun fillCompletionVariants(parameters: CompletionParameters, result: CompletionResultSet) {
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
@@ -13,6 +13,7 @@ class LuaLookupElement(label: String) : LookupElement(label) {
     var insertText: String? = null
     var textEdit: TextEdit? = null
     var deprecated = false
+    var isOverloadConst = false
 }
 
 val LookupElement.asCompletionItem: CompletionItem get() {
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/editor/completion/EmitterOverloadProvider.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/editor/completion/EmitterOverloadProvider.kt
@@ -3,21 +3,18 @@ package com.tang.intellij.lua.editor.completion
 import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.codeInsight.completion.PrefixMatcher
 import com.intellij.codeInsight.lookup.LookupElement
-import com.intellij.openapi.progress.ProgressManager
-import com.intellij.openapi.project.Project
 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.LuaClassField
-import com.tang.intellij.lua.psi.LuaClassMember
 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 com.tang.lsp.toRange
 import org.eclipse.lsp4j.CompletionItemKind
+import org.eclipse.lsp4j.TextEdit
 
-class ConstExprProvider : LuaCompletionProvider() {
+class EmitterOverloadProvider : LuaCompletionProvider() {
     override fun addCompletions(session: CompletionSession) {
         val completionParameters = session.parameters
         val completionResultSet = session.resultSet
@@ -27,45 +24,55 @@ class ConstExprProvider : LuaCompletionProvider() {
 
         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) {
-                        ty.process(Processor { sig ->
-                            if (activeParameter < sig.params.size) {
-                                sig.params[activeParameter].let {
+            if (activeParameter == 0) {
+                val searchContext = SearchContext.get(callExpr.project)
+                callExpr.guessParentType(searchContext).let { parentType ->
+                    parentType.each { ty ->
+                        if (ty is ITyFunction) {
+                            ty.process(Processor { sig ->
+                                sig.params.firstOrNull()?.let {
                                     val paramType = it.ty
-//                                    if (paramType is TyClass) {
-//                                        val enumClass = LuaShortNamesManager.getInstance(searchContext.project)
-//                                            .findClass(paramType.className, searchContext)
-//                                        if (enumClass is LuaDocTagClass && enumClass.enum != null) {
-//                                            addEnum(paramType, searchContext, completionResultSet)
-//                                        }
-//                                    }
+                                    if (paramType is TyStringLiteral) {
+                                        addOverload(psi, paramType, sig, completionResultSet)
+                                    }
                                 }
-                            }
-                            true
-                        })
+                                true
+                            })
+                        }
                     }
                 }
             }
-
-
         }
     }
 
+    private fun addOverload(
+        psiElement: PsiElement,
+        tyStringLiteral: TyStringLiteral,
+        signature: IFunSignature,
+        completionResultSet: CompletionResultSet
+    ) {
+        val file = psiElement.containingFile.virtualFile
+        if(file is ILuaFile) {
+            val newText = "\"${tyStringLiteral.content}\""
+            val element = LuaLookupElement(newText)
+            if(psiElement.node.elementType == LuaTypes.STRING) {
+                element.textEdit = TextEdit(psiElement.textRange.toRange(file), newText)
+            }
+            element.isOverloadConst = true
+            element.kind = CompletionItemKind.Constant
+            completionResultSet.addElement(element)
+        }
+    }
 //    private fun addEnum(
 //        luaType: ITyClass,
 //        searchContext: SearchContext,
diff --git a/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/TyPrimitive.kt b/EmmyLua-Common/src/main/java/com/tang/intellij/lua/ty/TyPrimitive.kt
@@ -55,6 +55,10 @@ class TyPrimitiveClass(override val primitiveKind: TyPrimitiveKind,
             return this == other.base
         }
 
+        if(other is TyStringLiteral){
+            return true
+        }
+
         return this == other
     }
 
diff --git a/EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaLanguageServer.kt b/EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaLanguageServer.kt
@@ -80,7 +80,7 @@ class LuaLanguageServer : LanguageServer, LanguageClientAware {
         val capabilities = ServerCapabilities()
 
         val completionOptions = CompletionOptions()
-        completionOptions.triggerCharacters = listOf(".", ":", "@")
+        completionOptions.triggerCharacters = listOf(".", ":", "@", "(")
         completionOptions.resolveProvider = true
         capabilities.completionProvider = completionOptions
 
diff --git a/EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaTextDocumentService.kt b/EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaTextDocumentService.kt
@@ -13,6 +13,7 @@ import com.tang.intellij.lua.Constants
 import com.tang.intellij.lua.comment.psi.*
 import com.tang.intellij.lua.comment.psi.api.LuaComment
 import com.tang.intellij.lua.editor.completion.CompletionService
+import com.tang.intellij.lua.editor.completion.LuaLookupElement
 import com.tang.intellij.lua.editor.completion.asCompletionItem
 import com.tang.intellij.lua.project.LuaSettings
 import com.tang.intellij.lua.psi.*
@@ -536,19 +537,30 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
         }
     }
 
-    override fun completion(position: CompletionParams): CompletableFuture<Either<MutableList<CompletionItem>, CompletionList>> {
+    override fun completion(params: CompletionParams): CompletableFuture<Either<MutableList<CompletionItem>, CompletionList>> {
         return computeAsync { checker ->
             val list = CompletionList()
             list.items = mutableListOf()
-            val file = workspace.findFile(position.textDocument.uri)
+            val file = workspace.findFile(params.textDocument.uri)
             if (file is ILuaFile) {
-                val pos = file.getPosition(position.position.line, position.position.character)
+                val pos = file.getPosition(params.position.line, params.position.character)
                 val psi = file.psi
+                val trigger = params.context.triggerCharacter
                 if (psi != null) {
-                    CompletionService.collectCompletion(psi, pos, Consumer {
-                        checker.checkCanceled()
-                        list.items.add(it.asCompletionItem)
-                    })
+                    if(trigger == "("){
+                        CompletionService.collectCompletion(psi, pos, Consumer {
+                            checker.checkCanceled()
+                            if(it is LuaLookupElement && it.isOverloadConst) {
+                                list.items.add(it.asCompletionItem)
+                            }
+                        })
+                    }
+                    else {
+                        CompletionService.collectCompletion(psi, pos, Consumer {
+                            checker.checkCanceled()
+                            list.items.add(it.asCompletionItem)
+                        })
+                    }
                 }
             }
             Either.forRight<MutableList<CompletionItem>, CompletionList>(list)

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ class LuaLookupElement(label: String) : LookupElement(label) {`
`13`	`13`	`var insertText: String? = null`
`14`	`14`	`var textEdit: TextEdit? = null`
`15`	`15`	`var deprecated = false`
	`16`	`+ var isOverloadConst = false`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`val LookupElement.asCompletionItem: CompletionItem get() {`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,10 @@ class TyPrimitiveClass(override val primitiveKind: TyPrimitiveKind,`
`55`	`55`	`return this == other.base`
`56`	`56`	`}`
`57`	`57`
	`58`	`+ if(other is TyStringLiteral){`
	`59`	`+ return true`
	`60`	`+ }`
	`61`	`+`
`58`	`62`	`return this == other`
`59`	`63`	`}`
`60`	`64`