refactor: remove cache side effects from adapter.list

lua/oil/adapters/files.lua

@@ -213,7 +213,7 @@ end
 
 ---@param url string
 ---@param column_defs string[]
----@param cb fun(err?: string, fetch_more?: fun())
+---@param cb fun(err?: string, entries?: oil.InternalEntry[], fetch_more?: fun())
 M.list = function(url, column_defs, cb)
   local _, path = util.parse_url(url)
   assert(path)
@@ -234,6 +234,7 @@ M.list = function(url, column_defs, cb)
     local read_next
     read_next = function()
       uv.fs_readdir(fd, function(err, entries)
+        local internal_entries = {}
         if err then
           uv.fs_closedir(fd, function()
             cb(err)
@@ -244,7 +245,7 @@ M.list = function(url, column_defs, cb)
             if inner_err then
               cb(inner_err)
             else
-              cb(nil, read_next)
+              cb(nil, internal_entries, read_next)
             end
           end)
           for _, entry in ipairs(entries) do
@@ -253,6 +254,7 @@ M.list = function(url, column_defs, cb)
               if err then
                 poll(meta_err)
               else
+                table.insert(internal_entries, cache_entry)
                 local meta = cache_entry[FIELD_META]
                 -- Make sure we always get fs_stat info for links
                 if entry.type == "link" then
@@ -266,12 +268,10 @@ M.list = function(url, column_defs, cb)
                       end
                       meta.link = link
                       meta.link_stat = link_stat
-                      cache.store_entry(url, cache_entry)
                       poll()
                     end
                   end)
                 else
-                  cache.store_entry(url, cache_entry)
                   poll()
                 end
               end

lua/oil/adapters/ssh.lua

@@ -1,4 +1,3 @@
-local cache = require("oil.cache")
 local config = require("oil.config")
 local constants = require("oil.constants")
 local fs = require("oil.fs")
@@ -206,7 +205,7 @@ end
 
 ---@param url string
 ---@param column_defs string[]
----@param callback fun(err: nil|string, fetch_more?: fun())
+---@param callback fun(err?: string, entries?: oil.InternalEntry[], fetch_more?: fun())
 M.list = function(url, column_defs, callback)
   local res = M.parse_url(url)
 

lua/oil/adapters/ssh/sshfs.lua

@@ -126,7 +126,7 @@ local dir_meta = {}
 
 ---@param url string
 ---@param path string
----@param callback fun(err: nil|string, fetch_more?: fun())
+---@param callback fun(err?: string, entries?: oil.InternalEntry[], fetch_more?: fun())
 function SSHFS:list_dir(url, path, callback)
   local path_postfix = ""
   if path ~= "" then
@@ -145,6 +145,7 @@ function SSHFS:list_dir(url, path, callback)
     assert(lines)
     local any_links = false
     local entries = {}
+    local cache_entries = {}
     for _, line in ipairs(lines) do
       if line ~= "" and not line:match("^total") then
         local name, type, meta = parse_ls_line(line)
@@ -155,9 +156,9 @@ function SSHFS:list_dir(url, path, callback)
             any_links = true
           end
           local cache_entry = cache.create_entry(url, name, type)
+          table.insert(cache_entries, cache_entry)
           entries[name] = cache_entry
           cache_entry[FIELD_META] = meta
-          cache.store_entry(url, cache_entry)
         end
       end
     end
@@ -184,10 +185,10 @@ function SSHFS:list_dir(url, path, callback)
             end
           end
         end
-        callback()
+        callback(nil, cache_entries)
       end)
     else
-      callback()
+      callback(nil, cache_entries)
     end
   end)
 end

lua/oil/adapters/test.lua

@@ -1,4 +1,5 @@
 local cache = require("oil.cache")
+local util = require("oil.util")
 local M = {}
 
 ---@param url string
@@ -7,11 +8,49 @@ M.normalize_url = function(url, callback)
   callback(url)
 end
 
+local dir_listing = {}
+
 ---@param url string
 ---@param column_defs string[]
----@param cb fun(err?: string, fetch_more?: fun())
+---@param cb fun(err?: string, entries?: oil.InternalEntry[], fetch_more?: fun())
 M.list = function(url, column_defs, cb)
-  cb()
+  local _, path = util.parse_url(url)
+  local entries = dir_listing[path] or {}
+  local cache_entries = {}
+  for _, entry in ipairs(entries) do
+    local cache_entry = cache.create_entry(url, entry.name, entry.entry_type)
+    table.insert(cache_entries, cache_entry)
+  end
+  cb(nil, cache_entries)
+end
+
+M.test_clear = function()
+  dir_listing = {}
+end
+
+---@param path string
+---@param entry_type oil.EntryType
+---@return oil.InternalEntry
+M.test_set = function(path, entry_type)
+  if path == "/" then
+    return {}
+  end
+  local parent = vim.fn.fnamemodify(path, ":h")
+  if parent ~= path then
+    M.test_set(parent, "directory")
+  end
+  parent = util.addslash(parent)
+  if not dir_listing[parent] then
+    dir_listing[parent] = {}
+  end
+  local name = vim.fn.fnamemodify(path, ":t")
+  local entry = {
+    name = name,
+    entry_type = entry_type,
+  }
+  table.insert(dir_listing[parent], entry)
+  local parent_url = "oil-test://" .. parent
+  return cache.create_and_store_entry(parent_url, entry.name, entry.entry_type)
 end
 
 ---@param name string
@@ -20,22 +59,6 @@ M.get_column = function(name)
   return nil
 end
 
----@param path string
----@param entry_type oil.EntryType
-M.test_set = function(path, entry_type)
-  local parent = vim.fn.fnamemodify(path, ":h")
-  if parent ~= path then
-    M.test_set(parent, "directory")
-  end
-  local url = "oil-test://" .. path
-  if cache.get_entry_by_url(url) then
-    -- Already exists
-    return
-  end
-  local name = vim.fn.fnamemodify(path, ":t")
-  cache.create_and_store_entry("oil-test://" .. parent, name, entry_type)
-end
-
 ---@param bufnr integer
 ---@return boolean
 M.is_modifiable = function(bufnr)