试图支持扩展API

Author: CppCXY

EmmyLua-Common/src/main/gen/com/tang/intellij/lua/comment/lexer/_LuaDocLexer.java

@@ -89,7 +89,7 @@
 
 doc ::= (DASHES after_dash?)*
 
-private after_dash ::= doc_item | STRING { recoverWhile=after_dash_recover }
+private after_dash ::= doc_item | doc_field_item | STRING { recoverWhile=after_dash_recover }
 private after_dash_recover ::= !(DASHES)
 private doc_item ::= '@' (tag_param
     | tag_alias
@@ -108,6 +108,7 @@ private doc_item ::= '@' (tag_param
     | tag_def
     | tag_other
     )
+private doc_field_item ::= '|' id_field
 
 ty ::= union_ty | function_ty | table_ty | generic_ty | arr_ty | general_ty | par_ty | string_literal_ty {
     implements = ['com.tang.intellij.lua.comment.psi.LuaDocType']
@@ -210,6 +211,16 @@ tag_field ::= TAG_NAME_FIELD access_modifier? ((('<' class_name_ref '>')? ID nul
     ]
 }
 
+id_field ::= ID comment_string? {
+    implements = [
+        "com.tang.intellij.lua.comment.psi.LuaDocPsiElement"
+        "com.tang.intellij.lua.psi.LuaClassField"
+        "com.intellij.psi.PsiNameIdentifierOwner"
+    ]
+
+
+}
+
 //--- tag
 tag_def ::= TAG_NAME_NAME comment_string? {
     pin = 1

EmmyLua-Common/src/main/gen/com/tang/intellij/lua/comment/parser/LuaDocParser.java

@@ -48,6 +48,7 @@ STRING=[^\r\n\t\f]*
 ID=[:jletter:] ([:jletterdigit:]|\.)*
 NUM=[0-9]+
 AT=@
+SIMPLE_FIELD=\|
 //三个-以上
 DOC_DASHES = --+
 //Strings
@@ -72,14 +73,14 @@ SINGLE_QUOTED_STRING='([^\\\']|\\\S|\\[\r\n])*'?    //'([^\\'\r\n]|\\[^\r\n])*'?
 %state xSUPPRESS
 %state xDOUBLE_QUOTED_STRING
 %state xSINGLE_QUOTED_STRING
-
 %%
 
 <YYINITIAL> {
     {EOL}                      { yybegin(YYINITIAL); return com.intellij.psi.TokenType.WHITE_SPACE;}
     {LINE_WS}+                 { return com.intellij.psi.TokenType.WHITE_SPACE; }
     {DOC_DASHES}               { return DASHES; }
     "@"                        { yybegin(xTAG_NAME); return AT; }
+    "|"                        { yybegin(xTAG_WITH_ID); return OR; }
     .                          { yybegin(xCOMMENT_STRING); yypushback(yylength()); }
 }
 

EmmyLua-Common/src/main/gen/com/tang/intellij/lua/comment/psi/LuaDocIdField.java

@@ -117,6 +117,8 @@ class LuaLanguageServer : LanguageServer, LanguageClientAware {
 //            ),
 //            true
 //        )
+//        capabilities.colorProvider = Either.forLeft(true)
+
         res.capabilities = capabilities
         return CompletableFuture.completedFuture(res)
     }

EmmyLua-Common/src/main/gen/com/tang/intellij/lua/comment/psi/LuaDocTypes.java

@@ -23,7 +23,11 @@ import com.tang.lsp.getRangeInFile
 import com.tang.lsp.nameRange
 import com.tang.lsp.toRange
 import com.tang.vscode.api.impl.LuaFile
+//import com.tang.vscode.color.ColorService
 import com.tang.vscode.documentation.LuaDocumentationProvider
+import com.tang.vscode.extendApi.ExtendApiService
+import com.tang.vscode.extendApi.LuaApiClass
+import com.tang.vscode.extendApi.LuaReportApiParams
 import com.tang.vscode.formatter.FormattingFormatter
 import com.tang.vscode.formatter.FormattingType
 import com.tang.vscode.inlayHint.InlayHintService
@@ -62,6 +66,15 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
         }
     }
 
+    @Suppress("unused")
+    @JsonRequest("emmy/reportAPI")
+    fun reportAPI(params: LuaReportApiParams): CompletableFuture<Boolean> {
+        return computeAsync { checker->
+            ExtendApiService.loadApi(params)
+            true
+        }
+    }
+
     private fun findAnnotators(file: ILuaFile): List<Annotator> {
         val params = mutableListOf<TextRange>()
         val globals = mutableListOf<TextRange>()
@@ -237,32 +250,45 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
         }
     }
 
