Skip to content

Commit 0c5c502

Browse files
committed
fix #1857
1 parent ce0432a commit 0c5c502

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
* `FIX` [#1838]
77
* `FIX` [#1841]
88
* `FIX` [#1851]
9+
* `FIX` [#1857]
910

1011
[#1831]: https://github.com/sumneko/lua-language-server/issues/1831
1112
[#1838]: https://github.com/sumneko/lua-language-server/issues/1838
1213
[#1841]: https://github.com/sumneko/lua-language-server/issues/1841
1314
[#1851]: https://github.com/sumneko/lua-language-server/issues/1851
15+
[#1857]: https://github.com/sumneko/lua-language-server/issues/1857
1416

1517
## 3.6.7
1618
`2023-1-20`

script/vm/compiler.lua

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1752,16 +1752,14 @@ local compilerSwitch = util.switch()
17521752
vm.setNode(source, global)
17531753
if global.cate == 'variable' then
17541754
for luri, link in pairs(global.links) do
1755-
if luri ~= uri then
1756-
local firstSet = link.sets[1]
1757-
if firstSet then
1758-
local setNode = vm.compileNode(firstSet)
1759-
vm.setNode(source, setNode)
1760-
if vm.isMetaFile(luri) then
1761-
for i = 2, #link.sets do
1762-
setNode = vm.compileNode(link.sets[i])
1763-
vm.setNode(source, setNode)
1764-
end
1755+
local firstSet = link.sets[1]
1756+
if firstSet then
1757+
local setNode = vm.compileNode(firstSet)
1758+
vm.setNode(source, setNode)
1759+
if vm.isMetaFile(luri) then
1760+
for i = 2, #link.sets do
1761+
setNode = vm.compileNode(link.sets[i])
1762+
vm.setNode(source, setNode)
17651763
end
17661764
end
17671765
end

test/type_inference/init.lua

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4199,3 +4199,12 @@ x.y = nil
41994199
42004200
print(<?y?>)
42014201
]]
4202+
4203+
TEST 'function' [[
4204+
function X()
4205+
<?Y?>()
4206+
end
4207+
4208+
function Y()
4209+
end
4210+
]]

0 commit comments

Comments
 (0)