fix(action): prevent collapse_dirs from trying to open file (#351)

Previously, opening a directory with one file with `collapse_dirs` set
to true would result in the `open_dir` action trying to refresh the
picker with that file as the new path. This caused `fd` to error out
since a file isn't a valid folder. This was caused by a bad truthy
check.

Corrected this behavior to open folders regularly with `collapse_dirs`
if the selected folder only contains one file.

closes #348

Author: jamestrew

lua/telescope/_extensions/file_browser/actions.lua

@@ -826,42 +826,57 @@ fb_actions.path_separator = function(prompt_bufnr)
   local dir = Path:new(current_picker.finder.path .. os_sep .. current_picker:_get_prompt() .. os_sep)
 
   if current_picker.finder.files and dir:exists() and dir:is_dir() then
-    fb_actions.open_dir(prompt_bufnr, dir.filename)
+    fb_actions.open_dir(prompt_bufnr, nil, dir.filename)
   else
     vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(os_sep, true, false, true), "tn", false)
   end
 end
 
-fb_actions.open_dir = function(prompt_bufnr, dir)
-  local current_picker = action_state.get_current_picker(prompt_bufnr)
-  local finder = current_picker.finder
-  local entry = action_state.get_selected_entry()
+---get directory path to open based on `collapse_dirs` options
+---@param finder any
+---@param path string
+---@param upward boolean whether to "cd" upwards
+---@return string? #path string
+local function open_dir_path(finder, path, upward)
+  path = vim.loop.fs_realpath(path) or ""
+  if path == "" then
+    return
+  end
 
-  if not vim.loop.fs_access(entry.path, "X") then
+  if not vim.loop.fs_access(path, "X") then
     fb_utils.notify("select", { level = "WARN", msg = "Permission denied" })
     return
   end
 
-  local path = vim.loop.fs_realpath(dir:match("^" .. os_sep) and dir or entry.path)
+  if not finder.files or not finder.collapse_dirs then
+    return path
+  end
 
-  if finder.files and finder.collapse_dirs then
-    local upwards = path == Path:new(finder.path):parent():absolute()
-    while true do
-      local dirs = scan.scan_dir(path, { add_dirs = true, depth = 1, hidden = true })
-      if #dirs == 1 and vim.fn.isdirectory(dirs[1]) then
-        path = upwards and Path:new(path):parent():absolute() or dirs[1]
-        -- make sure it's upper bound (#dirs == 1 implicitly reflects lower bound)
-        if path == Path:new(path):parent():absolute() then
-          break
-        end
-      else
-        break
-      end
+  while true do
+    local dirs = scan.scan_dir(path, { add_dirs = true, depth = 1, hidden = true })
+    if #dirs == 1 and vim.fn.isdirectory(dirs[1]) == 1 then
+      path = upward and Path:new(path):parent():absolute() or dirs[1]
+    else
+      break
     end
   end
+  return path
+end
+
+---comment open directory and refresh picker
+---@param prompt_bufnr integer
+---@param _ any select type
+---@param dir string? priority dir path
+fb_actions.open_dir = function(prompt_bufnr, _, dir)
+  local current_picker = action_state.get_current_picker(prompt_bufnr)
+  local finder = current_picker.finder
+  local entry = action_state.get_selected_entry()
+
+  local path = dir or entry.path
+  local upward = path == Path:new(finder.path):parent():absolute()
 
   finder.files = true
-  finder.path = path
+  finder.path = open_dir_path(finder, path, upward)
   fb_utils.redraw_border_title(current_picker)
   current_picker:refresh(
     finder,

lua/telescope/_extensions/file_browser/config.lua

@@ -1,4 +1,5 @@
 local fb_actions = require "telescope._extensions.file_browser.actions"
+local fb_utils = require "telescope._extensions.file_browser.utils"
 local Path = require "plenary.path"
 
 local action_state = require "telescope.actions.state"
@@ -47,7 +48,7 @@ _TelescopeFileBrowserConfig = {
   attach_mappings = function(_, _)
     local entry_is_dir = function()
       local entry = action_state.get_selected_entry()
-      return entry and entry.Path:is_dir()
+      return entry and fb_utils.is_dir(entry.Path)
     end
 
     local entry_is_nil = function(prompt_bufnr)