cleanup

2 files changed, 33 insertions, 7 deletions

diff --git a/script/vm/getDef.lua b/script/vm/getDef.lua
index 991bab68..5546617a 100644
--- a/script/vm/getDef.lua
+++ b/script/vm/getDef.lua
@@ -58,26 +58,52 @@ local noderMap = util.switch()
     end)
     : getMap()
 
-function vm.getDefs(source)
-    local results = {}
-
-    -- search by simple
+---@param source  parser.guide.object
+---@param results parser.guide.object[]
+local function searchBySimple(source, results)
     local simple = simpleMap[source.type]
     if simple then
         simple(source, results)
     end
-    local uri   = guide.getUri(source)
+end
 
-    -- search by node
+---@param source  parser.guide.object
+---@param results parser.guide.object[]
+local function searchByGlobal(source, results)
+    local global = source._globalID
+    if not global then
+        return
+    end
+    for _, src in ipairs(global:getSets()) do
+        results[#results+1] = src
+    end
+end
+
+---@param source  parser.guide.object
+---@param results parser.guide.object[]
+local function searchByNode(source, results)
+    local uri   = guide.getUri(source)
     local node  = compiler.compileNode(uri, source)
     local noder = noderMap[node.type]
     if noder then
         noder(node, results)
     end
+end
+
+---@param source parser.guide.object
+---@return       parser.guide.object[]
+function vm.getDefs(source)
+    local results = {}
+
+    searchBySimple(source, results)
+    searchByGlobal(source, results)
+    searchByNode(source, results)
 
     return results
 end
 
+---@param source parser.guide.object
+---@return       parser.guide.object[]
 function vm.getAllDefs(source)
     return vm.getDefs(source)
 end
diff --git a/script/vm/node/compiler.lua b/script/vm/node/compiler.lua
index ea82a467..db5cd486 100644
--- a/script/vm/node/compiler.lua
+++ b/script/vm/node/compiler.lua
@@ -6,7 +6,7 @@ local state  = require 'vm.state'
 ---@field _compiledGlobal boolean
 ---@field _compiledNodes  boolean
 ---@field _compiled       any
----@field _globalID       string
+---@field _globalID       vm.node.global
 
 ---@class vm.node.compiler
 local m = {}