fix: explicitly load hidden files in git check-ignore, fixes #226

Author: cseickel

lua/neo-tree/git/ignored.lua

@@ -5,13 +5,13 @@ local git_utils = require("neo-tree.git.utils")
 local M = {}
 local sep = utils.path_separator
 
-M.load_ignored_per_directory = function(path)
+local load_ignored_per_directory_internal = function(path, pattern)
   if type(path) ~= "string" then
     log.error("load_ignored_per_directory: path must be a string")
     return {}
   end
   local esc_path = vim.fn.shellescape(path)
-  local cmd = string.format("git -C %s check-ignore %s%s*", esc_path, esc_path, sep)
+  local cmd = string.format("git -C %s check-ignore %s%s*", esc_path, esc_path, pattern)
   local result = vim.fn.systemlist(cmd)
   if vim.v.shell_error == 128 then
     if type(result) == "table" then
@@ -37,6 +37,14 @@ M.load_ignored_per_directory = function(path)
   return result
 end
 
+M.load_ignored_per_directory = function(path)
+  local ignored = load_ignored_per_directory_internal(path, sep)
+  -- we need to load hidden separately because I can't find a way to get both in one call
+  local hidden = load_ignored_per_directory_internal(path, sep .. ".")
+  vim.list_extend(ignored, hidden)
+  return ignored
+end
+
 M.load_ignored = function(path)
   local git_root = git_utils.get_repository_root(path)
   if not git_root then

lua/neo-tree/sources/common/file-items.lua

@@ -90,13 +90,16 @@ function create_item(context, path, _type)
     if f.never_show[name] then
       item.filtered_by = item.filtered_by or {}
       item.filtered_by.never_show = true
-    elseif f.hide_by_name[name] then
+    end
+    if f.hide_by_name[name] then
       item.filtered_by = item.filtered_by or {}
       item.filtered_by.name = true
-    elseif f.hide_dotfiles and string.sub(name, 1, 1) == "." then
+    end
+    if f.hide_dotfiles and string.sub(name, 1, 1) == "." then
       item.filtered_by = item.filtered_by or {}
       item.filtered_by.dotfiles = true
-    elseif f.hide_gitignored and utils.truthy(state.git_ignored) then
+    end
+    if f.hide_gitignored and utils.truthy(state.git_ignored) then
       if git.is_ignored(state.git_ignored, path, _type) then
         item.filtered_by = item.filtered_by or {}
         item.filtered_by.gitignored = true