cleanup

Author: sumneko

script/core/rename.lua

@@ -200,12 +200,9 @@ local function ofGlobal(source, newname, callback)
     if not global then
         return
     end
-    local uri = guide.getUri(source)
-    for _, set in ipairs(global:getSets(uri)) do
-        ofFieldThen(key, set, newname, callback)
-    end
-    for _, get in ipairs(global:getGets(uri)) do
-        ofFieldThen(key, get, newname, callback)
+    local refs = vm.getRefs(source)
+    for _, ref in ipairs(refs) do
+        ofFieldThen(key, ref, newname, callback)
     end
 end
 
@@ -235,7 +232,8 @@ local function ofDocTypeName(source, newname, callback)
             callback(doc, doc.enum.start, doc.enum.finish, newname)
         end
     end
-    for _, doc in ipairs(global:getGets(uri)) do
+    local refs = vm.getRefs(source)
+    for _, doc in ipairs(refs) do
         if doc.type == 'doc.type.name' then
             callback(doc, doc.start, doc.finish, newname)
         end

script/vm/global.lua

@@ -7,7 +7,6 @@ local ws    = require 'workspace'
 local vm    = require 'vm.vm'
 
 ---@class vm.global.link
----@field gets   parser.object[]
 ---@field sets   parser.object[]
 
 ---@class vm.global
@@ -31,20 +30,6 @@ function mt:addSet(uri, source)
     self.setsCache = nil
 end
 
----@param uri    uri
----@param source parser.object
-function mt:addGet(uri, source)
-    if PREVIEW then
-        return
-    end
-    local link = self.links[uri]
-    if not link.gets then
-        link.gets = {}
-    end
-    link.gets[#link.gets+1] = source
-    self.getsCache = nil
-end
-
 ---@param suri uri
 ---@return parser.object[]
 function mt:getSets(suri)
@@ -96,35 +81,6 @@ function mt:getAllSets()
     return cache
 end
 
----@return parser.object[]
-function mt:getGets(suri)
-    if not self.getsCache then
-        self.getsCache = {}
-    end
-    local scp = scope.getScope(suri)
-    local cacheUri = scp.uri or '<callback>'
-    if self.getsCache[cacheUri] then
-        return self.getsCache[cacheUri]
-    end
-    local clock = os.clock()
-    self.getsCache[cacheUri] = {}
-    local cache = self.getsCache[cacheUri]
-    for uri, link in pairs(self.links) do
-        if link.gets then
-            if scp:isVisible(uri) then
-                for _, source in ipairs(link.gets) do
-                    cache[#cache+1] = source
-                end
-            end
-        end
-    end
-    local cost = os.clock() - clock
-    if cost > 0.1 then
-        log.warn('global-manager getGets costs', cost, self.name)
-    end
-    return cache
-end
-
 ---@param uri uri
 function mt:dropUri(uri)
     self.links[uri] = nil
@@ -218,7 +174,6 @@ local compilerGlobalSwitch = util.switch()
             return
         end
         local global = vm.declareGlobal('variable', name, uri)
-        global:addGet(uri, source)
         source._globalNode = global
 
         local nxt = source.next
@@ -276,7 +231,6 @@ local compilerGlobalSwitch = util.switch()
         end
         local uri    = guide.getUri(source)
         local global = vm.declareGlobal('variable', name, uri)
-        global:addGet(uri, source)
         source._globalNode = global
 
         local nxt = source.next
@@ -301,8 +255,6 @@ local compilerGlobalSwitch = util.switch()
                     if source.node.special == 'rawset' then
                         global:addSet(uri, source)
                         source.value = source.args[3]
-                    else
-                        global:addGet(uri, source)
                     end
                     source._globalNode = global
 
@@ -401,15 +353,13 @@ local compilerGlobalSwitch = util.switch()
             return
         end
         local type = vm.declareGlobal('type', name, uri)
-        type:addGet(uri, source)
         source._globalNode = type
     end)
     : case 'doc.extends.name'
     : call(function (source)
         local uri  = guide.getUri(source)
         local name = source[1]
         local class = vm.declareGlobal('type', name, uri)
-        class:addGet(uri, source)
         source._globalNode = class
     end)
 

script/vm/ref.lua

@@ -97,7 +97,7 @@ local function searchWord(source, pushResult, defMap, fileNotify)
         if global then
             local globalName = global:asKeyName()
             ---@async
-            guide.eachSourceTypes(state.ast, {'getglobal', 'setglobal', 'setfield', 'getfield', 'setmethod', 'getmethod', 'setindex', 'getindex', 'doc.type.name', 'doc.class.name', 'doc.alias.name'}, function (src)
+            guide.eachSourceTypes(state.ast, {'getglobal', 'setglobal', 'setfield', 'getfield', 'setmethod', 'getmethod', 'setindex', 'getindex', 'doc.type.name', 'doc.class.name', 'doc.alias.name', 'doc.extends.name'}, function (src)
                 local myGlobal = vm.getGlobalNode(src)
                 if myGlobal and myGlobal:asKeyName() == globalName then
                     pushResult(src)
@@ -207,6 +207,7 @@ local nodeSwitch = util.switch()
     : case 'doc.class'
     : case 'doc.enum'
     : case 'doc.type.name'
+    : case 'doc.extends.name'
     ---@async
     : call(function (source, pushResult, defMap, fileNotify)
         searchWord(source, pushResult, defMap, fileNotify)
@@ -264,9 +265,6 @@ local function searchByGlobal(source, pushResult)
     for _, set in ipairs(node:getSets(uri)) do
         pushResult(set)
     end
-    for _, get in ipairs(node:getGets(uri)) do
-        pushResult(get)
-    end
 end
 
 local function searchByDef(source, pushResult)

test.lua

@@ -22,7 +22,6 @@ log.init(ROOT, ROOT / 'log' / 'test.log')
 log.debug('测试开始')
 
 LOCALE = 'zh-cn'
-PREVIEW = true
 
 --dofile((ROOT / 'build_package.lua'):string())
 require 'tracy'