summaryrefslogtreecommitdiff
path: root/server/src/matcher
diff options
context:
space:
mode:
author最萌小汐 <sumneko@hotmail.com>2018-12-21 11:33:53 +0800
committer最萌小汐 <sumneko@hotmail.com>2018-12-21 11:33:53 +0800
commit8dbca0ef1c2c0970b5674b408344ad4d3b65d2d7 (patch)
tree5a4d69f5eb42ab2ff8acc0ccc73602d91f8d01ee /server/src/matcher
parent73f30b560a2bfe8c0fe3d3f50b581ffca306ed75 (diff)
downloadlua-language-server-8dbca0ef1c2c0970b5674b408344ad4d3b65d2d7.zip
修正value合并反了的问题
Diffstat (limited to 'server/src/matcher')
-rw-r--r--server/src/matcher/vm.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/matcher/vm.lua b/server/src/matcher/vm.lua
index fc66d6aa..a1c84c3c 100644
--- a/server/src/matcher/vm.lua
+++ b/server/src/matcher/vm.lua
@@ -243,7 +243,7 @@ function mt:mergeChild(a, b, mark)
b.child = nil
for k, v in pairs(other) do
if child[k] then
- self:mergeField(v, child[k], mark)
+ self:mergeField(child[k], v, mark)
else
child[k] = v
end