Avoid O(n^2) `require` computations

2 files changed, 4 insertions, 1 deletions

diff --git a/script/core/collector.lua b/script/core/collector.lua
index 62ca5a7d..1abfc51b 100644
--- a/script/core/collector.lua
+++ b/script/core/collector.lua
@@ -42,6 +42,9 @@ function mt:dropUri(uri)
     self.subscribed[uri] = nil
     for name in pairs(uriSubscribed) do
         self.collect[name][uri] = nil
+        if not next(self.collect[name]) then
+            self.collect[name] = nil
+        end
     end
 end
 
diff --git a/script/core/completion/completion.lua b/script/core/completion/completion.lua
index 124ebee1..9eb33c2a 100644
--- a/script/core/completion/completion.lua
+++ b/script/core/completion/completion.lua
@@ -884,7 +884,7 @@ local function collectRequireNames(mode, myUri, literal, source, smark, position
             if myUri == uri then
                 goto CONTINUE
             end
-            local path = workspace.getRelativePath(uri)
+            local path = furi.decode(uri)
             local infos = rpath.getVisiblePath(uri, path)
             for _, info in ipairs(infos) do
                 if matchKey(literal, info.expect) then