fix #1317

LuaLS · Jul 11, 2022 · 492ed7f · 492ed7f
1 parent db71c1e
commit 492ed7f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/changelog.md b/changelog.md
@@ -24,6 +24,7 @@
 * `FIX` [#1284](https://github.com/sumneko/lua-language-server/issues/1284)
 * `FIX` [#1292](https://github.com/sumneko/lua-language-server/issues/1292)
 * `FIX` [#1294](https://github.com/sumneko/lua-language-server/issues/1294)
+* `FIX` [#1317](https://github.com/sumneko/lua-language-server/issues/1317)
 
 ## 3.4.2
 `2022-7-6`

diff --git a/script/parser/compile.lua b/script/parser/compile.lua
@@ -12,11 +12,9 @@ local uchar      = utf8.char
 local tconcat    = table.concat
 local tinsert    = table.insert
 local tointeger  = math.tointeger
-local mtype      = math.type
 local tonumber   = tonumber
 local maxinteger = math.maxinteger
 local assert     = assert
-local next       = next
 
 _ENV = nil
 
@@ -2669,7 +2667,6 @@ local function parseVarTails(parser, isLocal)
     end
     if isLocal then
         createLocal(second, parseLocalAttrs())
-        second.effect = maxinteger
     end
     skipSpace()
     if Tokens[Index + 1] ~= ',' then
@@ -2684,7 +2681,6 @@ local function parseVarTails(parser, isLocal)
     end
     if isLocal then
         createLocal(third, parseLocalAttrs())
-        third.effect = maxinteger
     end
     local rest = { third }
     while true do
@@ -2701,15 +2697,13 @@ local function parseVarTails(parser, isLocal)
         end
         if isLocal then
             createLocal(name, parseLocalAttrs())
-            name.effect = maxinteger
         end
         rest[#rest+1] = name
     end
 end
 
 local function bindValue(n, v, index, lastValue, isLocal, isSet)
     if isLocal then
-        n.effect = lastRightPosition()
         if v and v.special then
             addSpecial(v.special, n)
         end
@@ -2755,9 +2749,6 @@ local function bindValue(n, v, index, lastValue, isLocal, isSet)
         n.value  = v
         n.range  = v.finish
         v.parent = n
-        if isLocal then
-            n.effect = lastRightPosition()
-        end
     end
 end
 
@@ -2777,13 +2768,15 @@ local function parseMultiVars(n1, parser, isLocal)
     local index = 1
     bindValue(n1, v1, index, nil, isLocal, isSet)
     local lastValue = v1
+    local lastVar   = n1
     if n2 then
         max = 2
         if not v2 then
             index = 2
         end
         bindValue(n2, v2, index, lastValue, isLocal, isSet)
         lastValue = v2 or lastValue
+        lastVar   = n2
         pushActionIntoCurrentChunk(n2)
     end
     if nrest then
@@ -2796,10 +2789,24 @@ local function parseMultiVars(n1, parser, isLocal)
             end
             bindValue(n, v, index, lastValue, isLocal, isSet)
             lastValue = v or lastValue
+            lastVar   = n
             pushActionIntoCurrentChunk(n)
         end
     end
 
+    if isLocal then
+        local effect = lastValue and lastValue.finish or lastVar.finish
+        n1.effect = effect
+        if n2 then
+            n2.effect = effect
+        end
+        if nrest then
+            for i = 1, #nrest do
+                nrest[i].effect = effect
+            end
+        end
+    end
+
     if v2 and not n2 then
         v2.redundant = {
             max    = max,
@@ -2921,11 +2928,6 @@ local function parseLocal()
     pushActionIntoCurrentChunk(loc)
     skipSpace()
     parseMultiVars(loc, parseName, true)
-    if loc.value then
-        loc.effect = loc.value.finish
-    else
-        loc.effect = loc.finish
-    end
 
     return loc
 end

diff --git a/test/diagnostics/common.lua b/test/diagnostics/common.lua
@@ -1658,6 +1658,12 @@ TEST [[
 ---@cast <!x!> integer
 ]]
 
+TEST [[
+---@diagnostic disable: unused-local
+local x, y
+---@cast y number
+]]
+
 TEST [[
 ---@class A