fix: add missing open_with_window_picker command, refactor common command inheritance

Author: cseickel

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

@@ -8,8 +8,8 @@ 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")
+local refresh = utils.wrap(manager.refresh, "buffers")
+local redraw = utils.wrap(manager.redraw, "buffers")
 
 M.add = function(state)
   cc.add(state, refresh)
@@ -27,10 +27,6 @@ M.buffer_delete = function(state)
   end
 end
 
-M.close_node = cc.close_node
-M.close_all_nodes = cc.close_all_nodes
-M.close_window = cc.close_window
-
 ---Marks node as copied, so that it can be pasted somewhere else.
 M.copy_to_clipboard = function(state)
   cc.copy_to_clipboard(state, redraw)
@@ -66,11 +62,6 @@ M.navigate_up = function(state)
   buffers.navigate(state, parent_path)
 end
 
-M.open = cc.open
-M.open_split = cc.open_split
-M.open_vsplit = cc.open_vsplit
-M.open_tabnew = cc.open_tabnew
-
 M.refresh = refresh
 
 M.rename = function(state)
@@ -85,6 +76,6 @@ M.set_root = function(state)
   end
 end
 
-M.toggle_node = cc.toggle_node
+cc._add_common_commands(M)
 
 return M

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

@@ -19,6 +19,18 @@ end
 
 local M = {}
 
+---Adds all missing common commands to the given module
+---@param to_source_command_module table The commands modeul for a source
+M._add_common_commands = function(to_source_command_module)
+ for name, func in pairs(M) do
+   if type(name) == "string" and not name:match("^_") then
+      if not to_source_command_module[name] then
+        to_source_command_module[name] = func
+      end
+   end
+ end
+end
+
 ---Add a new file or dir at the current node
 ---@param state table The state of the source
 ---@param callback function The callback to call when the command is done. Called with the parent node as the argument.

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

@@ -23,10 +23,6 @@ M.clear_filter = function(state)
   fs.reset_search(state, true)
 end
 
-M.close_all_nodes = cc.close_all_nodes
-M.close_node = cc.close_node
-M.close_window = cc.close_window
-
 M.copy = function(state)
   cc.copy(state, refresh)
 end
@@ -45,8 +41,6 @@ M.move = function(state)
   cc.move(state, refresh)
 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, utils.wrap(fs.show_new_children, state))
@@ -115,8 +109,6 @@ M.set_root = function(state)
   end
 end
 
-M.show_debug_info = cc.show_debug_info
-
 ---Toggles whether hidden files are shown or not.
 M.toggle_hidden = function(state)
   state.filtered_items.visible = not state.filtered_items.visible
@@ -134,4 +126,6 @@ M.toggle_node = function (state)
   cc.toggle_node(state, utils.wrap(fs.toggle_directory, state))
 end
 
+cc._add_common_commands(M)
+
 return M

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

@@ -98,10 +98,6 @@ M.add_directory = function(state)
   cc.add_directory(state, refresh)
 end
 
-M.close_node = cc.close_node
-M.close_all_nodes = cc.close_all_nodes
-M.close_window = cc.close_window
-
 ---Marks node as copied, so that it can be pasted somewhere else.
 M.copy_to_clipboard = function(state)
   cc.copy_to_clipboard(state, redraw)
@@ -120,8 +116,6 @@ M.move = function(state)
   cc.move(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, refresh)
@@ -131,17 +125,12 @@ M.delete = function(state)
   cc.delete(state, refresh)
 end
 
-M.open = cc.open
-M.open_split = cc.open_split
-M.open_vsplit = cc.open_vsplit
-M.open_tabnew = cc.open_tabnew
-
 M.refresh = refresh
 
 M.rename = function(state)
   cc.rename(state, refresh)
 end
 
-M.toggle_node = cc.toggle_node
+cc._add_common_commands(M)
 
 return M