check multilneTokenSupport

fix #1753
LuaLS · Mar 6, 2023 · 3c994c6 · 3c994c6
1 parent 0b1b3b6
commit 3c994c6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,10 @@
 # changelog
 
+## 3.6.14
+* `FIX` [#1753]
+
+[#1753]: https://github.com/LuaLS/lua-language-server/issues/1753
+
 ## 3.6.13
 `2023-3-2`
 * `FIX` setting: `Lua.addonManager.enable` should be `true` by default

diff --git a/script/client.lua b/script/client.lua
@@ -59,7 +59,7 @@ function m.getAbility(name)
         end
         current = current[parent]
         if not current then
-            return nil
+            return current
         end
         if nextPos > #name then
             break

diff --git a/script/core/semantic-tokens.lua b/script/core/semantic-tokens.lua
@@ -7,6 +7,7 @@ local guide          = require 'parser.guide'
 local converter      = require 'proto.converter'
 local config         = require 'config'
 local linkedTable    = require 'linked-table'
+local client         = require 'client'
 
 local Care = util.switch()
     : case 'getglobal'
@@ -794,7 +795,8 @@ local function solveMultilineAndOverlapping(state, results)
     for token in tokens:pairs() do
         local startPos = converter.packPosition(state, token.start)
         local endPos   = converter.packPosition(state, token.finish)
-        if endPos.line == startPos.line then
+        if endPos.line == startPos.line
+        or client.getAbility 'textDocument.semanticTokens.multilineTokenSupport' then
             new[#new+1] = {
                 start      = startPos,
                 finish     = endPos,