optimize highlight

CppCXY · Mar 4, 2024 · 5425169 · 5425169
1 parent a9afc0e
commit 5425169
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 111 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt b/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt
@@ -115,6 +115,34 @@ class LuaAnnotator : Annotator {
                 }
             }
         }
+
+        override fun visitCallExpr(o: LuaCallExpr) {
+            super.visitCallExpr(o)
+            val expr = o.expr
+            if (expr is LuaNameExpr) {
+                newInfoAnnotation(expr, null) {
+                    it.textAttributes(LuaHighlightingData.INSTANCE_METHOD)
+                }
+            }
+            else if(expr is LuaIndexExpr) {
+                val id = expr.id
+                if (id != null) {
+                    newInfoAnnotation(id, null) {
+                        it.textAttributes(LuaHighlightingData.INSTANCE_METHOD)
+                    }
+                }
+            }
+        }
+
+        override fun visitFuncDef(o: LuaFuncDef) {
+            super.visitFuncDef(o)
+            val id = o.id
+            if (id != null){
+                newInfoAnnotation(id, null) {
+                    it.textAttributes(LuaHighlightingData.GLOBAL_FUNCTION)
+                }
+            }
+        }
     }
 
     internal inner class LuaDocElementVisitor : LuaDocVisitor() {

diff --git a/src/main/java/com/tang/intellij/lua/editor/formatter/EmmyLuaCodeStyle.kt b/src/main/java/com/tang/intellij/lua/editor/formatter/EmmyLuaCodeStyle.kt
diff --git a/src/main/kotlin/com/cppcxy/ide/lsp/SumnekoLspServerDescriptor.kt b/src/main/kotlin/com/cppcxy/ide/lsp/SumnekoLspServerDescriptor.kt
@@ -6,21 +6,14 @@ import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.platform.lsp.api.*
-import com.intellij.platform.lsp.api.customization.LspCodeActionsSupport
-import com.intellij.platform.lsp.api.customization.LspCommandsSupport
 import com.intellij.platform.lsp.api.customization.LspCompletionSupport
 import com.intellij.platform.lsp.api.customization.LspFormattingSupport
-import com.intellij.platform.lsp.api.requests.LspClientNotification
 import com.tang.intellij.lua.lang.LuaFileType
 import com.tang.intellij.lua.lang.LuaIcons
-import com.tang.intellij.lua.lang.LuaLanguage
-import org.eclipse.lsp4j.Command
 import org.eclipse.lsp4j.CompletionItem
 import org.eclipse.lsp4j.CompletionItemKind
 import org.eclipse.lsp4j.InitializeParams
-import org.eclipse.lsp4j.services.LanguageServer
 import javax.swing.Icon
-import java.util.Locale
 
 
 class SumnekoLspServerDescriptor(project: Project) : ProjectWideLspServerDescriptor(project, "SumnekoLua") {
@@ -61,21 +54,6 @@ class SumnekoLspServerDescriptor(project: Project) : ProjectWideLspServerDescrip
         }
     }
 
-    override val lspCommandsSupport = object : LspCommandsSupport() {
-        override fun executeCommand(server: LspServer, contextFile: VirtualFile, command: Command) {
-            super.executeCommand(server, contextFile, command)
-        }
-    }
-
-//    override fun createLsp4jClient(handler: LspServerNotificationsHandler): Lsp4jClient {
-//        val client = super.createLsp4jClient(handler)
-//        return client
-//    }
-//
-//
-//    override val lsp4jServerClass: Class<out LanguageServer>
-//        get() = super.lsp4jServerClass
-
     override val lspFormattingSupport = object : LspFormattingSupport() {
         override fun shouldFormatThisFileExclusivelyByServer(
             file: VirtualFile,