diff options
Diffstat (limited to 'server/src/vm')
| -rw-r--r-- | server/src/vm/global.lua | 10 | ||||
| -rw-r--r-- | server/src/vm/value.lua | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/server/src/vm/global.lua b/server/src/vm/global.lua index 4e368641..ba5da73a 100644 --- a/server/src/vm/global.lua +++ b/server/src/vm/global.lua @@ -6,11 +6,11 @@ return function (lsp) local global = lsp and lsp.globalValue if not global then global = createValue('table') - end - for name, lib in pairs(library.global) do - if not global:rawGet(name) then - local value = libraryBuilder.value(lib) - global:rawSet(name, value) + for name, lib in pairs(library.global) do + if not global:rawGet(name) then + local value = libraryBuilder.value(lib) + global:rawSet(name, value) + end end end if lsp then diff --git a/server/src/vm/value.lua b/server/src/vm/value.lua index 8124b484..a3aad7a6 100644 --- a/server/src/vm/value.lua +++ b/server/src/vm/value.lua @@ -235,6 +235,9 @@ function mt:mergeValue(value) if value._lib then self._lib = value._lib end + if value.uri then + self.uri = value.uri + end end function mt:addInfo(tp, source, ...) |