-    override fun documentHighlight(params: DocumentHighlightParams?): CompletableFuture<MutableList<out DocumentHighlight>?> {
+    override fun documentHighlight(params: DocumentHighlightParams): CompletableFuture<MutableList<out DocumentHighlight>?> {
         return computeAsync {
             val list = mutableListOf<DocumentHighlight>()
-            if (params != null) {
-                withPsiFile(params.textDocument, params.position) { file, psiFile, i ->
-                    val target = TargetElementUtil.findTarget(psiFile, i)
-                    if (target != null) {
-                        val def = target.reference?.resolve() ?: target
 
-                        // self highlight
-                        if (def.containingFile == psiFile) {
-                            def.nameRange?.let { range -> list.add(DocumentHighlight(range.toRange(file))) }
-                        }
+            withPsiFile(params.textDocument, params.position) { file, psiFile, i ->
+                val target = TargetElementUtil.findTarget(psiFile, i)
+                if (target != null) {
+                    val def = target.reference?.resolve() ?: target
 
-                        // references highlight
-                        val search = ReferencesSearch.search(def, GlobalSearchScope.fileScope(psiFile))
-                        search.forEach { reference ->
-                            list.add(DocumentHighlight(reference.getRangeInFile(file)))
-                        }
+                    // self highlight
+                    if (def.containingFile == psiFile) {
+                        def.nameRange?.let { range -> list.add(DocumentHighlight(range.toRange(file))) }
+                    }
+
+                    // references highlight
+                    val search = ReferencesSearch.search(def, GlobalSearchScope.fileScope(psiFile))
+                    search.forEach { reference ->
+                        list.add(DocumentHighlight(reference.getRangeInFile(file)))
                     }
                 }
             }
+
             list
         }
     }
 
+//    override fun documentColor(params: DocumentColorParams): CompletableFuture<MutableList<ColorInformation>> {
+//        return computeAsync { checker ->
+//            val file = workspace.findFile(params.textDocument.uri)
+//            val list = mutableListOf<ColorInformation>()
+//            if (file is ILuaFile) {
+//                file.lock {
+//                    list.addAll(ColorService.renderColor(file, checker))
+//                }
+//            }
+//            list
+//        }
+//    }
+
     override fun definition(params: DefinitionParams?): CompletableFuture<Either<MutableList<out Location>, MutableList<out LocationLink>>?> {
         return computeAsync {
             val list = mutableListOf<Location>()
@@ -371,7 +397,7 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
                     val uri = refFile.uri.toString()
                     val list = map.getOrPut(uri) { mutableListOf() }
                     val range = reference.getRangeInFile(refFile);
-                    if(range != refRange) {
+                    if (range != refRange) {
                         list.add(TextEdit(range, params.newName))
                     }
                 }
@@ -418,6 +444,10 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
         }
     }
 
+//    override fun colorPresentation(params: ColorPresentationParams): CompletableFuture<MutableList<ColorPresentation>> {
+//        return super.colorPresentation(params)
+//    }
+
     override fun documentSymbol(params: DocumentSymbolParams): CompletableFuture<List<Either<SymbolInformation, DocumentSymbol>>> {
         return computeAsync {
             val list = mutableListOf<Either<SymbolInformation, DocumentSymbol>>()
@@ -524,6 +554,7 @@ class LuaTextDocumentService(private val workspace: LuaWorkspaceService) : TextD
         workspace.removeFileIfNeeded(params.textDocument.uri)
     }
 
+    // @deprecated please use emmyluaCodeStyle plugin
     override fun formatting(params: DocumentFormattingParams?): CompletableFuture<MutableList<out TextEdit>> {
         return computeAsync {
             val list = mutableListOf<TextEdit>()