fix(files): correct refresh() refs that were missed in the refactor from #69

Author: cseickel

lua/neo-tree/defaults.lua

@@ -1,3 +1,5 @@
+local highlights = require("neo-tree.ui.highlights")
+
 local config = {
   -- The default_source is the one used when calling require('neo-tree').show()
   -- without a source argument.
@@ -41,6 +43,114 @@ local config = {
   --      print(args.source, " moved to ", args.destination)
   --    end
   --  },
-  --}
+  --},
+  filesystem = {
+    follow_current_file = false, -- This will find and focus the file in the
+    -- active buffer every time the current file is changed while the tree is open.
+    use_libuv_file_watcher = false, -- This will use the OS level file watchers
+    -- to detect changes instead of relying on nvim autocmd events.
+    window = {
+      -- see https://github.com/MunifTanjim/nui.nvim/tree/main/lua/nui/popup
+      -- for possible options. These can also be functions that return these
+      -- options.
+      position = "left", -- left, right, float
+      width = 40, -- applies to left and right positions
+      -- settings that apply to float position only
+      popup = {
+        size = {
+          height = "80%",
+          width = "50%",
+        },
+        position = "50%", -- 50% means center it
+        -- you can also specify border here, if you want a different setting from
+        -- the global popup_border_style.
+      },
+      -- Mappings for tree window. See https://github.com/nvim-neo-tree/neo-tree.nvim/blob/main/lua/neo-tree/sources/filesystem/commands.lua
+      -- for built-in commands. You can also create your own commands by
+      -- providing a function instead of a string. See the built-in
+      -- commands for examples.
+      mappings = {
+        ["<2-LeftMouse>"] = "open",
+        ["<cr>"] = "open",
+        ["S"] = "open_split",
+        ["s"] = "open_vsplit",
+        ["C"] = "close_node",
+        ["z"] = "close_all_nodes",
+        ["<bs>"] = "navigate_up",
+        ["."] = "set_root",
+        ["H"] = "toggle_hidden",
+        ["I"] = "toggle_gitignore",
+        ["R"] = "refresh",
+        ["/"] = "filter_as_you_type",
+        ["f"] = "filter_on_submit",
+        ["<C-x>"] = "clear_filter",
+        ["a"] = "add",
+        ["d"] = "delete",
+        ["r"] = "rename",
+        ["c"] = "copy_to_clipboard",
+        ["x"] = "cut_to_clipboard",
+        ["p"] = "paste_from_clipboard",
+      },
+    },
+    --find_command = "fd",
+    search_limit = 50, -- max number of search results when using filters
+    filters = {
+      show_hidden = false,
+      respect_gitignore = true,
+    },
+    bind_to_cwd = true, -- true creates a 2-way binding between vim's cwd and neo-tree's root
+    -- This section provides the renderers that will be used to render the tree.
+    -- The first level is the node type.
+    -- For each node type, you can specify a list of components to render.
+    -- Components are rendered in the order they are specified.
+    -- The first field in each component is the name of the function to call.
+    -- The rest of the fields are passed to the function as the "config" argument.
+    renderers = {
+      directory = {
+        {
+          "icon",
+          folder_closed = "",
+          folder_open = "",
+          padding = " ",
+        },
+        { "current_filter" },
+        { "name" },
+        -- {
+        --   "symlink_target",
+        --   highlight = highlights.SYMBOLIC_LINK_TARGET,
+        -- },
+        {
+          "clipboard",
+          highlight = highlights.DIM_TEXT,
+        },
+        { "diagnostics", errors_only = true },
+        --{ "git_status" },
+      },
+      file = {
+        {
+          "icon",
+          default = "*",
+          padding = " ",
+        },
+        {
+          "name",
+          use_git_status_colors = true,
+        },
+        -- {
+        --   "symlink_target",
+        --   highlight = highlights.SYMBOLIC_LINK_TARGET,
+        -- },
+        {
+          "clipboard",
+          highlight = highlights.DIM_TEXT,
+        },
+        { "diagnostics" },
+        {
+          "git_status",
+          highlight = highlights.DIM_TEXT,
+        },
+      },
+    },
+  },
 }
 return config

lua/neo-tree/sources/buffers/commands.lua

@@ -8,38 +8,41 @@ local manager = require("neo-tree.sources.manager")
 
 local M = {}
 
