Merge pull request #37 from CppCXY/master

合并

Author: CppCXY

EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LookupElementFactory.kt

@@ -32,6 +32,7 @@ object LookupElementFactory {
                                     icon: Icon?): LookupElement {
         val item = buildSignatureCompletionItem(name, signature, false)
         item.kind = CompletionItemKind.Function
+
         return item
     }
 
@@ -50,6 +51,10 @@ object LookupElementFactory {
         if (file != null) {
             item.data = "${file.uri}|${classMember.textOffset}"
         }
+        if(classMember.isDeprecated){
+            item.deprecated = true
+        }
+
         return item
     }
 
@@ -64,6 +69,10 @@ object LookupElementFactory {
         if (file != null) {
             element.data = "${file.uri}|${field.textOffset}"
         }
+        if(field.isDeprecated){
+            element.deprecated = true
+        }
+
         return element
     }
 

EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LuaCompletionContributor.kt

@@ -89,6 +89,8 @@ class LuaCompletionContributor : CompletionContributor() {
         extend(CompletionType.BASIC, SHOW_ENUM, EnumCompletionProvider())
 
         extend(CompletionType.BASIC, SHOW_CALLBACK, CallbackCompletionProvider())
+
+        extend(CompletionType.BASIC, SHOW_STRING_INNER, StringInnerTypeCompletionProvider())
     }
 
     /*override fun fillCompletionVariants(parameters: CompletionParameters, result: CompletionResultSet) {
@@ -164,6 +166,13 @@ class LuaCompletionContributor : CompletionContributor() {
                     .withParent(psiElement(LuaArgs::class.java))
             )
 
+        private val SHOW_STRING_INNER = psiElement(LuaTypes.STRING)
+            .withParent(
+                psiElement(LuaTypes.LITERAL_EXPR).withParent(
+                    psiElement(LuaArgs::class.java)
+                )
+            )
+
         private val GOTO = psiElement(LuaTypes.ID).withParent(LuaGotoStat::class.java)
 
         private val IN_TABLE_FIELD = psiElement().andOr(

EmmyLua-Common/src/main/ext/com/tang/intellij/lua/editor/completion/LuaLookupElement.kt

@@ -3,13 +3,16 @@ package com.tang.intellij.lua.editor.completion
 import com.intellij.codeInsight.lookup.LookupElement
 import org.eclipse.lsp4j.CompletionItem
 import org.eclipse.lsp4j.CompletionItemKind
+import org.eclipse.lsp4j.CompletionItemTag
 import org.eclipse.lsp4j.TextEdit
+import org.eclipse.lsp4j.jsonrpc.messages.Either
 
 class LuaLookupElement(label: String) : LookupElement(label) {
     var kind = CompletionItemKind.Text
     var data:String? = null
     var insertText: String? = null
     var textEdit: TextEdit? = null
+    var deprecated = false
 }
 
 val LookupElement.asCompletionItem: CompletionItem get() {
@@ -19,7 +22,10 @@ val LookupElement.asCompletionItem: CompletionItem get() {
             completionItem.insertText = insertText
             completionItem.data = data
             completionItem.kind = kind
-            completionItem.textEdit = textEdit
+            completionItem.textEdit = Either.forLeft(textEdit)
+            if(deprecated){
+                completionItem.tags = listOf(CompletionItemTag.Deprecated)
+            }
             completionItem
         }
         else -> CompletionItem(lookupString)