summaryrefslogtreecommitdiff
path: root/server/src/vm
diff options
context:
space:
mode:
authorsumneko <sumneko@hotmail.com>2019-04-29 19:55:55 +0800
committersumneko <sumneko@hotmail.com>2019-04-29 19:55:55 +0800
commit9a1b32c07764bfa441d184d97ae90d271bfb9012 (patch)
tree29ff59e5173eff977ae8f280dd13717c64acf707 /server/src/vm
parentf2444b757331ddf8df16a39a86b0ce8608338d77 (diff)
downloadlua-language-server-9a1b32c07764bfa441d184d97ae90d271bfb9012.zip
合并child时,每一项都要检查global
Diffstat (limited to 'server/src/vm')
-rw-r--r--server/src/vm/value.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/vm/value.lua b/server/src/vm/value.lua
index 29419966..efbe50c4 100644
--- a/server/src/vm/value.lua
+++ b/server/src/vm/value.lua
@@ -344,7 +344,6 @@ function mt:mergeValue(value)
if not value then
return
end
- local global = self._global or value._global
local list = {self, value}
local pos = 1
while true do
@@ -360,6 +359,7 @@ function mt:mergeValue(value)
a:flushChild()
b:flushChild()
+ local global = a._global or b._global
if b._child then
if not a._child then
a._child = {}