Merge remote-tracking branch 'origin/master' into 2415-highlight-overhaul

Author: alex-courtis

.github/workflows/semantic-pr-subject.yml

@@ -10,6 +10,6 @@ jobs:
   semantic-pr-subject:
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v5.3.0
+      - uses: amannn/action-semantic-pull-request@v5.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

doc/nvim-tree-lua.txt

@@ -796,7 +796,9 @@ Appends a trailing slash to folder names.
 
 *nvim-tree.renderer.group_empty*
 Compact folders that only contain a single folder into one node.
-  Type: `boolean`, Default: `false`
+Boolean or function that takes one argument (the relative path
+of grouped folders) and returns a string to be displayed.
+  Type: `boolean | function(relative_path):string`, Default: `false`
 
 *nvim-tree.renderer.full_name*
 Display node whose name length is wider than the width of nvim-tree window in

lua/nvim-tree.lua

@@ -283,8 +283,8 @@ local function setup_autocommands(opts)
   create_nvim_tree_autocmd("BufEnter", {
     pattern = "NvimTree_*",
     callback = function()
-      if opts.reload_on_bufenter and not opts.filesystem_watchers.enable then
-        if utils.is_nvim_tree_buf(0) then
+      if utils.is_nvim_tree_buf(0) then
+        if vim.fn.getcwd() ~= core.get_cwd() or (opts.reload_on_bufenter and not opts.filesystem_watchers.enable) then
           reloaders.reload_explorer()
         end
       end
@@ -640,6 +640,7 @@ local ACCEPTED_TYPES = {
     },
   },
   renderer = {
+    group_empty = { "boolean", "function" },
     root_folder_label = { "function", "string", "boolean" },
   },
   actions = {

lua/nvim-tree/actions/moves/item.lua

@@ -9,11 +9,20 @@ local M = {}
 function M.fn(where, what)
   return function()
     local node_cur = lib.get_node_at_cursor()
-    local nodes_by_line = utils.get_nodes_by_line(core.get_explorer().nodes, core.get_nodes_starting_line())
+    local first_node_line = core.get_nodes_starting_line()
+    local nodes_by_line = utils.get_nodes_by_line(core.get_explorer().nodes, first_node_line)
+    local iter_start, iter_end, iter_step, cur, first, nex
 
-    local cur, first, prev, nex = nil, nil, nil, nil
-    for line, node in pairs(nodes_by_line) do
+    if where == "next" then
+      iter_start, iter_end, iter_step = first_node_line, #nodes_by_line, 1
+    elseif where == "prev" then
+      iter_start, iter_end, iter_step = #nodes_by_line, first_node_line, -1
+    end
+
+    for line = iter_start, iter_end, iter_step do
+      local node = nodes_by_line[line]
       local valid = false
+
       if what == "git" then
         valid = explorer_node.get_git_status(node) ~= nil
       elseif what == "diag" then
@@ -28,29 +37,16 @@ function M.fn(where, what)
 
       if node == node_cur then
         cur = line
-      elseif valid then
-        if not cur then
-          prev = line
-        end
-        if cur and not nex then
-          nex = line
-          break
-        end
+      elseif valid and cur then
+        nex = line
+        break
       end
     end
 
-    if where == "prev" then
-      if prev then
-        view.set_cursor { prev, 0 }
-      end
-    else
-      if cur then
-        if nex then
-          view.set_cursor { nex, 0 }
-        end
-      elseif first then
-        view.set_cursor { first, 0 }
-      end
+    if nex then
+      view.set_cursor { nex, 0 }
+    elseif vim.o.wrapscan and first then
+      view.set_cursor { first, 0 }
     end
   end
 end

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

@@ -299,7 +299,7 @@ end
 
 local function edit_in_current_buf(filename)
   require("nvim-tree.view").abandon_current_window()
-  vim.cmd("keepjumps edit " .. vim.fn.fnameescape(filename))
+  vim.cmd("keepalt keepjumps edit " .. vim.fn.fnameescape(filename))
 end
 
 function M.fn(mode, filename)

lua/nvim-tree/api.lua

@@ -40,17 +40,26 @@ local function wrap(f)
   end
 end
 
---- Inject the node as the first argument if absent.
---- f function to invoke
-local function wrap_node(f)
+---Inject the node as the first argument if absent.
+---@param fn function function to invoke
+local function wrap_node(fn)
   return function(node, ...)
     node = node or require("nvim-tree.lib").get_node_at_cursor()
     if node then
-      f(node, ...)
+      fn(node, ...)
     end
   end
 end
 
+---Inject the node or nil as the first argument if absent.
+---@param fn function function to invoke
+local function wrap_node_or_nil(fn)
+  return function(node, ...)
+    node = node or require("nvim-tree.lib").get_node_at_cursor()
+    fn(node, ...)
+  end
+end
+
 ---@class ApiTreeOpenOpts
 ---@field path string|nil path
 ---@field current_window boolean|nil default false
@@ -136,7 +145,7 @@ Api.tree.is_tree_buf = wrap(require("nvim-tree.utils").is_nvim_tree_buf)
 
 Api.tree.is_visible = wrap(require("nvim-tree.view").is_visible)
 
-Api.fs.create = wrap_node(require("nvim-tree.actions.fs.create-file").fn)
+Api.fs.create = wrap_node_or_nil(require("nvim-tree.actions.fs.create-file").fn)
 Api.fs.remove = wrap_node(require("nvim-tree.actions.fs.remove-file").fn)
 Api.fs.trash = wrap_node(require("nvim-tree.actions.fs.trash").fn)
 Api.fs.rename_node = wrap_node(require("nvim-tree.actions.fs.rename-file").fn ":t")

lua/nvim-tree/explorer/node.lua

@@ -14,13 +14,15 @@ local function get_dir_git_status(parent_ignored, status, absolute_path)
     return { file = "!!" }
   end
 
-  return {
-    file = status.files and status.files[absolute_path],
-    dir = status.dirs and {
-      direct = status.dirs.direct[absolute_path],
-      indirect = status.dirs.indirect[absolute_path],
-    },
-  }
+  if status then
+    return {
+      file = status.files and status.files[absolute_path],
+      dir = status.dirs and {
+        direct = status.dirs.direct[absolute_path],
+        indirect = status.dirs.indirect[absolute_path],
+      },
+    }
+  end
 end
 
 local function get_git_status(parent_ignored, status, absolute_path)

lua/nvim-tree/live-filter.lua

@@ -37,7 +37,8 @@ local function remove_overlay()
     })
   end
 
