improve

Author: sumneko

script/workspace/loading.lua

@@ -111,6 +111,7 @@ function mt:loadFile(uri, libraryUri)
                 self.read = self.read + 1
                 self:update()
                 files.addRef(uri)
+                self._cache[uri] = true
                 log.info(('Skip loaded file: %s'):format(uri))
             else
                 local content = pub.awaitTask('loadFile', furi.decode(uri))
@@ -176,7 +177,6 @@ function m.create(scp)
         _stash = {},
         _cache = {},
     }, mt)
-    scp:set('cachedUris', loading._cache)
     m._loadings[loading] = true
     return loading
 end

script/workspace/workspace.lua

@@ -228,6 +228,7 @@ function m.awaitLoadFile(uri)
     log.info('Scan files at:', uri)
     ---@async
     native:scan(furi.decode(uri), function (path)
+        scp:get('cachedUris')[furi.encode(path)] = true
         ld:loadFile(furi.encode(path))
     end)
     ld:loadAll()
@@ -275,6 +276,7 @@ function m.awaitPreload(scp)
         log.info('Scan files at:', scp:getName())
         ---@async
         native:scan(furi.decode(scp.uri), function (path)
+            scp:get('cachedUris')[furi.encode(path)] = true
             ld:loadFile(furi.encode(path))
         end)
     end
@@ -284,6 +286,7 @@ function m.awaitPreload(scp)
         scp:addLink(libMatcher.uri)
         ---@async
         libMatcher.matcher:scan(furi.decode(libMatcher.uri), function (path)
+            scp:get('cachedUris')[furi.encode(path)] = true
             ld:loadFile(furi.encode(path), libMatcher.uri)
         end)
         watchers[#watchers+1] = fw.watch(furi.decode(libMatcher.uri))
@@ -401,10 +404,10 @@ end
 ---@param scp scope
 function m.flushFiles(scp)
     local cachedUris = scp:get 'cachedUris'
+    scp:set('cachedUris', {})
     if not cachedUris then
         return
     end
-    scp:set('cachedUris', nil)
     for uri in pairs(cachedUris) do
         files.delRef(uri)
     end