chore: resolve deprecated in 0.11 (#3053)
* chore: resolve deprecated in 0.11 * chore: resolve deprecated in 0.11 * chore: resolve deprecated in 0.11 * chore: resolve deprecated in 0.11 * chore: resolve deprecated in 0.11 * chore: resolve deprecated in 0.11
This commit is contained in:
committed by
GitHub
parent
fca0b67c0b
commit
db7403243d
@@ -11,6 +11,8 @@ local WIN_HL = table.concat({
|
||||
"CursorLine:NvimTreeCursorLine",
|
||||
}, ",")
|
||||
|
||||
local namespace_help_id = vim.api.nvim_create_namespace("NvimTreeHelp")
|
||||
|
||||
local M = {
|
||||
config = {},
|
||||
|
||||
@@ -82,8 +84,8 @@ end
|
||||
|
||||
--- Compute all lines for the buffer
|
||||
---@param map table keymap.get_keymap
|
||||
---@return table strings of text
|
||||
---@return table arrays of arguments 3-6 for nvim_buf_add_highlight()
|
||||
---@return string[] lines of text
|
||||
---@return HighlightRangeArgs[] hl_range_args for lines
|
||||
---@return number maximum length of text
|
||||
local function compute(map)
|
||||
local head_lhs = "nvim-tree mappings"
|
||||
@@ -130,10 +132,10 @@ local function compute(map)
|
||||
local width = #lines[1]
|
||||
|
||||
-- header highlight, assume one character keys
|
||||
local hl = {
|
||||
{ "NvimTreeFolderName", 0, 0, #head_lhs },
|
||||
{ "NvimTreeFolderName", 0, width - 1, width },
|
||||
{ "NvimTreeFolderName", 1, width - 1, width },
|
||||
local hl_range_args = {
|
||||
{ higroup = "NvimTreeFolderName", start = { 0, 0, }, finish = { 0, #head_lhs, }, },
|
||||
{ higroup = "NvimTreeFolderName", start = { 0, width - 1, }, finish = { 0, width, }, },
|
||||
{ higroup = "NvimTreeFolderName", start = { 1, width - 1, }, finish = { 1, width, }, },
|
||||
}
|
||||
|
||||
-- mappings, left padded 1
|
||||
@@ -145,10 +147,10 @@ local function compute(map)
|
||||
width = math.max(#line, width)
|
||||
|
||||
-- highlight lhs
|
||||
table.insert(hl, { "NvimTreeFolderName", i + 1, 1, #l.lhs + 1 })
|
||||
table.insert(hl_range_args, { higroup = "NvimTreeFolderName", start = { i + 1, 1, }, finish = { i + 1, #l.lhs + 1, }, })
|
||||
end
|
||||
|
||||
return lines, hl, width
|
||||
return lines, hl_range_args, width
|
||||
end
|
||||
|
||||
--- close the window and delete the buffer, if they exist
|
||||
@@ -172,7 +174,7 @@ local function open()
|
||||
local map = keymap.get_keymap()
|
||||
|
||||
-- text and highlight
|
||||
local lines, hl, width = compute(map)
|
||||
local lines, hl_range_args, width = compute(map)
|
||||
|
||||
-- create the buffer
|
||||
M.bufnr = vim.api.nvim_create_buf(false, true)
|
||||
@@ -187,8 +189,12 @@ local function open()
|
||||
end
|
||||
|
||||
-- highlight it
|
||||
for _, h in ipairs(hl) do
|
||||
vim.api.nvim_buf_add_highlight(M.bufnr, -1, h[1], h[2], h[3], h[4])
|
||||
for _, args in ipairs(hl_range_args) do
|
||||
if vim.fn.has("nvim-0.11") == 1 then
|
||||
vim.hl.range(M.bufnr, namespace_help_id, args.higroup, args.start, args.finish, {})
|
||||
else
|
||||
vim.api.nvim_buf_add_highlight(M.bufnr, -1, args.higroup, args.start[1], args.start[2], args.finish[2]) ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
end
|
||||
|
||||
-- open a very restricted window
|
||||
|
||||
Reference in New Issue
Block a user