+local refresh = utils.wrap(manager.refresh, "git_status")
+local redraw = utils.wrap(manager.redraw, "git_status")
+
 M.add = function(state)
-  cc.add(state, M.refresh)
+  cc.add(state, refresh)
 end
 
 M.buffer_delete = function(state)
   local node = state.tree:get_node()
   if node then
     vim.api.nvim_buf_delete(node.extra.bufnr, { force = false, unload = false })
-    M.refresh()
+    refresh()
   end
 end
 M.close_node = cc.close_node
 
 ---Marks node as copied, so that it can be pasted somewhere else.
 M.copy_to_clipboard = function(state)
-  cc.copy_to_clipboard(state, utils.wrap(manager.redraw, "buffers"))
+  cc.copy_to_clipboard(state, redraw)
 end
 
 ---Marks node as cut, so that it can be pasted (moved) somewhere else.
 M.cut_to_clipboard = function(state)
-  cc.cut_to_clipboard(state, utils.wrap(manager.redraw, "buffers"))
+  cc.cut_to_clipboard(state, redraw)
 end
 
 M.show_debug_info = cc.show_debug_info
 
 ---Pastes all items from the clipboard to the current directory.
 M.paste_from_clipboard = function(state)
-  cc.paste_from_clipboard(state, M.refresh)
+  cc.paste_from_clipboard(state, refresh)
 end
 
 M.delete = function(state)
-  cc.delete(state, M.refresh)
+  cc.delete(state, refresh)
 end
 
 ---Navigate up one level.
@@ -52,10 +55,10 @@ M.open = cc.open
 M.open_split = cc.open_split
 M.open_vsplit = cc.open_vsplit
 
-M.refresh = utils.wrap(manager.refresh, "buffers")
+M.refresh = refresh
 
 M.rename = function(state)
-  cc.rename(state, M.refresh)
+  cc.rename(state, refresh)
 end
 
 M.set_root = function(state)

lua/neo-tree/sources/filesystem/commands.lua

@@ -7,6 +7,8 @@ local filter = require("neo-tree.sources.filesystem.lib.filter")
 local manager = require("neo-tree.sources.manager")
 
 local M = {}
+local refresh = utils.wrap(manager.refresh, "filesystem")
+local redraw = utils.wrap(manager.redraw, "filesystem")
 
 M.add = function(state)
   cc.add(state, fs.show_new_children)
@@ -21,12 +23,12 @@ M.close_node = cc.close_node
 
 ---Marks node as copied, so that it can be pasted somewhere else.
 M.copy_to_clipboard = function(state)
-  cc.copy_to_clipboard(state, fs.redraw)
+  cc.copy_to_clipboard(state, redraw)
 end
 
 ---Marks node as cut, so that it can be pasted (moved) somewhere else.
 M.cut_to_clipboard = function(state)
-  cc.cut_to_clipboard(state, fs.redraw)
+  cc.cut_to_clipboard(state, redraw)
 end
 
 M.show_debug_info = cc.show_debug_info
@@ -37,7 +39,7 @@ M.paste_from_clipboard = function(state)
 end
 
 M.delete = function(state)
-  cc.delete(state, fs.refresh)
+  cc.delete(state, refresh)
 end
 
 ---Shows the filter input, which will filter the tree.
@@ -74,16 +76,10 @@ M.open_vsplit = function(state)
   cc.open_vsplit(state, fs.toggle_directory)
 end
 
-M.refresh = utils.wrap(manager.refresh, "filesystem")
+M.refresh = refresh
 
 M.rename = function(state)
-  cc.rename(state, function(original_path, new_path)
-    -- This is where you would do something like fix references to the file
-    -- with an LSP server.
-    -- <YOUR CODE HERE>
-    -- Don't forget to call fs.refresh() after you're done.
-    M.refresh()
-  end)
+  cc.rename(state, refresh)
 end
 
 M.set_root = function(state)
@@ -100,13 +96,13 @@ end
 ---Toggles whether hidden files are shown or not.
 M.toggle_hidden = function(state)
   state.filters.show_hidden = not state.filters.show_hidden
-  M.refresh()
+  refresh()
 end
 
 ---Toggles whether the tree is filtered by gitignore or not.
 M.toggle_gitignore = function(state)
   state.filters.respect_gitignore = not state.filters.respect_gitignore
-  M.refresh()
+  refresh()
 end
 
 return M