Merge pull request #1009 from kevinhwang91/fix-semantic-priority

fix(semantic-tokens): coreect token type priority
LuaLS · Apr 2, 2022 · 01f8679 · 01f8679
2 parents 499cd3a + b207c28
commit 01f8679
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/script/core/semantic-tokens.lua b/script/core/semantic-tokens.lua
@@ -161,17 +161,7 @@ local Care = util.switch()
             }
             return
         end
-        -- 5. References to other functions
-        if infer.hasType(loc, 'function') then
-            results[#results+1] = {
-                start      = source.start,
-                finish     = source.finish,
-                type       = define.TokenTypes['function'],
-                modifieres = source.type == 'setlocal' and define.TokenModifiers.declaration or nil,
-            }
-            return
-        end
-        -- 6. Class declaration
+        -- 5. Class declaration
             -- only search this local
         if loc.bindDocs then
             for i, doc in ipairs(loc.bindDocs) do
@@ -189,7 +179,17 @@ local Care = util.switch()
                 end
             end
         end
-        -- 6. const 变量 | Const variable
+        -- 6. References to other functions
+        if infer.hasType(loc, 'function') then
+            results[#results+1] = {
+                start      = source.start,
+                finish     = source.finish,
+                type       = define.TokenTypes['function'],
+                modifieres = source.type == 'setlocal' and define.TokenModifiers.declaration or nil,
+            }
+            return
+        end
+        -- 7. const 变量 | Const variable
         if loc.attrs then
             for _, attr in ipairs(loc.attrs) do
                 local name = attr[1]