fix(#2746): fix cursorcolumn and right aligned icons in floating windows

Author: simonmandlik

lua/nvim-tree/renderer/components/full-name.lua

@@ -1,6 +1,7 @@
 local M = {}
 
 local utils = require("nvim-tree.utils")
+local view = require("nvim-tree.view")
 
 local function hide(win)
   if win then
@@ -32,7 +33,7 @@ local function effective_win_width()
   return win_width - win_info[1].textoff
 end
 
-local function show()
+local function show(opts)
   local line_nr = vim.api.nvim_win_get_cursor(0)[1]
   if vim.wo.wrap then
     return
@@ -50,6 +51,12 @@ local function show()
   end
 
   local text_width = vim.fn.strdisplaywidth(vim.fn.substitute(line, "[^[:print:]]*$", "", "g"))
+
+  -- also make space for right-aligned icons
+  local icon_ns_id = vim.api.nvim_get_namespaces()["NvimTreeExtmarks"]
+  local icon_extmarks = vim.api.nvim_buf_get_extmarks(0, icon_ns_id, { line_nr - 1, 0 }, { line_nr - 1, -1 }, { details = true })
+  text_width = text_width + view.extmarks_length(icon_extmarks)
+
   local win_width = effective_win_width()
 
   if text_width < win_width then
@@ -66,12 +73,26 @@ local function show()
     style     = "minimal",
     border    = "none"
   })
+  vim.wo[M.popup_win].winhl = view.View.winopts.winhl
 
-  local ns_id = vim.api.nvim_get_namespaces()["NvimTreeHighlights"]
-  local extmarks = vim.api.nvim_buf_get_extmarks(0, ns_id, { line_nr - 1, 0 }, { line_nr - 1, -1 }, { details = true })
+  local hl_ns_id = vim.api.nvim_get_namespaces()["NvimTreeHighlights"]
+  local hl_extmarks = vim.api.nvim_buf_get_extmarks(0, hl_ns_id, { line_nr - 1, 0 }, { line_nr - 1, -1 }, { details = true })
   vim.api.nvim_win_call(M.popup_win, function()
     vim.api.nvim_buf_set_lines(0, 0, -1, true, { line })
-    for _, extmark in ipairs(extmarks) do
+
+    -- copy also right-aligned icons
+    for _, extmark in ipairs(icon_extmarks) do
+      local details = extmark[4]
+      if details then
+        vim.api.nvim_buf_set_extmark(0, icon_ns_id, 0, 0, {
+          virt_text     = details.virt_text,
+          virt_text_pos = details.virt_text_pos,
+          hl_mode       = details.hl_mode,
+        })
+      end
+    end
+
+    for _, extmark in ipairs(hl_extmarks) do
       -- nvim 0.10 luadoc is incorrect: vim.api.keyset.get_extmark_item is missing the extmark_id at the start
 
       ---@cast extmark table
@@ -82,13 +103,16 @@ local function show()
 
       if type(details) == "table" then
         if vim.fn.has("nvim-0.11") == 1 and vim.hl and vim.hl.range then
-          vim.hl.range(0, ns_id, details.hl_group, { 0, col }, { 0, details.end_col, }, {})
+          vim.hl.range(0, hl_ns_id, details.hl_group, { 0, col }, { 0, details.end_col, }, {})
         else
-          vim.api.nvim_buf_add_highlight(0, ns_id, details.hl_group, 0, col, details.end_col) ---@diagnostic disable-line: deprecated
+          vim.api.nvim_buf_add_highlight(0, hl_ns_id, details.hl_group, 0, col, details.end_col) ---@diagnostic disable-line: deprecated
         end
       end
     end
-    vim.cmd([[ setlocal nowrap cursorline noswapfile nobuflisted buftype=nofile bufhidden=wipe ]])
+    vim.cmd([[ setlocal nowrap noswapfile nobuflisted buftype=nofile bufhidden=wipe ]])
+    if opts.view.cursorline then
+      vim.cmd([[ setlocal cursorline cursorlineopt=both ]])
+    end
   end)
 end
 
@@ -114,7 +138,7 @@ M.setup = function(opts)
     pattern = { "NvimTree_*" },
     callback = function()
       if utils.is_nvim_tree_buf(0) then
-        show()
+        show(opts)
       end
     end,
   })

lua/nvim-tree/view.lua

@@ -302,6 +302,21 @@ function M.open(options)
   log.profile_end(profile)
 end
 
+---@param extmarks table
+---@return number
+function M.extmarks_length(extmarks)
+  local length = 0
+  for _, extmark in ipairs(extmarks) do
+    local details = extmark[4]
+    if details and details.virt_text then
+      for _, text in ipairs(details.virt_text) do
+        length = length + vim.fn.strchars(text[1])
+      end
+    end
+  end
+  return length
+end
+
 local function grow()
   local starts_at = M.is_root_folder_visible(require("nvim-tree.core").get_cwd()) and 1 or 0
   local lines = vim.api.nvim_buf_get_lines(M.get_bufnr(), starts_at, -1, false)
@@ -329,14 +344,7 @@ local function grow()
     local count = vim.fn.strchars(l)
     -- also add space for right-aligned icons
     local extmarks = vim.api.nvim_buf_get_extmarks(M.get_bufnr(), ns_id, { line_nr, 0 }, { line_nr, -1 }, { details = true })
-    for _, extmark in ipairs(extmarks) do
-      local virt_texts = extmark[4].virt_text
-      if virt_texts then
-        for _, virt_text in ipairs(virt_texts) do
-          count = count + vim.fn.strchars(virt_text[1])
-        end
-      end
-    end
+    count = count + M.extmarks_length(extmarks)
     if resizing_width < count then
       resizing_width = count
     end