cleanup

Author: sumneko

script/core/completion/completion.lua

@@ -18,7 +18,6 @@ local lookBackward = require 'core.look-backward'
 local guide        = require 'parser.guide'
 local await        = require 'await'
 local postfix      = require 'core.completion.postfix'
-local globalMgr    = require 'vm.global-manager'
 
 local diagnosticModes = {
     'disable-next-line',
@@ -351,7 +350,7 @@ local function checkModule(state, word, position, results)
         local fileName = path:match '[^/\\]*$'
         local stemName = fileName:gsub('%..+', '')
         if  not locals[stemName]
-        and not globalMgr.hasGlobalSets(state.uri, 'variable', stemName)
+        and not vm.hasGlobalSets(state.uri, 'variable', stemName)
         and not config.get(state.uri, 'Lua.diagnostics.globals')[stemName]
         and stemName:match '^[%a_][%w_]*$'
         and matchKey(word, stemName) then
@@ -601,14 +600,14 @@ end
 ---@async
 local function checkGlobal(state, word, startPos, position, parent, oop, results)
     local locals = guide.getVisibleLocals(state.ast, position)
-    local globals = globalMgr.getGlobalSets(state.uri, 'variable')
+    local globals = vm.getGlobalSets(state.uri, 'variable')
     checkFieldOfRefs(globals, state, word, startPos, position, parent, oop, results, locals, 'global')
 end
 
 ---@async
 local function checkField(state, word, start, position, parent, oop, results)
     if parent.tag == '_ENV' or parent.special == '_G' then
-        local globals = globalMgr.getGlobalSets(state.uri, 'variable')
+        local globals = vm.getGlobalSets(state.uri, 'variable')
         checkFieldOfRefs(globals, state, word, start, position, parent, oop, results)
     else
         local refs = vm.getFields(parent)

script/core/diagnostics/lowercase-global.lua

@@ -3,7 +3,6 @@ local guide     = require 'parser.guide'
 local lang      = require 'language'
 local config    = require 'config'
 local vm        = require 'vm'
-local globalMgr = require 'vm.global-manager'
 
 local function isDocClass(source)
     if not source.bindDocs then
@@ -47,7 +46,7 @@ return function (uri, callback)
         end
         if definedGlobal[name] == nil then
             definedGlobal[name] = false
-            local global = globalMgr.getGlobal('variable', name)
+            local global = vm.getGlobal('variable', name)
             if global then
                 for _, set in ipairs(global:getSets(uri)) do
                     if vm.isMetaFile(guide.getUri(set)) then

script/core/diagnostics/undefined-global.lua

@@ -4,7 +4,6 @@ local lang      = require 'language'
 local config    = require 'config'
 local guide     = require 'parser.guide'
 local await     = require 'await'
-local globalMgr = require 'vm.global-manager'
 
 local requireLike = {
     ['include'] = true,
@@ -41,7 +40,7 @@ return function (uri, callback)
             return
         end
         if cache[key] == nil then
-            cache[key] = globalMgr.hasGlobalSets(uri, 'variable', key)
+            cache[key] = vm.hasGlobalSets(uri, 'variable', key)
         end
         if cache[key] then
             return

script/core/rename.lua

@@ -3,7 +3,6 @@ local vm         = require 'vm'
 local util       = require 'utility'
 local findSource = require 'core.find-source'
 local guide      = require 'parser.guide'
-local globalMgr  = require 'vm.global-manager'
 
 local Forcing
 
@@ -191,7 +190,7 @@ end
 ---@async
 local function ofGlobal(source, newname, callback)
     local key = guide.getKeyName(source)
-    local global = globalMgr.getGlobal('variable', key)
+    local global = vm.getGlobal('variable', key)
     if not global then
         return
     end
@@ -214,7 +213,7 @@ end
 ---@async
 local function ofDocTypeName(source, newname, callback)
     local oldname = source[1]
-    local global = globalMgr.getGlobal('type', oldname)
+    local global = vm.getGlobal('type', oldname)
     if not global then
         return
     end

script/core/semantic-tokens.lua

@@ -7,7 +7,6 @@ local guide          = require 'parser.guide'
 local converter      = require 'proto.converter'
 local config         = require 'config'
 local linkedTable    = require 'linked-table'
-local globalMgr      = require 'vm.global-manager'
 
 local Care = util.switch()
     : case 'getglobal'
@@ -21,7 +20,7 @@ local Care = util.switch()
         local isLib = options.libGlobals[name]
         if isLib == nil then
             isLib = false
-            local global = globalMgr.getGlobal('variable', name)
+            local global = vm.getGlobal('variable', name)
             if global then
                 local uri = guide.getUri(source)
                 for _, set in ipairs(global:getSets(uri)) do