分离 eachRef 与 eachDef

1 files changed, 16 insertions, 31 deletions

diff --git a/script-beta/core/definition.lua b/script-beta/core/definition.lua
index 8afdc2ba..ded2fb1c 100644
--- a/script-beta/core/definition.lua
+++ b/script-beta/core/definition.lua
@@ -17,37 +17,22 @@ local function findDef(source, callback)
     and source.type ~= 'goto' then
         return
     end
-    vm.eachDef(source, function (info)
-        if info.source.library then
-            return
-        end
-        if info.mode == 'declare'
-        or info.mode == 'set' then
-            local src  = info.source
-            local root = guide.getRoot(src)
-            local uri  = root.uri
-            if     src.type == 'setfield'
-            or     src.type == 'getfield'
-            or     src.type == 'tablefield' then
-                callback(src.field, uri)
-            elseif src.type == 'setindex'
-            or     src.type == 'getindex'
-            or     src.type == 'tableindex' then
-                callback(src.index, uri)
-            elseif src.type == 'getmethod'
-            or     src.type == 'setmethod' then
-                callback(src.method, uri)
-            else
-                callback(src, uri)
-            end
-        end
-        if info.mode == 'value' then
-            local src  = info.source
-            local root = guide.getRoot(src)
-            local uri  = root.uri
-            if src.parent.type == 'return' then
-                callback(src, uri)
-            end
+    vm.eachDef(source, function (src)
+        local root = guide.getRoot(src)
+        local uri  = root.uri
+        if     src.type == 'setfield'
+        or     src.type == 'getfield'
+        or     src.type == 'tablefield' then
+            callback(src.field, uri)
+        elseif src.type == 'setindex'
+        or     src.type == 'getindex'
+        or     src.type == 'tableindex' then
+            callback(src.index, uri)
+        elseif src.type == 'getmethod'
+        or     src.type == 'setmethod' then
+            callback(src.method, uri)
+        else
+            callback(src, uri)
         end
     end)
 end