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

refacto: move code ton explorer and simplify some internal apis

Browse Source
This commit is contained in:
kiyan
2022-02-06 17:58:24 +01:00
parent 8b27fd4e61
commit 8a6c7bae3a
5 changed files with 75 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ local builders = require'nvim-tree.explorer.node-builders'
local M = {}
function M.explore(nodes, cwd, parent_node, status)
function M.explore(node, cwd, status)
local handle = luv.fs_scandir(cwd)
if type(handle) == 'string' then
api.nvim_err_writeln(handle)
@@ -39,42 +39,42 @@ function M.explore(nodes, cwd, parent_node, status)
end
end
local parent_node_ignored = parent_node and parent_node.git_status == '!!'
local node_ignored = node.git_status == '!!'
-- Group empty dirs
if parent_node and vim.g.nvim_tree_group_empty == 1 then
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, parent_node_ignored) end
if links[1] then child_node = builders.link(cwd, links[1], status, parent_node_ignored) end
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
parent_node.group_next = child_node
child_node.git_status = parent_node.git_status
M.explore(nodes, child_node.absolute_path, child_node, status)
node.group_next = child_node
child_node.git_status = node.git_status
M.explore(child_node, child_node.absolute_path, status)
return
end
end
end
for _, dirname in ipairs(dirs) do
local dir = builders.folder(cwd, dirname, status, parent_node_ignored)
local dir = builders.folder(cwd, dirname, status, node_ignored)
if luv.fs_access(dir.absolute_path, 'R') then
table.insert(nodes, dir)
table.insert(node.nodes, dir)
end
end
for _, linkname in ipairs(links) do
local link = builders.link(cwd, linkname, status, parent_node_ignored)
local link = builders.link(cwd, linkname, status, node_ignored)
if link.link_to ~= nil then
table.insert(nodes, link)
table.insert(node.nodes, link)
end
end
for _, filename in ipairs(files) do
local file = builders.file(cwd, filename, status, parent_node_ignored)
table.insert(nodes, file)
local file = builders.file(cwd, filename, status, node_ignored)
table.insert(node.nodes, file)
end
utils.merge_sort(nodes, eutils.node_comparator)
utils.merge_sort(node.nodes, eutils.node_comparator)
end
return M

37
lua/nvim-tree/explorer/init.lua
View File

@@ -1,10 +1,47 @@
local uv = vim.loop
local git = require"nvim-tree.git"
local M = {}
M.explore = require"nvim-tree.explorer.explore".explore
M.reload = require"nvim-tree.explorer.reload".reload
local Explorer = {}
Explorer.__index = Explorer
function Explorer.new(cwd)
cwd = cwd or uv.cwd()
return setmetatable({
cwd = cwd,
nodes = {}
}, Explorer)
end
function Explorer:_load(cwd, node)
git.load_project_status(cwd, function(git_statuses)
M.explore(node, cwd, git_statuses)
if type(self.init_cb) == "function" then
self.init_cb(self)
self.init_cb = nil
end
end)
end
function Explorer:expand(node)
self.init_cb = require"nvim-tree.lib".redraw
self:_load(node.link_to or node.absolute_path, node)
end
function Explorer:init(f)
self.init_cb = f
self:_load(self.cwd, self)
end
function M.setup(opts)
require"nvim-tree.explorer.utils".setup(opts)
end
M.Explorer = Explorer
return M