feat(#2349): add "right_align" option for renderer.icons.*_placement (#2846)

* feat(icon_placement): Allow right_align icon_placemente for decorator using ext_marks nvim api

* feat(icon_placement): Allow right_align icon_placemente for decorator using ext_marks nvim api

feat(icon_placement): Allow right_align icon_placemente for decorator using ext_marks nvim api

* feat(icon_placement): consolidate doc

* fix: extra namespace added to avoid colision between right_align and full_name features

* style: rename namespace_id

---------

Co-authored-by: Alexander Courtis <alex@courtis.org>

Author: evertonse

doc/nvim-tree-lua.txt

@@ -1045,12 +1045,6 @@ Icon order and sign column precedence:
     Hidden icon placement.
       Type: `string`, Default: `"after"`
 
-    *nvim-tree.renderer.icons.hidden_placement*
-    Place where the hidden (dotfile) icon will be rendered.
-    Can be `"after"` or `"before"` filename (after the file/folders icons)
-    or `"signcolumn"` (requires |nvim-tree.view.signcolumn| enabled).
-      Type: `string`, Default: `"after"`
-
     *nvim-tree.renderer.icons.bookmarks_placement*
     Bookmark icon placement.
       Type: `string`, Default: `signcolumn`

lua/nvim-tree/explorer/explore.lua

@@ -15,7 +15,7 @@ local M = {}
 ---@param cwd string
 ---@param node Node
 ---@param git_status table
----@return integer filtered_count
+---@param parent Explorer
 local function populate_children(handle, cwd, node, git_status, parent)
   local node_ignored = explorer_node.is_git_ignored(node)
   local nodes_by_path = utils.bool_record(node.nodes, "absolute_path")
@@ -35,7 +35,6 @@ local function populate_children(handle, cwd, node, git_status, parent)
     if not name then
       break
     end
-    local is_dir = t == "directory"
 
     local abs = utils.path_join { cwd, name }
     local profile = log.profile_start("explore populate_children %s", abs)
@@ -45,7 +44,7 @@ local function populate_children(handle, cwd, node, git_status, parent)
     local filter_reason = parent.filters:should_filter_as_reason(abs, stat, filter_status)
     if filter_reason == FILTER_REASON.none and not nodes_by_path[abs] and Watcher.is_fs_event_capable(abs) then
       local child = nil
-      if is_dir and vim.loop.fs_access(abs, "R") then
+      if t == "directory" and vim.loop.fs_access(abs, "R") then
         child = builders.folder(node, abs, name, stat)
       elseif t == "file" then
         child = builders.file(node, abs, name, stat)

lua/nvim-tree/lib.lua

@@ -5,7 +5,6 @@ local utils = require "nvim-tree.utils"
 local events = require "nvim-tree.events"
 local notify = require "nvim-tree.notify"
 local explorer_node = require "nvim-tree.explorer.node"
-local actions_reloaders = require "nvim-tree.actions.reloaders"
 
 ---@class LibOpenOpts
 ---@field path string|nil path
@@ -147,10 +146,6 @@ function M.expand_or_collapse(node, toggle_group)
   if node.has_children then
     node.has_children = false
   end
-  -- TODO: Inspect(node)
-
-  -- node.hidden_count = utils.count_hidden_files(node.absolute_path)
-  -- node.hidden_count = 79
 
   if #node.nodes == 0 then
     core.get_explorer():expand(node)

lua/nvim-tree/renderer/builder.lua

@@ -223,11 +223,6 @@ function Builder:format_line(indent_markers, arrows, icon, name, node)
   local line = { indent_markers, arrows }
   add_to_end(line, { icon })
 
-  if node == nil then
-    add_to_end(line, { name })
-    return line
-  end
-
   for i = #M.decorators, 1, -1 do
     add_to_end(line, M.decorators[i]:icons_before(node))
   end
@@ -470,7 +465,7 @@ end
 
 --- Add the hidden_count for root, since root dir is treated differently
 --- from normal directories we need to do it again for root.
---- Also need to sort my depth
+--- Also need to sort by depth
 ---@private
 function Builder:build_root_hidden_count()
   local root = core.get_explorer()

lua/nvim-tree/renderer/init.lua

@@ -12,7 +12,7 @@ local M = {}
 
 local SIGN_GROUP = "NvimTreeRendererSigns"
 
-local namespace_id = vim.api.nvim_create_namespace "NvimTreeHighlights"
+local namespace_highlights_id = vim.api.nvim_create_namespace "NvimTreeHighlights"
 local namespace_extmarks_id = vim.api.nvim_create_namespace "NvimTreeExtmarks"
 
 ---@param bufnr number
@@ -30,9 +30,9 @@ local function _draw(bufnr, lines, hl_args, signs, extmarks, virtual_lines)
   M.render_hl(bufnr, hl_args)
 
   if vim.fn.has "nvim-0.10" == 1 then
-    vim.api.nvim_set_option_value("modifiable", true, { buf = bufnr })
+    vim.api.nvim_set_option_value("modifiable", false, { buf = bufnr })
   else
-    vim.api.nvim_buf_set_option(bufnr, "modifiable", true) ---@diagnostic disable-line: deprecated
+    vim.api.nvim_buf_set_option(bufnr, "modifiable", false) ---@diagnostic disable-line: deprecated
   end
 
   vim.fn.sign_unplace(SIGN_GROUP)
@@ -64,11 +64,11 @@ function M.render_hl(bufnr, hl)
   if not bufnr or not vim.api.nvim_buf_is_loaded(bufnr) then
     return
   end
-  vim.api.nvim_buf_clear_namespace(bufnr, namespace_id, 0, -1)
+  vim.api.nvim_buf_clear_namespace(bufnr, namespace_highlights_id, 0, -1)
   for _, data in ipairs(hl) do
     if type(data[1]) == "table" then
       for _, group in ipairs(data[1]) do
-        vim.api.nvim_buf_add_highlight(bufnr, namespace_id, group, data[2], data[3], data[4])
+        vim.api.nvim_buf_add_highlight(bufnr, namespace_highlights_id, group, data[2], data[3], data[4])
       end
     end
   end
@@ -87,7 +87,6 @@ function M.draw()
 
   local builder = Builder:new():build()
 
-  -- _draw(bufnr, builder.lines, builder.hl_args, builder.signs, builder.extmarks)
   _draw(bufnr, builder.lines, builder.hl_args, builder.signs, builder.extmarks, builder.virtual_lines)
 
   if cursor and #builder.lines >= cursor[1] then

lua/nvim-tree/utils.lua

@@ -1,7 +1,5 @@
 local Iterator = require "nvim-tree.iterators.node-iterator"
 local notify = require "nvim-tree.notify"
--- local git = require "nvim-tree.git"
--- local filters = require "nvim-tree.explorer.filters"
 
 local M = {
   debouncers = {},
@@ -19,49 +17,6 @@ M.is_windows = vim.fn.has "win32" == 1 or vim.fn.has "win32unix" == 1
 function M.str_find(haystack, needle)
   return vim.fn.stridx(haystack, needle) ~= -1
 end
-local uv = vim.loop
-
-local function is_dotfile(name)
-  return name:sub(1, 1) == "."
-end
-
-M.count_hidden_files = function(node)
-  if true then
-    return 2
-  end
-  local count = 0
-
-  local handle = uv.fs_scandir(node.absolute_path)
-  if not handle then
-    return {}
-  end
-
-  if not handle then
-    print "Error: Unable to scan directory."
-    return count
-  end
-
-  local cwd = node.link_to or node.absolute_path
-  local git_status = git.load_project_status(cwd)
-
-  local filter_status = filters.prepare(git_status)
-  while true do
-    local name, type = uv.fs_scandir_next(handle)
-    if not name then
-      break
-    end
-    local abs = M.path_join { cwd, name }
-
-    local abs = node.absolute_path
-    ---@type uv.fs_stat.result|nil
-    local stat = vim.loop.fs_stat(abs)
-    if not filters.should_filter(abs, stat, filter_status) then
-      count = count + 1
-    end
-  end
-
-  return count
-end
 
 ---@param path string
 ---@return string|uv.uv_fs_t
@@ -599,17 +554,6 @@ function M.inject_node(f)
   end
 end
 
----@param tbl table
----@return table
-M.reverse_table = function(tbl)
-  local size = #tbl
-  local reversed = {}
-  for i = size, 1, -1 do
-    table.insert(reversed, tbl[i])
-  end
-  return reversed
-end
-
 --- Is the buffer named NvimTree_[0-9]+ a tree? filetype is "NvimTree" or not readable file.
 --- This is cheap, as the readable test should only ever be needed when resuming a vim session.
 ---@param bufnr number|nil may be 0 or nil for current