fix(git): fix 'git check-ignore' option (#153)

Author: cseickel

lua/neo-tree/git/ignored.lua

@@ -9,8 +9,8 @@ M.load_ignored_per_directory = function(path)
     log.error("load_ignored_per_directory: path must be a string")
     return {}
   end
-  path = utils.path_join(path, "*")
-  local cmd = 'git check-ignore "' .. path .. '"'
+  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
@@ -19,6 +19,15 @@ M.load_ignored_per_directory = function(path)
     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
 

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

@@ -173,7 +173,7 @@ end
 local open_with_cmd = function(state, open_cmd, toggle_directory)
   local tree = state.tree
   local success, node = pcall(tree.get_node, tree)
-  if not success and node then
+  if not (success and node) then
     log.debug("Could not get node.")
     return
   end

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

@@ -25,6 +25,7 @@ M.show_filter = function(state, search_as_you_type, fuzzy_finder_mode)
     vim.api.nvim_win_set_height(winid, row)
     popup_options = popups.popup_options("Enter Filter Pattern:", width, {
       relative = "win",
+      winid = winid,
       position = {
         row = row,
         col = 0,
@@ -36,6 +37,7 @@ M.show_filter = function(state, search_as_you_type, fuzzy_finder_mode)
     local row = height - 3
     popup_options = popups.popup_options("Enter Filter Pattern:", width, {
       relative = "win",
+      winid = winid,
       position = {
         row = row,
         col = 0,

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