-  vim.api.nvim_win_close(overlay_winnr, { force = true })
+  vim.api.nvim_win_close(overlay_winnr, true)
+  vim.api.nvim_buf_delete(overlay_bufnr, { force = true })
   overlay_bufnr = nil
   overlay_winnr = nil
 
@@ -104,25 +105,32 @@ local function configure_buffer_overlay()
   vim.api.nvim_buf_set_keymap(overlay_bufnr, "i", "<CR>", "<cmd>stopinsert<CR>", {})
 end
 
+local function calculate_overlay_win_width()
+  local wininfo = vim.fn.getwininfo(view.get_winnr())[1]
+
+  if wininfo then
+    return wininfo.width - wininfo.textoff - #M.prefix
+  end
+
+  return 20
+end
+
 local function create_overlay()
-  local min_width = 20
   if view.View.float.enable then
     -- don't close nvim-tree float when focus is changed to filter window
     vim.api.nvim_clear_autocmds {
       event = "WinLeave",
       pattern = "NvimTree_*",
       group = vim.api.nvim_create_augroup("NvimTree", { clear = false }),
     }
-
-    min_width = min_width - 2
   end
 
   configure_buffer_overlay()
   overlay_winnr = vim.api.nvim_open_win(overlay_bufnr, true, {
     col = 1,
     row = 0,
     relative = "cursor",
-    width = math.max(min_width, vim.api.nvim_win_get_width(view.get_winnr()) - #M.prefix - 2),
+    width = calculate_overlay_win_width(),
     height = 1,
     border = "none",
     style = "minimal",

lua/nvim-tree/renderer/builder.lua

@@ -1,5 +1,6 @@
 local utils = require "nvim-tree.utils"
 local core = require "nvim-tree.core"
+local notify = require "nvim-tree.notify"
 
 local pad = require "nvim-tree.renderer.components.padding"
 local icons = require "nvim-tree.renderer.components.icons"
@@ -63,6 +64,13 @@ function Builder:configure_symlink_destination(show)
   return self
 end
 
+function Builder:configure_group_name_modifier(group_name_modifier)
+  if type(group_name_modifier) == "function" then
+    self.group_name_modifier = group_name_modifier
+  end
+  return self
+end
+
 function Builder:_insert_highlight(group, start, end_)
   table.insert(self.highlights, { group, self.index, start, end_ or -1 })
 end
@@ -71,14 +79,24 @@ function Builder:_insert_line(line)
   table.insert(self.lines, line)
 end
 
-local function get_folder_name(node)
+function Builder:_get_folder_name(node)
   local name = node.name
   local next = node.group_next
   while next do
     name = name .. "/" .. next.name
     next = next.group_next
   end
-  return name
+
+  if node.group_next and self.group_name_modifier then
+    local new_name = self.group_name_modifier(name)
+    if type(new_name) == "string" then
+      name = new_name
+    else
+      notify.warn(string.format("Invalid return type for field renderer.group_empty. Expected string, got %s", type(new_name)))
+    end
+  end
+
+  return name .. self.trailing_slash
 end
 
 ---@class HighlightedString
@@ -110,7 +128,7 @@ end
 function Builder:_build_folder(node)
   local has_children = #node.nodes ~= 0 or node.has_children
   local icon, icon_hl = icons.get_folder_icon(node, has_children)
-  local foldername = get_folder_name(node) .. self.trailing_slash
+  local foldername = self:_get_folder_name(node)
 
   if #icon > 0 and icon_hl == nil then
     if node.open then

lua/nvim-tree/renderer/init.lua

@@ -79,6 +79,7 @@ function M.draw()
     :configure_icon_padding(M.config.icons.padding)
     :configure_symlink_destination(M.config.symlink_destination)
     :configure_filter(live_filter.filter, live_filter.prefix)
+    :configure_group_name_modifier(M.config.group_empty)
     :build_header(view.is_root_folder_visible(core.get_cwd()))
     :build(core.get_explorer())
     :unwrap()