Skip to content

fix(#2794): sshfs compatibility #2922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 28, 2024
Merged

fix(#2794): sshfs compatibility #2922

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe2d3ad
Revert "revert(#2794): sshfs compatibility (#2920)"
mxple Sep 22, 2024
ff1296b
fix sshfs compatibility with symlinks
mxple Sep 22, 2024
60ded54
add suggestions
mxple Sep 23, 2024
f53c40d
Merge branch 'master' into main
alex-courtis Sep 28, 2024
bfac4e3
revert variable name change to ease multi-instance feature branch con…
alex-courtis Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lua/nvim-tree/actions/fs/remove-file.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,18 @@ local function remove_dir(cwd)
end

while true do
local name, t = vim.loop.fs_scandir_next(handle)
local name, _ = vim.loop.fs_scandir_next(handle)
if not name then
break
end

local new_cwd = utils.path_join { cwd, name }
if t == "directory" then

-- Type must come from fs_stat and not fs_scandir_next to maintain sshfs compatibility
local stat = vim.loop.fs_stat(new_cwd)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be fs_lstat?

Copy link
Collaborator Author

@mxple mxple Sep 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary but we can change for consistency.

local type = stat and stat.type or nil

if type == "directory" then
local success = remove_dir(new_cwd)
if not success then
return false
Expand Down
69 changes: 37 additions & 32 deletions lua/nvim-tree/explorer/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,24 +125,27 @@ function Explorer:reload(node, git_status)
})

while true do
local name, t = vim.loop.fs_scandir_next(handle)
local name, _ = vim.loop.fs_scandir_next(handle)
if not name then
break
end

local abs = utils.path_join { cwd, name }
---@type uv.fs_stat.result|nil
local stat = vim.loop.fs_stat(abs)
local stat = vim.loop.fs_lstat(abs)

local filter_reason = self.filters:should_filter_as_reason(abs, stat, filter_status)
if filter_reason == FILTER_REASON.none then
remain_childs[abs] = true

-- Type must come from fs_stat and not fs_scandir_next to maintain sshfs compatibility
local type = stat and stat.type or nil

-- Recreate node if type changes.
if nodes_by_path[abs] then
local n = nodes_by_path[abs]

if n.type ~= t then
if n.type ~= type then
utils.array_remove(node.nodes, n)
explorer_node.node_destroy(n)
nodes_by_path[abs] = nil
Expand All @@ -151,11 +154,11 @@ function Explorer:reload(node, git_status)

if not nodes_by_path[abs] then
local new_child = nil
if t == "directory" and vim.loop.fs_access(abs, "R") and Watcher.is_fs_event_capable(abs) then
if type == "directory" and vim.loop.fs_access(abs, "R") and Watcher.is_fs_event_capable(abs) then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid any future refactor/rebase fails, and to keep git history simple, please rename type to t

new_child = builders.folder(node, abs, name, stat)
elseif t == "file" then
elseif type == "file" then
new_child = builders.file(node, abs, name, stat)
elseif t == "link" then
elseif type == "link" then
local link = builders.link(node, abs, name, stat)
if link.link_to ~= nil then
new_child = link
Expand Down Expand Up @@ -238,17 +241,17 @@ function Explorer:refresh_parent_nodes_for_path(path)
-- collect parent nodes from the top down
local parent_nodes = {}
NodeIterator.builder({ self })
:recursor(function(node)
return node.nodes
end)
:applier(function(node)
local abs_contains = node.absolute_path and path:find(node.absolute_path, 1, true) == 1
local link_contains = node.link_to and path:find(node.link_to, 1, true) == 1
if abs_contains or link_contains then
table.insert(parent_nodes, node)
end
end)
:iterate()
:recursor(function(node)
return node.nodes
end)
:applier(function(node)
local abs_contains = node.absolute_path and path:find(node.absolute_path, 1, true) == 1
local link_contains = node.link_to and path:find(node.link_to, 1, true) == 1
if abs_contains or link_contains then
table.insert(parent_nodes, node)
end
end)
:iterate()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary whitespace change.

You can make style-fix

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably a result of using :Format. I'll use the make style next time.


-- refresh in order; this will expand groups as needed
for _, node in ipairs(parent_nodes) do
Expand Down Expand Up @@ -351,7 +354,7 @@ function Explorer:populate_children(handle, cwd, node, git_status, parent)
})

while true do
local name, t = vim.loop.fs_scandir_next(handle)
local name, _ = vim.loop.fs_scandir_next(handle)
if not name then
break
end
Expand All @@ -362,15 +365,17 @@ function Explorer:populate_children(handle, cwd, node, git_status, parent)
local profile = log.profile_start("populate_children %s", abs)

---@type uv.fs_stat.result|nil
local stat = vim.loop.fs_stat(abs)
local stat = vim.loop.fs_lstat(abs)
local filter_reason = parent.filters:should_filter_as_reason(abs, stat, filter_status)
if filter_reason == FILTER_REASON.none and not nodes_by_path[abs] then
-- Type must come from fs_stat and not fs_scandir_next to maintain sshfs compatibility
local type = stat and stat.type or nil
local child = nil
if t == "directory" and vim.loop.fs_access(abs, "R") then
if type == "directory" and vim.loop.fs_access(abs, "R") then
child = builders.folder(node, abs, name, stat)
elseif t == "file" then
elseif type == "file" then
child = builders.file(node, abs, name, stat)
elseif t == "link" then
elseif type == "link" then
local link = builders.link(node, abs, name, stat)
if link.link_to ~= nil then
child = link
Expand Down Expand Up @@ -434,16 +439,16 @@ end
---@param projects table
function Explorer:refresh_nodes(projects)
Iterator.builder({ self })
:applier(function(n)
if n.nodes then
local toplevel = git.get_toplevel(n.cwd or n.link_to or n.absolute_path)
self:reload(n, projects[toplevel] or {})
end
end)
:recursor(function(n)
return n.group_next and { n.group_next } or (n.open and n.nodes)
end)
:iterate()
:applier(function(n)
if n.nodes then
local toplevel = git.get_toplevel(n.cwd or n.link_to or n.absolute_path)
self:reload(n, projects[toplevel] or {})
end
end)
:recursor(function(n)
return n.group_next and { n.group_next } or (n.open and n.nodes)
end)
:iterate()
end

local event_running = false
Expand Down
Loading