summaryrefslogtreecommitdiff
path: root/server/src
diff options
context:
space:
mode:
authorsumneko <sumneko@hotmail.com>2019-04-20 10:58:47 +0800
committersumneko <sumneko@hotmail.com>2019-04-20 10:58:47 +0800
commit05586ecd48300bbc4b8fb7f5a8e85a628eefda8e (patch)
tree5dd37c929eeb8690096d861b6511628f7d07b810 /server/src
parent6700b36b52ffc9878b0d02cae2568fbc6716705e (diff)
downloadlua-language-server-05586ecd48300bbc4b8fb7f5a8e85a628eefda8e.zip
暂时屏蔽emmy
Diffstat (limited to 'server/src')
-rw-r--r--server/src/parser/ast.lua2
-rw-r--r--server/src/vm/vm.lua1
2 files changed, 2 insertions, 1 deletions
diff --git a/server/src/parser/ast.lua b/server/src/parser/ast.lua
index 136d7565..55364ca9 100644
--- a/server/src/parser/ast.lua
+++ b/server/src/parser/ast.lua
@@ -1517,7 +1517,7 @@ return function (self, lua, mode, version)
Label = {{}},
Version = version,
}
- local suc, res, err = pcall(self.grammar, lua, mode, Defs)
+ local suc, res, err = xpcall(self.grammar, debug.traceback, lua, mode, Defs)
if not suc then
return nil, res
end
diff --git a/server/src/vm/vm.lua b/server/src/vm/vm.lua
index 57301ed5..9ca661bd 100644
--- a/server/src/vm/vm.lua
+++ b/server/src/vm/vm.lua
@@ -58,6 +58,7 @@ function mt:buildTable(source)
tbl:setChild(key[1], value, key)
end
end
+ elseif obj.type:sub(1, 4) == 'emmy' then
else
local value = self:getExp(obj)
if value.type == 'multi' then