From 618ba50793225f880ef2fdad38501814fa78a0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=80=E8=90=8C=E5=B0=8F=E6=B1=90?= <sumneko@hotmail.com>
Date: Fri, 21 May 2021 17:25:46 +0800
Subject: update

---
 script/core/noder.lua    |  3 +++
 script/core/searcher.lua | 37 +++++++++++++++++++++++++++++++++++++
 script/files.lua         |  1 +
 script/vm/eachDef.lua    |  2 +-
 4 files changed, 42 insertions(+), 1 deletion(-)

(limited to 'script')

diff --git a/script/core/noder.lua b/script/core/noder.lua
index 137b4355..8bcc87e5 100644
--- a/script/core/noder.lua
+++ b/script/core/noder.lua
@@ -189,6 +189,9 @@ local function checkMode(source)
     or source.type == 'doc.type.name'
     or source.type == 'doc.alias.name'
     or source.type == 'doc.extends.name' then
+        if source.typeGeneric then
+            return 'dg:'
+        end
         return 'dn:'
     end
     if source.type == 'doc.field.name' then
diff --git a/script/core/searcher.lua b/script/core/searcher.lua
index c0111c9d..9765777c 100644
--- a/script/core/searcher.lua
+++ b/script/core/searcher.lua
@@ -23,6 +23,20 @@ local function checkFunctionReturn(source)
     return nil
 end
 
+local ignoredIDs = {
+    ['dn:nil']           = true,
+    ['dn:any']           = true,
+    ['dn:boolean']       = true,
+    ['dn:string']        = true,
+    ['dn:table']         = true,
+    ['dn:number']        = true,
+    ['dn:integer']       = true,
+    ['dn:userdata']      = true,
+    ['dn:lightuserdata'] = true,
+    ['dn:function']      = true,
+    ['dn:thread']        = true,
+}
+
 local m = {}
 
 ---@alias guide.searchmode '"ref"'|'"def"'|'"field"'
@@ -201,7 +215,11 @@ function m.searchRefsByID(status, uri, expect, mode)
     local callStack = status.callStack
 
     local mark = {}
+
     local function search(id, field)
+        if ignoredIDs[id] then
+            --return
+        end
         local cmark = mark[id]
         if not cmark then
             cmark = {}
@@ -381,6 +399,23 @@ function m.searchRefsByID(status, uri, expect, mode)
         end
     end
 
+    local function checkClass(id, node, field)
+        if id:sub(1, 3) ~= 'dn:' then
+            return
+        end
+        local firstID = noder.getFirstID(id)
+        if status.crossedClass[firstID] then
+            return
+        end
+        status.crossedClass[firstID] = true
+        local tid = id .. (field or '')
+        for guri in files.eachFile() do
+            if not files.eq(uri, guri) then
+                crossSearch(status, guri, tid, mode)
+            end
+        end
+    end
+
     local function searchNode(id, node, field)
         if node.call then
             callStack[#callStack+1] = node.call
@@ -407,6 +442,7 @@ function m.searchRefsByID(status, uri, expect, mode)
         end
 
         checkGlobal(id, node, field)
+        checkClass(id, node, field)
 
         if node.call then
             callStack[#callStack] = nil
@@ -471,6 +507,7 @@ function m.status(parentStatus, interface, deep)
         --mark      = parentStatus and parentStatus.mark or {},
         callStack     = {},
         crossedGlobal = {},
+        crossedClass  = {},
         results       = {},
     }
     return status
diff --git a/script/files.lua b/script/files.lua
index 3f3d633e..bb143250 100644
--- a/script/files.lua
+++ b/script/files.lua
@@ -345,6 +345,7 @@ function m.getAllUris()
             i = i + 1
             files[i] = uri
         end
+        table.sort(files)
     end
     return m._pairsCache
 end
diff --git a/script/vm/eachDef.lua b/script/vm/eachDef.lua
index b120c8a5..e6af8d99 100644
--- a/script/vm/eachDef.lua
+++ b/script/vm/eachDef.lua
@@ -42,7 +42,7 @@ function vm.getDefs(source, deep)
         if not cache or cache.deep < deep then
             cache = getDefs(source, deep)
             cache.deep = deep
-            vm.getCache('eachDef')[source] = cache
+            --vm.getCache('eachDef')[source] = cache
         end
         return cache
     end
-- 
cgit v1.2.3