优化有大量全局变量时的性能

1 files changed, 27 insertions, 18 deletions

diff --git a/script-beta/vm/getGlobals.lua b/script-beta/vm/getGlobals.lua
index 7b42d345..380a21ac 100644
--- a/script-beta/vm/getGlobals.lua
+++ b/script-beta/vm/getGlobals.lua
@@ -90,24 +90,15 @@ local function insertLibrary(results, name)
     end
 end
 
-local function getGlobals(name, fast)
+local function getGlobals(name)
     local results = {}
-    local mark = {}
     for uri in files.eachFile() do
         local cache = files.getCache(uri)
         cache.globals = cache.globals or getGlobalsOfFile(uri)
         if name == '*' then
-            for destName, sources in util.sortPairs(cache.globals) do
-                if not fast or not mark[destName] then
-                    if fast then
-                        mark[destName] = true
-                    end
-                    for _, source in ipairs(sources) do
-                        results[#results+1] = source
-                        if fast then
-                            break
-                        end
-                    end
+            for _, sources in util.sortPairs(cache.globals) do
+                for _, source in ipairs(sources) do
+                    results[#results+1] = source
                 end
             end
         else
@@ -122,15 +113,33 @@ local function getGlobals(name, fast)
     return results
 end
 
-function vm.getGlobals(name, fast)
+local function getAnyGlobalsFast()
+    local results = {}
+    local mark = {}
+    for uri in files.eachFile() do
+        local cache = files.getCache(uri)
+        cache.globals = cache.globals or getGlobalsOfFile(uri)
+        for destName, sources in util.sortPairs(cache.globals) do
+            if not mark[destName] then
+                mark[destName] = true
+                results[#results+1] = sources[1]
+            end
+        end
+    end
+    insertLibrary(results, '*')
+    return results
+end
+
+function vm.getGlobals(name)
+    if name == '*' and config.config.intelliSense.fastGlobal then
+        return getAnyGlobalsFast()
+    end
     local cache = vm.getCache('getGlobals')[name]
     if cache ~= nil then
         return cache
     end
-    cache = getGlobals(name, fast)
-    if not fast then
-        vm.getCache('getGlobals')[name] = cache
-    end
+    cache = getGlobals(name)
+    vm.getCache('getGlobals')[name] = cache
     return cache
 end