优化inlay hint

Author: CppCXY

EmmyLua-LS/src/main/kotlin/com/tang/vscode/LuaLanguageServer.kt

@@ -139,4 +139,7 @@ class LuaLanguageServer : LanguageServer, LanguageClientAware {
 
         this.client = luaClient
     }
+
+    override fun setTrace(params: SetTraceParams) {
+    }
 }

EmmyLua-LS/src/main/kotlin/com/tang/vscode/api/impl/LuaFile.kt

@@ -24,10 +24,7 @@ import com.tang.intellij.lua.ty.hasVarargs
 import com.tang.lsp.*
 import com.tang.vscode.RenderRange
 import com.tang.vscode.diagnostics.DiagnosticsService
-import org.eclipse.lsp4j.Diagnostic
-import org.eclipse.lsp4j.DidChangeTextDocumentParams
-import org.eclipse.lsp4j.InlayHint
-import org.eclipse.lsp4j.InlayHintKind
+import org.eclipse.lsp4j.*
 import org.eclipse.lsp4j.jsonrpc.CancelChecker
 import org.eclipse.lsp4j.jsonrpc.messages.Either
 import java.util.concurrent.locks.ReentrantReadWriteLock
@@ -259,7 +256,25 @@ class LuaFile(override val uri: FileURI) : VirtualFileBase(uri), ILuaFile, Virtu
                                         var fchild = funcBody.firstChild
                                         while (fchild != funcBody.lastChild) {
                                             if (fchild.text == ")") {
-                                                overrideHints.add(RenderRange(fchild.textRange.toRange(file), null))
+//                                                var location: Location? = null
+//                                                val resolve = member.reference?.resolve()
+//                                                if (resolve != null) {
+//                                                    val sourceFile = resolve.containingFile?.virtualFile as? LuaFile
+//                                                    val range = resolve.nameRange
+//                                                    if (range != null && sourceFile != null)
+//                                                        location = Location(
+//                                                            sourceFile.uri.toString(),
+//                                                            range.toRange(sourceFile)
+//                                                        )
+//
+//                                                }
+                                                overrideHints.add(
+                                                    RenderRange(
+                                                        fchild.textRange.toRange(file),
+                                                        " override "
+                                                    )
+                                                )
+
                                                 return@processSuperClass true
                                             }
 
@@ -383,12 +398,24 @@ class LuaFile(override val uri: FileURI) : VirtualFileBase(uri), ILuaFile, Virtu
             for (localHint in localHints) {
                 val hint = InlayHint(localHint.range.end, Either.forLeft(":${localHint.hint}"))
                 hint.kind = InlayHintKind.Type
+                hint.paddingLeft = true
                 inlayHints.add(hint)
             }
         }
         if (overrideHints.isNotEmpty()) {
             for (overrideHint in overrideHints) {
-                inlayHints.add(InlayHint(overrideHint.range.end, Either.forLeft(" override ")))
+                if(overrideHint.location == null) {
+                    val hint = InlayHint(overrideHint.range.end, Either.forLeft(overrideHint.hint))
+                    hint.paddingLeft = true
+                    inlayHints.add(hint)
+                }
+                else{
+                    val hintPart = InlayHintLabelPart(overrideHint.hint)
+                    hintPart.location = overrideHint.location
+                    val hint = InlayHint(overrideHint.range.end, Either.forRight(listOf(hintPart)))
+                    hint.paddingLeft = true
+                    inlayHints.add(hint)
+                }
             }
         }
         return inlayHints

EmmyLua-LS/src/main/kotlin/com/tang/vscode/rpc.kt

@@ -3,6 +3,7 @@ package com.tang.vscode
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.tang.lsp.FileURI
+import org.eclipse.lsp4j.Location
 import org.eclipse.lsp4j.Range
 
 enum class AnnotatorType {
@@ -18,7 +19,7 @@ enum class AnnotatorType {
 
 data class AnnotatorParams(val uri: String)
 
-data class RenderRange(val range: Range, var hint: String?)
+data class RenderRange(val range: Range, var hint: String?, val location: Location? = null)
 
 data class Annotator(val uri: String, val ranges: List<RenderRange>, val type: AnnotatorType)