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

This reverts commit 1d629a5d3f.
This commit is contained in:
Alexander Courtis
2024-07-21 15:22:24 +10:00
parent 1d629a5d3f
commit b2640685a8
6 changed files with 18 additions and 46 deletions

View File

@@ -16,7 +16,6 @@ M.ICON_PLACEMENT = {
signcolumn = 1,
before = 2,
after = 3,
right_align = 4,
}
return M

View File

@@ -60,7 +60,6 @@ function Builder:new()
lines = {},
markers = {},
signs = {},
extmarks = {},
}
setmetatable(o, self)
self.__index = self
@@ -229,14 +228,6 @@ function Builder:format_line(indent_markers, arrows, icon, name, node)
add_to_end(line, M.decorators[i]:icons_after(node))
end
local rights = {}
for i = #M.decorators, 1, -1 do
add_to_end(rights, M.decorators[i]:icons_right_align(node))
end
if #rights > 0 then
self.extmarks[self.index] = rights
end
return line
end

View File

@@ -74,17 +74,6 @@ function Decorator:icons_after(node)
return self:calculate_icons(node)
end
---Icons when ICON_PLACEMENT.right_align
---@param node Node
---@return HighlightedString[]|nil icons
function Decorator:icons_right_align(node)
if not self.enabled or self.icon_placement ~= ICON_PLACEMENT.right_align then
return
end
return self:calculate_icons(node)
end
---Maybe icons, optionally implemented
---@protected
---@param _ Node

View File

@@ -18,7 +18,7 @@ local namespace_id = vim.api.nvim_create_namespace "NvimTreeHighlights"
---@param lines string[]
---@param hl_args AddHighlightArgs[]
---@param signs string[]
local function _draw(bufnr, lines, hl_args, signs, extmarks)
local function _draw(bufnr, lines, hl_args, signs)
if vim.fn.has "nvim-0.10" == 1 then
vim.api.nvim_set_option_value("modifiable", true, { buf = bufnr })
else
@@ -38,15 +38,6 @@ local function _draw(bufnr, lines, hl_args, signs, extmarks)
for i, sign_name in pairs(signs) do
vim.fn.sign_place(0, SIGN_GROUP, sign_name, bufnr, { lnum = i + 1 })
end
for i, extname in pairs(extmarks) do
for _, mark in ipairs(extname) do
vim.api.nvim_buf_set_extmark(bufnr, namespace_id, i, -1, {
virt_text = { { mark.str, mark.hl } },
virt_text_pos = "right_align",
hl_mode = "combine",
})
end
end
end
function M.render_hl(bufnr, hl)
@@ -76,7 +67,7 @@ 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)
if cursor and #builder.lines >= cursor[1] then
vim.api.nvim_win_set_cursor(view.get_winnr() or 0, cursor)