diff options
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/core/diagnostics.lua | 18 | ||||
| -rw-r--r-- | server/src/vm/function.lua | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/server/src/core/diagnostics.lua b/server/src/core/diagnostics.lua index 8d668f04..0732b7e3 100644 --- a/server/src/core/diagnostics.lua +++ b/server/src/core/diagnostics.lua @@ -256,23 +256,23 @@ function mt:searchLowercaseGlobal(callback) for name in pairs(library.global) do definedGlobal[name] = true end - local uri = self.vm.uri - local envValue = self.vm.env:getValue() - envValue:eachInfo(function (info, src) - if info.type == 'set child' and src.uri == uri then - local name = info[1] + self.vm:eachSource(function (source) + if source.type == 'name' + and source:get 'parent' + and not source:get 'simple' + and not source:get 'table index' + and source:action() == 'set' + then + local name = source[1] if definedGlobal[name] then return end - if type(name) ~= 'string' then - return - end local first = name:match '%w' if not first then return end if first:match '%l' then - callback(src.start, src.finish) + callback(source.start, source.finish) end end end) diff --git a/server/src/vm/function.lua b/server/src/vm/function.lua index 20a5c75b..7df9c3ea 100644 --- a/server/src/vm/function.lua +++ b/server/src/vm/function.lua @@ -151,9 +151,9 @@ function mt:setReturn(index, value) end if value then self.returns[index] = value - end - if self._global then - value:markGlobal() + if self._global then + value:markGlobal() + end end end |