From 96650c801f810703b75a060f32a8e8aa17fa20b1 Mon Sep 17 00:00:00 2001 From: kiyan Date: Sat, 5 Feb 2022 16:56:42 +0100 Subject: [PATCH] BREAKING: rename populate -> explorer - rename populate.lua to explorer.lua - rename refresh_entries to refresh in explorer.lua - rename populate to explore in explorer.lua --- lua/nvim-tree.lua | 2 +- lua/nvim-tree/{populate.lua => explorer.lua} | 18 +++++++++--------- lua/nvim-tree/lib.lua | 14 ++++++-------- 3 files changed, 16 insertions(+), 18 deletions(-) rename lua/nvim-tree/{populate.lua => explorer.lua} (95%) diff --git a/lua/nvim-tree.lua b/lua/nvim-tree.lua index 15e4ca9e..0ccaaffe 100644 --- a/lua/nvim-tree.lua +++ b/lua/nvim-tree.lua @@ -355,7 +355,7 @@ function M.setup(conf) require'nvim-tree.actions'.setup(opts) require'nvim-tree.view'.setup(opts.view or {}) require'nvim-tree.diagnostics'.setup(opts) - require'nvim-tree.populate'.setup(opts) + require'nvim-tree.explorer'.setup(opts) require'nvim-tree.git'.setup(opts) setup_autocommands(opts) diff --git a/lua/nvim-tree/populate.lua b/lua/nvim-tree/explorer.lua similarity index 95% rename from lua/nvim-tree/populate.lua rename to lua/nvim-tree/explorer.lua index d7408bbd..d6a731a7 100644 --- a/lua/nvim-tree/populate.lua +++ b/lua/nvim-tree/explorer.lua @@ -159,7 +159,7 @@ local function should_ignore_git(path, status) and (M.config.filter_git_ignored and status and status[path] == '!!') end -function M.refresh_entries(entries, cwd, parent_node, status) +function M.refresh(nodes, cwd, parent_node, status) local handle = luv.fs_scandir(cwd) if type(handle) == 'string' then api.nvim_err_writeln(handle) @@ -169,7 +169,7 @@ function M.refresh_entries(entries, cwd, parent_node, status) local named_entries = {} local cached_entries = {} local entries_idx = {} - for i, node in ipairs(entries) do + for i, node in ipairs(nodes) do node.git_status = (parent_node and parent_node.git_status == '!!' and '!!') or (status.files and status.files[node.absolute_path]) or (status.dirs and status.dirs[node.absolute_path]) @@ -219,7 +219,7 @@ function M.refresh_entries(entries, cwd, parent_node, status) parent_node.group_next = nil named_entries[next_node.name] = next_node else - M.refresh_entries(entries, next_node.absolute_path, next_node, status) + M.refresh(nodes, next_node.absolute_path, next_node, status) return end end @@ -237,7 +237,7 @@ function M.refresh_entries(entries, cwd, parent_node, status) end if not new_entries[name] then - table.remove(entries, idx) + table.remove(nodes, idx) else idx = idx + 1 end @@ -263,7 +263,7 @@ function M.refresh_entries(entries, cwd, parent_node, status) if prev then idx = entries_idx[prev] + 1 end - table.insert(entries, idx, n) + table.insert(nodes, idx, n) entries_idx[name] = idx cached_entries[idx] = name else @@ -277,15 +277,15 @@ function M.refresh_entries(entries, cwd, parent_node, status) end if next_node then - table.insert(entries, 1, next_node) + table.insert(nodes, 1, next_node) end if new_nodes_added then - utils.merge_sort(entries, node_comparator) + utils.merge_sort(nodes, node_comparator) end end -function M.populate(entries, cwd, parent_node, status) +function M.explore(entries, cwd, parent_node, status) local handle = luv.fs_scandir(cwd) if type(handle) == 'string' then api.nvim_err_writeln(handle) @@ -327,7 +327,7 @@ function M.populate(entries, cwd, parent_node, status) 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.populate(entries, child_node.absolute_path, child_node, status) + M.explore(entries, child_node.absolute_path, child_node, status) return end end diff --git a/lua/nvim-tree/lib.lua b/lua/nvim-tree/lib.lua index a1a45eee..9d3330ce 100644 --- a/lua/nvim-tree/lib.lua +++ b/lua/nvim-tree/lib.lua @@ -3,13 +3,11 @@ local luv = vim.loop local renderer = require'nvim-tree.renderer' local diagnostics = require'nvim-tree.diagnostics' -local pops = require'nvim-tree.populate' +local explorer = require'nvim-tree.explorer' local utils = require'nvim-tree.utils' local view = require'nvim-tree.view' local events = require'nvim-tree.events' local git = require'nvim-tree.git' -local populate = pops.populate -local refresh_entries = pops.refresh_entries local first_init_done = false @@ -23,7 +21,7 @@ M.Tree = { local function load_children(cwd, children, parent) git.load_project_status(cwd, function(git_statuses) - populate(children, cwd, parent, git_statuses) + explorer.explore(children, cwd, parent, git_statuses) M.redraw() end) end @@ -141,7 +139,7 @@ end local function refresh_nodes(node, projects) local project_root = git.get_project_root(node.absolute_path or node.cwd) - refresh_entries(node.entries, node.absolute_path or node.cwd, node, projects[project_root] or {}) + explorer.refresh(node.entries, node.absolute_path or node.cwd, node, projects[project_root] or {}) for _, entry in ipairs(node.entries) do if entry.entries and entry.open then refresh_nodes(entry, projects) @@ -219,7 +217,7 @@ function M.set_index_and_redraw(fname) if path_matches then if #node.entries == 0 then node.open = true - populate(node.entries, node.absolute_path, node, {}) + explorer.explore(node.entries, node.absolute_path, node, {}) git.load_project_status(node.absolute_path, function(status) if status.dirs or status.files then reload_node_status(node, git.projects) @@ -384,12 +382,12 @@ function M.parent_node(node, should_close) end function M.toggle_ignored() - pops.config.filter_ignored = not pops.config.filter_ignored + explorer.config.filter_ignored = not explorer.config.filter_ignored return M.refresh_tree() end function M.toggle_dotfiles() - pops.config.filter_dotfiles = not pops.config.filter_dotfiles + explorer.config.filter_dotfiles = not explorer.config.filter_dotfiles return M.refresh_tree() end