暂存

4 files changed, 21 insertions, 11 deletions

diff --git a/script-beta/vm/eachRef.lua b/script-beta/vm/eachRef.lua
index 270a6875..232cb237 100644
--- a/script-beta/vm/eachRef.lua
+++ b/script-beta/vm/eachRef.lua
@@ -8,7 +8,7 @@ local function eachRef(source, results)
         return results
     end
 
-    local myResults = guide.requestReference(source)
+    local myResults = guide.requestReference(source, vm.interface)
     vm.mergeResults(results, myResults)
 
     lock()
diff --git a/script-beta/vm/getLinks.lua b/script-beta/vm/getLinks.lua
index 41318e1c..6a19fbc8 100644
--- a/script-beta/vm/getLinks.lua
+++ b/script-beta/vm/getLinks.lua
@@ -1,6 +1,7 @@
 local guide = require 'parser.guide'
 local vm    = require 'vm.vm'
 local files = require 'files'
+local ws    = require 'workspace'
 
 local function getFileLinks(uri)
     local links = {}
@@ -13,22 +14,30 @@ local function getFileLinks(uri)
         if not call or call.type ~= 'call' then
             return
         end
+        local args = call.args
+        if type(args[1]) ~= 'string' then
+            return
+        end
+        local uris = ws.findUrisByRequirePath(args[1], true)
+        for _, u in ipairs(uris) do
+            u = files.asKey(u)
+            if not links[u] then
+                links[u] = {}
+            end
+            links[u][#links[u]+1] = call
+        end
     end)
     return links
 end
 
 local function getLinksTo(uri)
+    uri = files.asKey(uri)
     local links = {}
-    local mark = {}
     for u in files.eachFile() do
-        local l = vm.getFileLinks(u)
-        for _, lu in ipairs(l) do
-            if files.eq(uri, lu) then
-                local ku = files.asKey(u)
-                if not mark[ku] then
-                    mark[ku] = true
-                    links[#links+1] = u
-                end
+        local ls = vm.getFileLinks(u)
+        if ls[uri] then
+            for _, l in ipairs(ls[uri]) do
+                links[#links+1] = l
             end
         end
     end
diff --git a/script-beta/vm/guideInterface.lua b/script-beta/vm/guideInterface.lua
index f7a35b6d..f598e788 100644
--- a/script-beta/vm/guideInterface.lua
+++ b/script-beta/vm/guideInterface.lua
@@ -84,6 +84,6 @@ function vm.interface.global(name)
     return vm.getGlobals(name)
 end
 
-function vm.interface.links(uri)
+function vm.interface.link(uri)
     return vm.getLinksTo(uri)
 end
diff --git a/script-beta/vm/init.lua b/script-beta/vm/init.lua
index ce07264d..bc2b41c1 100644
--- a/script-beta/vm/init.lua
+++ b/script-beta/vm/init.lua
@@ -7,5 +7,6 @@ require 'vm.getMeta'
 require 'vm.eachField'
 require 'vm.eachDef'
 require 'vm.eachRef'
+require 'vm.getLinks'
 require 'vm.guideInterface'
 return vm