Skip to content

Commit 737e3a4

Browse files
committed
Merge remote-tracking branch 'nvim-tree/master' into feat/hidden_display
2 parents 6bbc2ec + 48d0e82 commit 737e3a4

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

doc/nvim-tree-lua.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,12 +1045,6 @@ Icon order and sign column precedence:
10451045
Hidden icon placement.
10461046
Type: `string`, Default: `"after"`
10471047

1048-
*nvim-tree.renderer.icons.hidden_placement*
1049-
Place where the hidden (dotfile) icon will be rendered.
1050-
Can be `"after"` or `"before"` filename (after the file/folders icons)
1051-
or `"signcolumn"` (requires |nvim-tree.view.signcolumn| enabled).
1052-
Type: `string`, Default: `"after"`
1053-
10541048
*nvim-tree.renderer.icons.bookmarks_placement*
10551049
Bookmark icon placement.
10561050
Type: `string`, Default: `signcolumn`

lua/nvim-tree/renderer/init.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ local M = {}
1212

1313
local SIGN_GROUP = "NvimTreeRendererSigns"
1414

15-
local namespace_id = vim.api.nvim_create_namespace "NvimTreeHighlights"
15+
local namespace_highlights_id = vim.api.nvim_create_namespace "NvimTreeHighlights"
1616
local namespace_extmarks_id = vim.api.nvim_create_namespace "NvimTreeExtmarks"
1717

1818
---@param bufnr number
@@ -64,11 +64,11 @@ function M.render_hl(bufnr, hl)
6464
if not bufnr or not vim.api.nvim_buf_is_loaded(bufnr) then
6565
return
6666
end
67-
vim.api.nvim_buf_clear_namespace(bufnr, namespace_id, 0, -1)
67+
vim.api.nvim_buf_clear_namespace(bufnr, namespace_highlights_id, 0, -1)
6868
for _, data in ipairs(hl) do
6969
if type(data[1]) == "table" then
7070
for _, group in ipairs(data[1]) do
71-
vim.api.nvim_buf_add_highlight(bufnr, namespace_id, group, data[2], data[3], data[4])
71+
vim.api.nvim_buf_add_highlight(bufnr, namespace_highlights_id, group, data[2], data[3], data[4])
7272
end
7373
end
7474
end

0 commit comments

Comments
 (0)