diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f746d7b..5f157be 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6ea52885-23ce-41b2-b06e-66a953a5c5ae" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/tang/intellij/lua/editor/formatter/EmmyLuaCodeStyle.kt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/com/cppcxy/ide/lsp/SumnekoLspServerDescriptor.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/com/cppcxy/ide/lsp/SumnekoLspServerDescriptor.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt b/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.kt
index 407b15a..fe0e9aa 100644
--- 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
deleted file mode 100644
index baac020..0000000
--- a/src/main/java/com/tang/intellij/lua/editor/formatter/EmmyLuaCodeStyle.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-//package com.tang.intellij.lua.editor.formatter
-//
-////import com.cppcxy.intellij.lua.psi.LuaFileUtil.getPluginVirtualFile
-////import com.cppcxy.intellij.lua.psi.LuaPsiFile
-//import com.intellij.configurationStore.NOTIFICATION_GROUP_ID
-//import com.intellij.execution.ExecutionException
-//import com.intellij.formatting.service.AsyncDocumentFormattingService
-//import com.intellij.formatting.service.AsyncFormattingRequest
-//import com.intellij.formatting.service.FormattingService
-//import com.intellij.lang.LanguageFormatting
-//import com.intellij.psi.PsiFile
-//import org.wso2.lsp4intellij.IntellijLanguageClient
-//import org.wso2.lsp4intellij.requests.ReformatAccept
-//import org.wso2.lsp4intellij.requests.ReformatHandler
-//import org.wso2.lsp4intellij.utils.FileUtils
-//import java.util.*
-//
-//
-//class EmmyLuaCodeStyle : AsyncDocumentFormattingService() {
-//
-//    private val FEATURES: MutableSet<FormattingService.Feature> = mutableSetOf(
-//        FormattingService.Feature.FORMAT_FRAGMENTS
-//    )
-//
-//    override fun getFeatures(): MutableSet<FormattingService.Feature> {
-//        return FEATURES
-//    }
-//
-//    override fun canFormat(file: PsiFile): Boolean {
-//        return LanguageFormatting.INSTANCE.allForLanguage(file.language).isEmpty()
-//                && IntellijLanguageClient.isExtensionSupported(file.virtualFile)
-//    }
-//
-//    override fun createFormattingTask(request: AsyncFormattingRequest): FormattingTask? {
-//        try {
-//            return object : FormattingTask {
-//                override fun run() {
-//                    val uri = FileUtils.VFSToURI(request.context.virtualFile)
-//                    val range = request.formattingRanges.first();
-//                    if (range.startOffset == 0) {
-//                        ReformatHandler.reformatFile(uri, object : ReformatAccept {
-//                            override fun Accept(s: String?) {
-//                                request.onTextReady(s!!);
-//                            }
-//
-//                            override fun Reject() {
-//                                request.onError("formatting error", "syntax error")
-//                            }
-//                        })
-//                    } else {
-//                        ReformatHandler.reformatSelection(uri, object : ReformatAccept {
-//                            override fun Accept(s: String?) {
-//                                request.onTextReady(s!!);
-//                            }
-//
-//                            override fun Reject() {
-//                                request.onError("formatting error", "syntax error")
-//                            }
-//                        })
-//                    }
-//                }
-//
-//                override fun cancel(): Boolean {
-////                    handler.destroyProcess()
-//                    return true
-//                }
-//
-//                override fun isRunUnderProgress(): Boolean {
-//                    return true
-//                }
-//            }
-//
-//        } catch (e: ExecutionException) {
-//            e.message?.let { request.onError("EmmyLuaCodeStyle", it) };
-//            return null;
-//        }
-//
-//    }
-//
-//    override fun getNotificationGroupId(): String {
-//        return NOTIFICATION_GROUP_ID
-//    }
-//
-//    override fun getName(): String {
-//        return "formatting"
-//    }
-//}
\ No newline at end of file
diff --git a/src/main/kotlin/com/cppcxy/ide/lsp/SumnekoLspServerDescriptor.kt b/src/main/kotlin/com/cppcxy/ide/lsp/SumnekoLspServerDescriptor.kt
index 0725360..5dc3e5b 100644
--- 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,