Merge branch 'master' into chore/action_cb_help_poc

Author: alex-courtis

CONTRIBUTING.md

@@ -25,3 +25,9 @@ When adding new options, you should declare the defaults in the main `nvim-tree.
 Once you did, you should run the `scripts/update-help.sh`.
 
 Documentation for options should also be added, see how this is done after `nvim-tree.disable_netrw` in the `nvim-tree-lua.txt` file.
+
+## Pull Request
+
+Please reference any issues in the description e.g. "resolves #1234".
+
+Please check "allow edits by maintainers" to allow nvim-tree developers to make small changes such as documentation tweaks.

doc/nvim-tree-lua.txt

@@ -414,6 +414,10 @@ local function setup_autocommands(opts)
       end,
     })
   end
+
+  if opts.view.float.enable then
+    create_nvim_tree_autocmd("WinLeave", { pattern = "NvimTree_*", callback = view.close })
+  end
 end
 
 local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
@@ -447,13 +451,23 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
     number = false,
     relativenumber = false,
     signcolumn = "yes",
-    -- @deprecated
     mappings = {
       custom_only = false,
       list = {
         -- user mappings go here
       },
     },
+    float = {
+      enable = false,
+      open_win_config = {
+        relative = "editor",
+        border = "rounded",
+        width = 30,
+        height = 30,
+        row = 1,
+        col = 1,
+      },
+    },
   },
   renderer = {
     add_trailing = false,
@@ -462,13 +476,15 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
     full_name = false,
     highlight_opened_files = "none",
     root_folder_modifier = ":~",
+    indent_width = 2,
     indent_markers = {
       enable = false,
       inline_arrows = true,
       icons = {
         corner = "└",
         edge = "│",
         item = "│",
+        bottom = "─",
         none = " ",
       },
     },
@@ -562,6 +578,15 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
       max_folder_discovery = 300,
       exclude = {},
     },
+    file_popup = {
+      open_win_config = {
+        col = 1,
+        row = 1,
+        relative = "cursor",
+        border = "shadow",
+        style = "minimal",
+      },
+    },
     open_file = {
       quit_on_open = false,
       resize_window = true,
@@ -606,6 +631,10 @@ local function merge_options(conf)
   return vim.tbl_deep_extend("force", DEFAULT_OPTS, conf or {})
 end
 
+local FIELD_SKIP_VALIDATE = {
+  open_win_config = true,
+}
+
 local FIELD_OVERRIDE_TYPECHECK = {
   width = { string = true, ["function"] = true, number = true },
   height = { string = true, ["function"] = true, number = true },
@@ -623,25 +652,27 @@ local function validate_options(conf)
     end
 
     for k, v in pairs(user) do
-      local invalid
-      local override_typecheck = FIELD_OVERRIDE_TYPECHECK[k] or {}
-      if def[k] == nil then
-        -- option does not exist
-        invalid = string.format("unknown option: %s%s", prefix, k)
-      elseif type(v) ~= type(def[k]) and not override_typecheck[type(v)] then
-        -- option is of the wrong type and is not a function
-        invalid = string.format("invalid option: %s%s expected: %s actual: %s", prefix, k, type(def[k]), type(v))
-      end
+      if not FIELD_SKIP_VALIDATE[k] then
+        local invalid
+        local override_typecheck = FIELD_OVERRIDE_TYPECHECK[k] or {}
+        if def[k] == nil then
+          -- option does not exist
+          invalid = string.format("unknown option: %s%s", prefix, k)
+        elseif type(v) ~= type(def[k]) and not override_typecheck[type(v)] then
+          -- option is of the wrong type and is not a function
+          invalid = string.format("invalid option: %s%s expected: %s actual: %s", prefix, k, type(def[k]), type(v))
+        end
 
-      if invalid then
-        if msg then
-          msg = string.format("%s | %s", msg, invalid)
+        if invalid then
+          if msg then
+            msg = string.format("%s | %s", msg, invalid)
+          else
+            msg = string.format("%s", invalid)
+          end
+          user[k] = nil
         else
-          msg = string.format("%s", invalid)
+          validate(v, def[k], prefix .. k .. ".")
         end
-        user[k] = nil
-      else
-        validate(v, def[k], prefix .. k .. ".")
       end
     end
   end

lua/nvim-tree.lua

@@ -27,12 +27,20 @@ function M.fn(fname)
 
   local line = core.get_nodes_starting_line()
 
+  local absolute_paths_searched = {}
+
   local found = Iterator.builder(core.get_explorer().nodes)
     :matcher(function(node)
       return node.absolute_path == fname_real or node.link_to == fname_real
     end)
     :applier(function(node)
       line = line + 1
+
+      if vim.tbl_contains(absolute_paths_searched, node.absolute_path) then
+        return
+      end
+      table.insert(absolute_paths_searched, node.absolute_path)
+
       local abs_match = vim.startswith(fname_real, node.absolute_path .. utils.path_separator)
       local link_match = node.link_to and vim.startswith(fname_real, node.link_to .. utils.path_separator)
 

lua/nvim-tree/actions/finders/find-file.lua

@@ -7,42 +7,54 @@ local find_file = require("nvim-tree.actions.finders.find-file").fn
 
 local M = {}
 
-local function search(dir, input_path)
-  local path, name, stat, handle, _
+local function search(search_dir, input_path)
+  local realpaths_searched = {}
 
-  if not dir then
+  if not search_dir then
     return
   end
 
-  handle, _ = uv.fs_scandir(dir)
-  if not handle then
-    return
-  end
+  local function iter(dir)
+    local realpath, path, name, stat, handle, _
 
-  name, _ = uv.fs_scandir_next(handle)
-  while name do
-    path = dir .. "/" .. name
+    handle, _ = uv.fs_scandir(dir)
+    if not handle then
+      return
+    end
 
-    stat, _ = uv.fs_stat(path)
-    if not stat then
-      break
+    realpath, _ = uv.fs_realpath(dir)
+    if not realpath or vim.tbl_contains(realpaths_searched, realpath) then
+      return
     end
+    table.insert(realpaths_searched, realpath)
+
+    name, _ = uv.fs_scandir_next(handle)
+    while name do
+      path = dir .. "/" .. name
 
-    if not filters.should_ignore(path) then
-      if string.find(path, "/" .. input_path .. "$") then
-        return path
+      stat, _ = uv.fs_stat(path)
+      if not stat then
+        break
       end
 
-      if stat.type == "directory" then
-        path = search(path, input_path)
-        if path then
+      if not filters.should_ignore(path) then
+        if string.find(path, "/" .. input_path .. "$") then
           return path
         end
+
+        if stat.type == "directory" then
+          path = iter(path)
+          if path then
+            return path
+          end
+        end
       end
-    end
 
-    name, _ = uv.fs_scandir_next(handle)
+      name, _ = uv.fs_scandir_next(handle)
+    end
   end
+
+  return iter(search_dir)
 end
 
 function M.fn()

lua/nvim-tree/actions/finders/search-node.lua

@@ -108,7 +108,7 @@ function M.fn(node)
     end
     -- INFO: defer needed when reload is automatic (watchers)
     vim.defer_fn(function()
-      utils.focus_file(new_file_path)
+      utils.focus_file(utils.path_remove_trailing(new_file_path))
     end, 150)
   end)
 end

lua/nvim-tree/actions/fs/create-file.lua

@@ -3,10 +3,15 @@ local luv = vim.loop
 
 local utils = require "nvim-tree.utils"
 local events = require "nvim-tree.events"
+local view = require "nvim-tree.view"
 
 local M = {}
 
 local function close_windows(windows)
+  if view.View.float.enable and #a.nvim_list_wins() == 1 then
+    return
+  end
+
   for _, window in ipairs(windows) do
     if a.nvim_win_is_valid(window) then
       a.nvim_win_close(window, true)
@@ -18,11 +23,13 @@ local function clear_buffer(absolute_path)
   local bufs = vim.fn.getbufinfo { bufloaded = 1, buflisted = 1 }
   for _, buf in pairs(bufs) do
     if buf.name == absolute_path then
-      if buf.hidden == 0 and #bufs > 1 then
+      if buf.hidden == 0 and (#bufs > 1 or view.View.float.enable) then
         local winnr = a.nvim_get_current_win()
         a.nvim_set_current_win(buf.windows[1])
         vim.cmd ":bn"
-        a.nvim_set_current_win(winnr)
+        if not view.View.float.enable then
+          a.nvim_set_current_win(winnr)
+        end
       end
       a.nvim_buf_delete(buf.bufnr, { force = true })
       if M.close_window then

lua/nvim-tree/actions/fs/remove-file.lua

@@ -390,6 +390,7 @@ local DEFAULT_MAPPING_CONFIG = {
 function M.setup(opts)
   require("nvim-tree.actions.fs.trash").setup(opts)
   require("nvim-tree.actions.node.system-open").setup(opts)
+  require("nvim-tree.actions.node.file-popup").setup(opts)
   require("nvim-tree.actions.node.open-file").setup(opts)
   require("nvim-tree.actions.root.change-dir").setup(opts)
   require("nvim-tree.actions.fs.create-file").setup(opts)

lua/nvim-tree/actions/init.lua

@@ -28,16 +28,13 @@ local function setup_window(node)
   local max_width = vim.fn.max(vim.tbl_map(function(n)
     return #n
   end, lines))
-  local winnr = a.nvim_open_win(0, false, {
-    col = 1,
-    row = 1,
-    relative = "cursor",
+  local open_win_config = vim.tbl_extend("force", M.open_win_config, {
     width = max_width + 1,
     height = #lines,
-    border = "shadow",
     noautocmd = true,
-    style = "minimal",
+    zindex = 60,
   })
+  local winnr = a.nvim_open_win(0, false, open_win_config)
   current_popup = {
     winnr = winnr,
     file_path = node.absolute_path,
@@ -78,4 +75,8 @@ function M.toggle_file_info(node)
   })
 end
 
+function M.setup(opts)
+  M.open_win_config = opts.actions.file_popup.open_win_config
+end
+
 return M

lua/nvim-tree/actions/node/file-popup.lua

@@ -280,7 +280,7 @@ function M.fn(mode, filename)
 end
 
 function M.setup(opts)
-  M.quit_on_open = opts.actions.open_file.quit_on_open
+  M.quit_on_open = opts.actions.open_file.quit_on_open or opts.view.float.enable
   M.resize_window = opts.actions.open_file.resize_window
   if opts.actions.open_file.window_picker.chars then
     opts.actions.open_file.window_picker.chars = tostring(opts.actions.open_file.window_picker.chars):upper()

lua/nvim-tree/actions/node/open-file.lua

@@ -4,13 +4,15 @@ local watch = require "nvim-tree.explorer.watch"
 
 local M = {
   is_windows = vim.fn.has "win32" == 1,
+  is_wsl = vim.fn.has "wsl" == 1,
 }
 
 function M.folder(parent, absolute_path, name)
   local handle = uv.fs_scandir(absolute_path)
   local has_children = handle and uv.fs_scandir_next(handle) ~= nil
 
   return {
+    type = "directory",
     absolute_path = absolute_path,
     fs_stat = uv.fs_stat(absolute_path),
     group_next = nil, -- If node is grouped, this points to the next child dir/link node
@@ -23,9 +25,19 @@ function M.folder(parent, absolute_path, name)
   }
 end
 
-function M.is_executable(absolute_path, ext)
+function M.is_executable(parent, absolute_path, ext)
   if M.is_windows then
     return utils.is_windows_exe(ext)
+  elseif M.is_wsl then
+    if parent.is_wsl_windows_fs_path == nil then
+      -- Evaluate lazily when needed and do so only once for each parent
+      -- as 'wslpath' calls can get expensive in highly populated directories.
+      parent.is_wsl_windows_fs_path = utils.is_wsl_windows_fs_path(absolute_path)
+    end
+
+    if parent.is_wsl_windows_fs_path then
+      return utils.is_wsl_windows_fs_exe(ext)
+    end
   end
   return uv.fs_access(absolute_path, "X")
 end
@@ -34,8 +46,9 @@ function M.file(parent, absolute_path, name)
   local ext = string.match(name, ".?[^.]+%.(.*)") or ""
 
   return {
+    type = "file",
     absolute_path = absolute_path,
-    executable = M.is_executable(absolute_path, ext),
+    executable = M.is_executable(parent, absolute_path, ext),
     extension = ext,
     fs_stat = uv.fs_stat(absolute_path),
     name = name,
@@ -61,6 +74,7 @@ function M.link(parent, absolute_path, name)
   end
 
   return {
+    type = "link",
     absolute_path = absolute_path,
     fs_stat = uv.fs_stat(absolute_path),
     group_next = nil, -- If node is grouped, this points to the next child dir/link node