feat(buffer): render forge links as concealed text with eol virt text
Problem: forge tokens were visible as raw text with no virtual text labels, and the eol separator logic collapsed all gaps when non-adjacent specifiers were absent. Solution: add forge conceal syntax patterns in `setup_syntax()`, add `PendingForge`/`PendingForgeClosed` highlight groups, handle the `%l` specifier in `build_eol_virt()`, fix separator collapsing to buffer one separator between present segments, and change `concealcursor` to `nc` (reveal in visual and insert mode).
This commit is contained in:
parent
7405390fd9
commit
f4e62b148c
1 changed files with 24 additions and 20 deletions
|
|
@ -365,7 +365,7 @@ end
|
||||||
---@param winid integer
|
---@param winid integer
|
||||||
local function set_win_options(winid)
|
local function set_win_options(winid)
|
||||||
vim.wo[winid].conceallevel = 3
|
vim.wo[winid].conceallevel = 3
|
||||||
vim.wo[winid].concealcursor = 'nvic'
|
vim.wo[winid].concealcursor = 'nc'
|
||||||
vim.wo[winid].winfixheight = true
|
vim.wo[winid].winfixheight = true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -379,6 +379,10 @@ local function setup_syntax(bufnr)
|
||||||
syntax match taskCheckbox /\[!\]/ contained containedin=taskLine
|
syntax match taskCheckbox /\[!\]/ contained containedin=taskLine
|
||||||
syntax match taskLine /^\/\d\+\/- \[.\] .*$/ contains=taskId,taskCheckbox
|
syntax match taskLine /^\/\d\+\/- \[.\] .*$/ contains=taskId,taskCheckbox
|
||||||
]])
|
]])
|
||||||
|
local forge = require('pending.forge')
|
||||||
|
for _, pat in ipairs(forge.conceal_patterns()) do
|
||||||
|
vim.cmd('syntax match forgeRef /' .. pat .. '/ conceal contained containedin=taskLine')
|
||||||
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -432,7 +436,7 @@ end
|
||||||
|
|
||||||
---@class pending.EolSegment
|
---@class pending.EolSegment
|
||||||
---@field type 'specifier'|'literal'
|
---@field type 'specifier'|'literal'
|
||||||
---@field key? 'c'|'r'|'d'
|
---@field key? 'c'|'r'|'d'|'l'
|
||||||
---@field text? string
|
---@field text? string
|
||||||
|
|
||||||
---@param fmt string
|
---@param fmt string
|
||||||
|
|
@ -444,7 +448,7 @@ local function parse_eol_format(fmt)
|
||||||
while pos <= len do
|
while pos <= len do
|
||||||
if fmt:sub(pos, pos) == '%' and pos + 1 <= len then
|
if fmt:sub(pos, pos) == '%' and pos + 1 <= len then
|
||||||
local key = fmt:sub(pos + 1, pos + 1)
|
local key = fmt:sub(pos + 1, pos + 1)
|
||||||
if key == 'c' or key == 'r' or key == 'd' then
|
if key == 'c' or key == 'r' or key == 'd' or key == 'l' then
|
||||||
table.insert(segments, { type = 'specifier', key = key })
|
table.insert(segments, { type = 'specifier', key = key })
|
||||||
pos = pos + 2
|
pos = pos + 2
|
||||||
else
|
else
|
||||||
|
|
@ -471,7 +475,10 @@ local function build_eol_virt(segments, m, icons)
|
||||||
for i, seg in ipairs(segments) do
|
for i, seg in ipairs(segments) do
|
||||||
if seg.type == 'specifier' then
|
if seg.type == 'specifier' then
|
||||||
local text, hl
|
local text, hl
|
||||||
if seg.key == 'c' and m.show_category and m.category then
|
if seg.key == 'l' and m.forge_ref then
|
||||||
|
local forge = require('pending.forge')
|
||||||
|
text, hl = forge.format_label(m.forge_ref, m.forge_cache)
|
||||||
|
elseif seg.key == 'c' and m.show_category and m.category then
|
||||||
text = icons.category .. ' ' .. m.category
|
text = icons.category .. ' ' .. m.category
|
||||||
hl = 'PendingHeader'
|
hl = 'PendingHeader'
|
||||||
elseif seg.key == 'r' and m.recur then
|
elseif seg.key == 'r' and m.recur then
|
||||||
|
|
@ -488,26 +495,20 @@ local function build_eol_virt(segments, m, icons)
|
||||||
end
|
end
|
||||||
|
|
||||||
local virt_parts = {}
|
local virt_parts = {}
|
||||||
for i, r in ipairs(resolved) do
|
local pending_sep = nil
|
||||||
|
for _, r in ipairs(resolved) do
|
||||||
if r.literal then
|
if r.literal then
|
||||||
local prev_present, next_present = false, false
|
if #virt_parts > 0 and not pending_sep then
|
||||||
for j = i - 1, 1, -1 do
|
pending_sep = { r.text, r.hl }
|
||||||
if not resolved[j].literal then
|
|
||||||
prev_present = resolved[j].present
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
for j = i + 1, #resolved do
|
|
||||||
if not resolved[j].literal then
|
|
||||||
next_present = resolved[j].present
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if prev_present and next_present then
|
|
||||||
table.insert(virt_parts, { r.text, r.hl })
|
|
||||||
end
|
end
|
||||||
elseif r.present then
|
elseif r.present then
|
||||||
|
if pending_sep then
|
||||||
|
table.insert(virt_parts, pending_sep)
|
||||||
|
pending_sep = nil
|
||||||
|
end
|
||||||
table.insert(virt_parts, { r.text, r.hl })
|
table.insert(virt_parts, { r.text, r.hl })
|
||||||
|
else
|
||||||
|
pending_sep = nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return virt_parts
|
return virt_parts
|
||||||
|
|
@ -552,6 +553,8 @@ local function setup_highlights()
|
||||||
vim.api.nvim_set_hl(0, 'PendingBlocked', { link = 'DiagnosticError', default = true })
|
vim.api.nvim_set_hl(0, 'PendingBlocked', { link = 'DiagnosticError', default = true })
|
||||||
vim.api.nvim_set_hl(0, 'PendingRecur', { link = 'DiagnosticInfo', default = true })
|
vim.api.nvim_set_hl(0, 'PendingRecur', { link = 'DiagnosticInfo', default = true })
|
||||||
vim.api.nvim_set_hl(0, 'PendingFilter', { link = 'DiagnosticWarn', default = true })
|
vim.api.nvim_set_hl(0, 'PendingFilter', { link = 'DiagnosticWarn', default = true })
|
||||||
|
vim.api.nvim_set_hl(0, 'PendingForge', { link = 'DiagnosticInfo', default = true })
|
||||||
|
vim.api.nvim_set_hl(0, 'PendingForgeClosed', { link = 'Comment', default = true })
|
||||||
end
|
end
|
||||||
|
|
||||||
---@return string
|
---@return string
|
||||||
|
|
@ -727,6 +730,7 @@ function M.render(bufnr)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
restore_folds(bufnr)
|
restore_folds(bufnr)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
---@return nil
|
---@return nil
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue