fix(git): fix "git check-ignore" option

Author: cseickel

lua/neo-tree/git/ignored.lua

@@ -1,4 +1,3 @@
-local Job = require("plenary.job")
 local utils = require("neo-tree.utils")
 local log = require("neo-tree.log")
 local git_utils = require("neo-tree.git.utils")
@@ -10,36 +9,26 @@ M.load_ignored_per_directory = function(path)
     log.error("load_ignored_per_directory: path must be a string")
     return {}
   end
-
-  local result = {}
-  local job = Job:new({
-    cwd = path,
-    command = "git",
-    args = { "check-ignore", "*" },
-    enabled_recording = false,
-    record = true,
-    on_exit = function(job, retval)
-      result = job:result()
-      log.info("load_ignored_per_directory: " .. path .. ": " .. #result .. " ignored files")
-      if retval == 128 then
-        if utils.truthy(result) and vim.startswith(result[1], "fatal: not a git repository") then
-          result = {}
-          log.error(result)
-        else
-          result = {}
-          log.error("Failed to load ignored files for ", path, ": ", result)
-        end
-      end
+  path = vim.fn.shellescape(path) .. utils.path_separator .. "*"
+  local cmd = "git check-ignore " .. path
+  local result = vim.fn.systemlist(cmd)
+  if vim.v.shell_error == 128 then
+    if utils.truthy(result) and vim.startswith(result[1], "fatal: not a git repository") then
+      return {}
     end
-  })
-
-  local success, msg = pcall(job.sync, job, 200, 5)
-  if success then
-    return result
-  else
-    log.error("Failed to load ignored files for ", path, ": ", msg)
+    log.error("Failed to load ignored files for ", path, ": ", result)
     return {}
   end
+
+  --check-ignore does not indicate directories the same as 'status' so we need to
+  --add the trailing slash to the path manually.
+  for i, item in ipairs(result) do
+    local stat = vim.loop.fs_stat(item)
+    if stat and stat.type == "directory" then
+      result[i] = item .. utils.path_separator
+    end
+  end
+  return result
 end
 
 M.load_ignored = function(path)

lua/neo-tree/sources/filesystem/lib/fs_scan.lua

@@ -162,6 +162,14 @@ M.get_items_async = function(state, parent_id, path_to_reveal, callback)
         end
       end
       state.git_ignored = ignored
+    else
+      -- just update the ignored list for this dir if we are using the per dir 'check-ignore' option
+      if
+        state.filters.respect_gitignore and state.filters.gitignore_source == "git check-ignore"
+      then
+        state.git_ignored = state.git_ignored or {}
+        vim.list_extend(state.git_ignored, git.load_ignored_per_directory(parent_id))
+      end
     end
     do_scan(context, parent_id or state.path)
   end