Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lua/nvim-tree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,8 @@ local function validate_options(conf)

if enum_value then
if not vim.tbl_contains(enums, v) then
invalid = string.format("Invalid value for field %s%s: Expected one of enum '%s', got '%s'", prefix, k, table.concat(enums, "'|'"), tostring(v))
invalid = string.format("Invalid value for field %s%s: Expected one of enum '%s', got '%s'", prefix, k,
table.concat(enums, "'|'"), tostring(v))
end
else
if def[k] == nil and types[k] == nil then
Expand Down
1 change: 0 additions & 1 deletion lua/nvim-tree/actions/tree/modifiers/expand.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ end
---@param node Node
---@return boolean
local function descend_until_empty(_, node)

local dir = node:as(DirectoryNode)
if not dir then
return false
Expand Down
6 changes: 3 additions & 3 deletions lua/nvim-tree/explorer/live-filter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,11 @@ local function create_overlay(self)
})

if vim.fn.has("nvim-0.10") == 1 then
vim.api.nvim_set_option_value("modifiable", true, { buf = overlay_bufnr })
vim.api.nvim_set_option_value("filetype", "NvimTreeFilter", { buf = overlay_bufnr })
vim.api.nvim_set_option_value("modifiable", true, { buf = overlay_bufnr })
vim.api.nvim_set_option_value("filetype", "NvimTreeFilter", { buf = overlay_bufnr })
else
vim.api.nvim_buf_set_option(overlay_bufnr, "modifiable", true) ---@diagnostic disable-line: deprecated
vim.api.nvim_buf_set_option(overlay_bufnr, "filetype", "NvimTreeFilter") ---@diagnostic disable-line: deprecated
vim.api.nvim_buf_set_option(overlay_bufnr, "filetype", "NvimTreeFilter") ---@diagnostic disable-line: deprecated
end

vim.api.nvim_buf_set_lines(overlay_bufnr, 0, -1, false, { self.filter })
Expand Down
4 changes: 2 additions & 2 deletions lua/nvim-tree/node/directory-link.lua
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ function DirectoryLinkNode:highlighted_name()
link_to = utils.path_add_trailing(link_to)
end

name.str = string.format("%s%s%s", name.str, self.explorer.opts.renderer.icons.symlink_arrow, link_to)
name.hl = { "NvimTreeSymlinkFolderName" }
name.str = string.format("%s%s%s", name.str, self.explorer.opts.renderer.icons.symlink_arrow, link_to)
name.hl = { "NvimTreeSymlinkFolderName" }
end

return name
Expand Down
2 changes: 1 addition & 1 deletion lua/nvim-tree/renderer/decorator/copied.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ local CopiedDecorator = Decorator:extend()
---@protected
---@param args DecoratorArgs
function CopiedDecorator:new(args)
self.explorer = args.explorer
self.explorer = args.explorer

self.enabled = true
self.highlight_range = self.explorer.opts.renderer.highlight_clipboard or "none"
Expand Down
Loading