summaryrefslogtreecommitdiff
path: root/server/src/vm/value.lua
diff options
context:
space:
mode:
authorsumneko <sumneko@hotmail.com>2019-04-24 21:16:16 +0800
committersumneko <sumneko@hotmail.com>2019-04-24 21:16:16 +0800
commit669e20ef2cdfa8d7763f7e7bcd405986e665e526 (patch)
tree391a0ec38ffc144de1538590e3e190349f9f5582 /server/src/vm/value.lua
parent6daad9f42b8c3003a538a0667e5242536aa95eac (diff)
downloadlua-language-server-669e20ef2cdfa8d7763f7e7bcd405986e665e526.zip
更新emmyParam
Diffstat (limited to 'server/src/vm/value.lua')
-rw-r--r--server/src/vm/value.lua7
1 files changed, 7 insertions, 0 deletions
diff --git a/server/src/vm/value.lua b/server/src/vm/value.lua
index 8a0b0861..9f9b6b7c 100644
--- a/server/src/vm/value.lua
+++ b/server/src/vm/value.lua
@@ -289,6 +289,13 @@ function mt:mergeType(value)
if not value then
return
end
+ if self._emmy and not value._emmy then
+ value._emmy = self._emmy
+ return
+ elseif not self._emmy and value._emmy then
+ self._emmy = value._emmy
+ return
+ end
if value._type then
for tp, rate in pairs(value._type) do
self:setType(tp, rate)