cleanup

Author: sumneko

script/filewatch.lua

@@ -22,11 +22,30 @@ end
 local m = {}
 
 m._eventList = {}
+m._watchings = {}
 
 function m.watch(path)
-    local id = fw.add(path)
+    if m._watchings[path] then
+        m._watchings[path].count = m._watchings[path].count + 1
+    else
+        m._watchings[path] = {
+            count = 1,
+            id    = fw.add(path),
+        }
+        log.debug('fw.add', path)
+    end
+    local removed
     return function ()
-        fw.remove(id)
+        if removed then
+            return
+        end
+        removed = true
+        m._watchings[path].count = m._watchings[path].count - 1
+        if m._watchings[path].count == 0 then
+            fw.remove(m._watchings[path].id)
+            m._watchings[path] = nil
+            log.debug('fw.remove', path)
+        end
     end
 end
 

script/workspace/scope.lua

@@ -1,10 +1,13 @@
+local gc = require 'gc'
+
 ---@alias scope.type '"override"'|'"folder"'|'"fallback"'
 
 ---@class scope
 ---@field type   scope.type
 ---@field uri?   uri
 ---@field _links table<uri, boolean>
 ---@field _data  table<string, any>
+---@field _gc    gc
 local mt = {}
 mt.__index = mt
 
@@ -97,13 +100,23 @@ function mt:getName()
     return self.uri or ('<' .. self.type .. '>')
 end
 
+function mt:gc(obj)
+    self._gc:add(obj)
+end
+
+function mt:flushGC()
+    self._gc:remove()
+    self._gc = gc()
+end
+
 ---@param scopeType scope.type
 ---@return scope
 local function createScope(scopeType)
     local scope = setmetatable({
         type   = scopeType,
         _links = {},
         _data  = {},
+        _gc    = gc(),
     }, mt)
 
     return scope

script/workspace/workspace.lua

@@ -267,14 +267,7 @@ function m.awaitPreload(scp)
     await.setID('preload:' .. scp:getName())
     await.sleep(0.1)
 
-    local watchers = scp:get 'watchers'
-    if watchers then
-        for _, dispose in ipairs(watchers) do
-            dispose()
-        end
-    end
-    watchers = {}
-    scp:set('watchers', watchers)
+    scp:flushGC()
 
     local ld <close> = loading.create(scp)
     scp:set('loading', ld)
@@ -301,7 +294,7 @@ function m.awaitPreload(scp)
             scp:get('cachedUris')[furi.encode(path)] = true
             ld:loadFile(furi.encode(path), libMatcher.uri)
         end)
-        watchers[#watchers+1] = fw.watch(furi.decode(libMatcher.uri))
+        scp:gc(fw.watch(furi.decode(libMatcher.uri)))
     end
 
     -- must wait for other scopes to add library