Merge pull request #936 from kevinhwang91/limit-semantictoken-range

fix(semantic-tokens): limit comments range
LuaLS · Feb 1, 2022 · 1608bef · 1608bef
2 parents e9c319a + 5e63a4d
commit 1608bef
Showing 1 changed file with 23 additions and 21 deletions.
diff --git a/script/core/semantic-tokens.lua b/script/core/semantic-tokens.lua
@@ -815,34 +815,36 @@ return function (uri, start, finish)
     end)
 
     for _, comm in ipairs(state.comms) do
-        if comm.type == 'comment.short' then
-            local head = comm.text:sub(1, 2)
-            if head == '-@'
-            or head == '-|' then
-                results[#results+1] = {
-                    start  = comm.start,
-                    finish = comm.start + 3,
-                    type   = define.TokenTypes.comment,
-                }
-                results[#results+1] = {
-                    start      = comm.start + 3,
-                    finish     = comm.start + 2 +  #comm.text:match '%S+',
-                    type       = define.TokenTypes.comment,
-                    modifieres = define.TokenModifiers.documentation,
-                }
+        if start <= comm.start and comm.finish <= finish then
+            if comm.type == 'comment.short' then
+                local head = comm.text:sub(1, 2)
+                if head == '-@'
+                or head == '-|' then
+                    results[#results+1] = {
+                        start  = comm.start,
+                        finish = comm.start + 3,
+                        type   = define.TokenTypes.comment,
+                    }
+                    results[#results+1] = {
+                        start      = comm.start + 3,
+                        finish     = comm.start + 2 +  #comm.text:match '%S+',
+                        type       = define.TokenTypes.comment,
+                        modifieres = define.TokenModifiers.documentation,
+                    }
+                else
+                    results[#results+1] = {
+                        start  = comm.start,
+                        finish = comm.finish,
+                        type   = define.TokenTypes.comment,
+                    }
+                end
             else
                 results[#results+1] = {
                     start  = comm.start,
                     finish = comm.finish,
                     type   = define.TokenTypes.comment,
                 }
             end
-        else
-            results[#results+1] = {
-                start  = comm.start,
-                finish = comm.finish,
-                type   = define.TokenTypes.comment,
-            }
         end
     end