fix: remove extra use_git_status_colors override, fixes #421

also clear up some type hint related errors

Author: cseickel

lua/neo-tree.lua

@@ -28,7 +28,7 @@ local check_source = function(source_name)
 end
 
 local get_position = function(source_name)
-  local pos = utils.get_value(M, "config." .. source_name .. ".window.position", "left")
+  local pos = utils.get_value(M, "config." .. source_name .. ".window.position", "left", false)
   return pos
 end
 
@@ -45,7 +45,7 @@ M.close_all_except = function(source_name)
   local target_pos = get_position(source_name)
   for _, name in ipairs(sources) do
     if name ~= source_name then
-      local pos = utils.get_value(M, "config." .. name .. ".window.position", "left")
+      local pos = utils.get_value(M, "config." .. name .. ".window.position", "left", false)
       if pos == target_pos then
         manager.close(name)
       end

lua/neo-tree/defaults.lua

@@ -164,7 +164,6 @@ local config = {
         content = {
           {
             "name",
-            use_git_status_colors = true,
             zindex = 10
           },
           -- {

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

@@ -295,7 +295,7 @@ M.name = function(config, node, state)
   else
     local filtered_by = M.filtered_by(config, node, state)
     highlight = filtered_by.highlight or highlight
-    if config.use_git_status_colors == nil or config.use_git_status_colors then
+    if config.use_git_status_colors then
       local git_status = state.components.git_status({}, node, state)
       if git_status and git_status.highlight then
         highlight = git_status.highlight

lua/neo-tree/sources/manager.lua

@@ -376,8 +376,9 @@ M.float = function(source_name)
 end
 
 ---Focus the window, opening it if it is not already open.
----@param path_to_reveal string Node to focus after the items are loaded.
----@param callback function Callback to call after the items are loaded.
+---@param source_name string Source name.
+---@param path_to_reveal string|nil Node to focus after the items are loaded.
+---@param callback function|nil Callback to call after the items are loaded.
 M.focus = function(source_name, path_to_reveal, callback)
   local state = M.get_state(source_name)
   state.current_position = nil

lua/neo-tree/ui/inputs.lua

@@ -7,7 +7,7 @@ local M = {}
 
 local should_use_popup_input = function()
   local nt = require("neo-tree")
-  return utils.get_value(nt.config, "use_popups_for_input", true)
+  return utils.get_value(nt.config, "use_popups_for_input", true, false)
 end
 
 M.show_input = function(input, callback)

lua/neo-tree/ui/renderer.lua

@@ -316,7 +316,7 @@ end
 M.focus_node = function(state, id, do_not_focus_window, relative_movement, bottom_scroll_padding)
   if not id and not relative_movement then
     log.debug("focus_node called with no id and no relative movement")
-    return nil
+    return false
   end
   relative_movement = relative_movement or 0
   bottom_scroll_padding = bottom_scroll_padding or 0

lua/neo-tree/utils.lua

@@ -248,7 +248,7 @@ end
 ---@param defaultValue any The default value to return if the value is nil.
 ---@param strict_type_check boolean Whether to require the type of the value is
 ---the same as the default value.
----@return table table The value at the path or the default value.
+---@return table|nil table The value at the path or the default value.
 M.get_value = function(sourceObject, valuePath, defaultValue, strict_type_check)
   if sourceObject == nil then
     return defaultValue
@@ -435,7 +435,7 @@ M.open_file = function(state, path, open_cmd)
       if vim.bo.filetype == "neo-tree" then
         -- Neo-tree must be the only window, restore it's status as a sidebar
         local winid = vim.api.nvim_get_current_win()
-        local width = M.get_value(state, "window.width", 40)
+        local width = M.get_value(state, "window.width", 40, false)
         result, err = pcall(vim.cmd, "vsplit " .. escaped_path)
         vim.api.nvim_win_set_width(winid, width)
       else
@@ -518,6 +518,7 @@ end
 ---Remove the path separator from the end of a path in a cross-platform way.
 ---@param path string The path to remove the separator from.
 ---@return string string The path without any trailing separator.
+---@return number count The number of separators removed.
 M.remove_trailing_slash = function(path)
   if M.is_windows then
     return path:gsub("\\$", "")
@@ -612,7 +613,8 @@ end
 
 ---Split a path into a parentPath and a name.
 ---@param path string The path to split.
----@return table table parentPath, name
+---@return string|nil parentPath
+---@return string|nil name
 M.split_path = function(path)
   if not path then
     return nil, nil
@@ -627,7 +629,7 @@ M.split_path = function(path)
     if #parts == 1 then
       parentPath = parentPath .. M.path_separator
     elseif parentPath == "" then
-      parentPath = nil
+      return nil, name
     end
   else
     parentPath = M.path_separator .. parentPath