tomas.mirchev/nvim-tree.lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refacto: simplify explorer and make it a bit faster

Browse Source 
Also fixes #933
This commit is contained in:
kiyan
2022-02-06 18:51:17 +01:00
parent 8a6c7bae3a
commit b76602182f
4 changed files with 25 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
lua/nvim-tree/explorer/explore.lua
View File

@@ -1,5 +1,5 @@
local api = vim.api
local luv = vim.loop
local uv = vim.loop
local utils = require'nvim-tree.utils'
local eutils = require'nvim-tree.explorer.utils'
@@ -8,72 +8,45 @@ local builders = require'nvim-tree.explorer.node-builders'
local M = {}
function M.explore(node, cwd, status)
local handle = luv.fs_scandir(cwd)
local handle = uv.fs_scandir(cwd)
if type(handle) == 'string' then
api.nvim_err_writeln(handle)
return
end
local dirs = {}
local links = {}
local files = {}
local node_ignored = node.git_status == '!!'
while true do
local name, t = luv.fs_scandir_next(handle)
local name, t = uv.fs_scandir_next(handle)
if not name then break end
local abs = utils.path_join({cwd, name})
t = t or (uv.fs_stat(abs) or {}).type
if not eutils.should_ignore(abs) and not eutils.should_ignore_git(abs, status.files) then
if not t then
local stat = luv.fs_stat(abs)
t = stat and stat.type
end
if t == 'directory' then
table.insert(dirs, name)
if t == 'directory' and uv.fs_access(abs, 'R') then
table.insert(node.nodes, builders.folder(abs, name, status, node_ignored))
elseif t == 'file' then
table.insert(files, name)
table.insert(node.nodes, builders.file(abs, name, status, node_ignored))
elseif t == 'link' then
table.insert(links, name)
local link = builders.link(abs, name, status, node_ignored)
if link.link_to ~= nil then
table.insert(node.nodes, link)
end
end
end
end
local node_ignored = node.git_status == '!!'
-- Group empty dirs
if vim.g.nvim_tree_group_empty == 1 then
if eutils.should_group(cwd, dirs, files, links) then
local child_node
if dirs[1] then child_node = builders.folder(cwd, dirs[1], status, node_ignored) end
if links[1] then child_node = builders.link(cwd, links[1], status, node_ignored) end
if luv.fs_access(child_node.absolute_path, 'R') then
node.group_next = child_node
child_node.git_status = node.git_status
M.explore(child_node, child_node.absolute_path, status)
return
end
local child_node = node.nodes[1]
if #(node.nodes) == 1 and child_node.nodes and uv.fs_access(child_node.absolute_path, 'R') then
node.group_next = child_node
child_node.git_status = node.git_status
node.nodes = {}
M.explore(child_node, child_node.absolute_path, status)
return
end
end
for _, dirname in ipairs(dirs) do
local dir = builders.folder(cwd, dirname, status, node_ignored)
if luv.fs_access(dir.absolute_path, 'R') then
table.insert(node.nodes, dir)
end
end
for _, linkname in ipairs(links) do
local link = builders.link(cwd, linkname, status, node_ignored)
if link.link_to ~= nil then
table.insert(node.nodes, link)
end
end
for _, filename in ipairs(files) do
local file = builders.file(cwd, filename, status, node_ignored)
table.insert(node.nodes, file)
end
utils.merge_sort(node.nodes, eutils.node_comparator)
end