diff options
author | 最萌小汐 <sumneko@hotmail.com> | 2018-12-07 11:28:15 +0800 |
---|---|---|
committer | 最萌小汐 <sumneko@hotmail.com> | 2018-12-07 11:28:15 +0800 |
commit | 3ccf8b1b0e1048ee9056c610829d49679df6ac3b (patch) | |
tree | 773c10db34ca02a404fb67cd8a390e024f4cec56 /server/src/matcher | |
parent | 3eaa1ac1e6731f595f892e6b96dbfe4c5c42fc75 (diff) | |
download | lua-language-server-3ccf8b1b0e1048ee9056c610829d49679df6ac3b.zip |
支持重新赋值
Diffstat (limited to 'server/src/matcher')
-rw-r--r-- | server/src/matcher/compile.lua | 43 | ||||
-rw-r--r-- | server/src/matcher/find_lib.lua | 25 |
2 files changed, 45 insertions, 23 deletions
diff --git a/server/src/matcher/compile.lua b/server/src/matcher/compile.lua index a8cf623b..f2017af2 100644 --- a/server/src/matcher/compile.lua +++ b/server/src/matcher/compile.lua @@ -111,14 +111,26 @@ function mt:checkDots(source) self:addInfo(dots, 'get', source) end -function mt:searchCall(call, simple, i) +function mt:getApi(func) + if not func then + return nil + end + func = func.value or func + if func.type == 'field' and func.parent.key == '_ENV' then + return func.key + end + return nil +end + +function mt:searchCall(call, func) local results = {} for i, exp in ipairs(call) do results[i] = self:searchExp(exp) end - -- 特殊处理 setmetatable - if i == 2 and simple[1][1] == 'setmetatable' then + local api = self:getApi(func) + + if api == 'setmetatable' then local obj = results[1] local metatable = results[2] if metatable then @@ -147,7 +159,7 @@ function mt:searchSimple(simple) local obj = simple[i] local tp = obj.type if tp == 'call' then - var = self:searchCall(obj, simple, i) + var = self:searchCall(obj, var) elseif tp == ':' then elseif tp == 'name' then if obj.index then @@ -189,7 +201,7 @@ function mt:searchTable(exp) local key, value = obj[1], obj[2] local res = self:searchExp(value) local var = self:addField(tbl, key[1], key) - self:setTable(var, res) + self:setValue(var, res) self:addInfo(var, 'set', key) else self:searchExp(obj) @@ -228,12 +240,13 @@ function mt:searchReturn(action) end end -function mt:setTable(var, tbl) - if not var or not tbl then +function mt:setValue(var, value) + if not var or not value then return end - var.childs = tbl.childs - for _, child in pairs(tbl.childs) do + var.childs = value.childs + var.value = value.value or value + for _, child in pairs(value.childs) do child.parent = var end end @@ -257,7 +270,7 @@ function mt:markSimple(simple) local obj = simple[i] local tp = obj.type if tp == 'call' then - var = self:searchCall(obj, simple, i) + var = self:searchCall(obj, var) elseif tp == ':' then var = self:createLocal('self', simple[i-1], self:getVar(simple[i-1][1])) var.disableRename = true @@ -292,23 +305,23 @@ function mt:markSimple(simple) return var end -function mt:markSet(simple, tbl) +function mt:markSet(simple, value) if simple.type == 'name' then local var = self:getVar(simple[1], simple) self:addInfo(var, 'set', simple) - self:setTable(var, tbl) + self:setValue(var, value) else local var = self:markSimple(simple) - self:setTable(var, tbl) + self:setValue(var, value) end end -function mt:markLocal(name, tbl) +function mt:markLocal(name, value) if name.type == 'name' then local str = name[1] -- 创建一个局部变量 local var = self:createLocal(str, name) - self:setTable(var, tbl) + self:setValue(var, value) elseif name.type == '...' then local dots = self:createDots() self:addInfo(dots, 'local', name) diff --git a/server/src/matcher/find_lib.lua b/server/src/matcher/find_lib.lua index 6e9be2c9..e52d1673 100644 --- a/server/src/matcher/find_lib.lua +++ b/server/src/matcher/find_lib.lua @@ -99,18 +99,27 @@ local function getLibs() return Libs end -local function checkLib(var, lib) - return var.key +local function checkLibAsGlobal(var, name, lib) + -- 检查是否是全局变量 + local value = var.value or var + if value.type == 'field' and value.parent.key == '_ENV' then + if value.key == name then + return name + end + end +end + +local function checkLib(var, name, lib) + if not lib.source then + return checkLibAsGlobal(var, name) + end end local function findLib(var, libs) - local key = var.key for name, lib in pairs(libs) do - if name == key then - local fullkey = checkLib(var, lib) - if fullkey then - return lib, fullkey - end + local fullkey = checkLib(var, name, lib) + if fullkey then + return lib, fullkey end end return nil, nil |