generic cross files

1 files changed, 12 insertions, 5 deletions

diff --git a/script/core/searcher.lua b/script/core/searcher.lua
index 9208032c..121e90c6 100644
--- a/script/core/searcher.lua
+++ b/script/core/searcher.lua
@@ -349,7 +349,12 @@ function m.searchRefsByID(status, uri, expect, mode)
 
     local function checkForward(id, node, field)
         for _, forwardID in ipairs(node.forward) do
-            searchID(forwardID, field)
+            local targetUri, targetID = noder.getUriAndID(forwardID)
+            if targetUri and not files.eq(targetUri, uri) then
+                crossSearch(status, targetUri, targetID .. (field or ''), mode)
+            else
+                searchID(targetID or forwardID, field)
+            end
         end
     end
 
@@ -358,7 +363,12 @@ function m.searchRefsByID(status, uri, expect, mode)
             return
         end
         for _, backwardID in ipairs(node.backward) do
-            searchID(backwardID, field)
+            local targetUri, targetID = noder.getUriAndID(backwardID)
+            if targetUri and not files.eq(targetUri, uri) then
+                crossSearch(status, targetUri, targetID .. (field or ''), mode)
+            else
+                searchID(targetID or backwardID, field)
+            end
         end
     end
 
@@ -471,9 +481,6 @@ function m.searchRefsByID(status, uri, expect, mode)
         if stepCount > 1000 then
             error('too large')
         end
-        if checkCrossUri(id, field) then
-            return
-        end
         local node = noder.getNodeByID(root, id)
         if node then
             searchNode(id, node, field)