feat(#2411): bookmark highlight and icon placement

Author: alex-courtis

doc/nvim-tree-lua.txt

@@ -884,9 +884,6 @@ Configuration options for icons.
 Icon sign column precedence:
   diagnostics > modified > git > bookmarked
 
-Left to right order:
-  git, modified, diagnostics, bookmarked
-
     *nvim-tree.renderer.icons.web_devicons*
     Configure optional plugin `"nvim-tree/nvim-web-devicons"`
 
@@ -948,7 +945,7 @@ Left to right order:
 
     *nvim-tree.renderer.icons.show*
     Configuration options for showing icon types.
-    Left to right order: file/folder, git, modified, diagnostics, bookmarks.
+    Left to right order: file/folder, git, modified, diagnostics, bookmarked.
 
         *nvim-tree.renderer.icons.show.file*
         Show an icon before the file name.

lua/nvim-tree/actions/fs/copy-paste.lua

@@ -5,6 +5,7 @@ local core = require "nvim-tree.core"
 local events = require "nvim-tree.events"
 local notify = require "nvim-tree.notify"
 local renderer = require "nvim-tree.renderer"
+local reloaders = require "nvim-tree.actions.reloaders.reloaders"
 
 local HL_POSITION = require("nvim-tree.enum").HL_POSITION
 
@@ -195,7 +196,7 @@ local function do_paste(node, action_type, action_fn)
 
   clipboard[action_type] = {}
   if not M.config.filesystem_watchers.enable then
-    return require("nvim-tree.actions.reloaders.reloaders").reload_explorer()
+    return reloaders.reload_explorer()
   end
 end
 

lua/nvim-tree/colors.lua

@@ -42,9 +42,6 @@ local function get_hl_groups()
     OpenedFile = { gui = "bold", fg = colors.green },
     ModifiedFile = { fg = colors.green },
 
-    CopiedText = { gui = "undercurl" },
-    CutText = { gui = "strikethrough" },
-
     GitDirty = { fg = colors.dark_red },
     GitDeleted = { fg = colors.dark_red },
     GitStaged = { fg = colors.green },
@@ -57,7 +54,6 @@ local function get_hl_groups()
     LiveFilterValue = { gui = "bold", fg = "#fff" },
 
     Bookmark = { fg = colors.green },
-    BookmarkText = { gui = "underdashed" },
   }
 end
 

lua/nvim-tree/marks/init.lua

@@ -1,17 +1,19 @@
+local renderer = {} -- circular dependency
+
 local NvimTreeMarks = {}
 
 local M = {}
 
 local function add_mark(node)
   NvimTreeMarks[node.absolute_path] = node
 
-  require("nvim-tree.renderer").draw()
+  renderer.draw()
 end
 
 local function remove_mark(node)
   NvimTreeMarks[node.absolute_path] = nil
 
-  require("nvim-tree.renderer").draw()
+  renderer.draw()
 end
 
 function M.toggle_mark(node)
@@ -25,13 +27,13 @@ function M.toggle_mark(node)
     add_mark(node)
   end
 
-  require("nvim-tree.renderer").draw()
+  renderer.draw()
 end
 
 function M.clear_marks()
   NvimTreeMarks = {}
 
-  require("nvim-tree.renderer").draw()
+  renderer.draw()
 end
 
 function M.get_mark(node)
@@ -47,6 +49,8 @@ function M.get_marks()
 end
 
 function M.setup(opts)
+  renderer = require("nvim-tree.renderer")
+
   require("nvim-tree.marks.bulk-delete").setup(opts)
   require("nvim-tree.marks.bulk-trash").setup(opts)
   require("nvim-tree.marks.bulk-move").setup(opts)