From a342de09490b529b12f9a6202e8f04f024ee148a Mon Sep 17 00:00:00 2001 From: chomosuke Date: Tue, 6 Dec 2022 22:34:50 +1100 Subject: [PATCH] fixed update_git_status in reloaders not tested --- lua/nvim-tree/actions/reloaders/reloaders.lua | 9 ++------- lua/nvim-tree/renderer/components/git.lua | 4 +++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lua/nvim-tree/actions/reloaders/reloaders.lua b/lua/nvim-tree/actions/reloaders/reloaders.lua index 78f6cb31..16e6325f 100644 --- a/lua/nvim-tree/actions/reloaders/reloaders.lua +++ b/lua/nvim-tree/actions/reloaders/reloaders.lua @@ -3,6 +3,7 @@ local view = require "nvim-tree.view" local renderer = require "nvim-tree.renderer" local explorer_module = require "nvim-tree.explorer" local core = require "nvim-tree.core" +local explorer_common = require "nvim-tree.explorer.common" local M = {} @@ -20,14 +21,8 @@ end function M.reload_node_status(parent_node, projects) local project_root = git.get_project_root(parent_node.absolute_path) local status = projects[project_root] or {} - require("nvim-tree.log").line("dev", "reloaders") - -- TODO: when is this called for _, node in ipairs(parent_node.nodes) do - if node.nodes then - node.git_status = status.dirs and status.dirs[node.absolute_path] - else - node.git_status = status.files and status.files[node.absolute_path] - end + explorer_common.update_git_status(node, explorer_common.is_git_ignored(parent_node), status) if node.nodes and #node.nodes > 0 then M.reload_node_status(node, projects) end diff --git a/lua/nvim-tree/renderer/components/git.lua b/lua/nvim-tree/renderer/components/git.lua index 045842bf..65e49e77 100644 --- a/lua/nvim-tree/renderer/components/git.lua +++ b/lua/nvim-tree/renderer/components/git.lua @@ -85,7 +85,9 @@ local function get_icons_(node) end end - table.sort(iconss, function(a, b) return a.ord < b.ord end) + table.sort(iconss, function(a, b) + return a.ord < b.ord + end) return iconss end