feat(forge): inline overlay rendering for forge links (#126)
* docs: document S3 backend, auto-auth, and `:Pending done` command Problem: The S3 backend had no `:Pending s3` entry in the COMMANDS section, `:Pending auth` only mentioned Google, the `sync` config field omitted `s3`, `_s3_sync_id` was missing from the data format section, `:Pending done` was implemented but undocumented, and the README lacked a features overview. Solution: Add `:Pending s3` and `:Pending done` command docs, rewrite `:Pending auth` to cover all backends and sub-actions, update config and data format references, add `aws` CLI to requirements, and add a Features section to `README.md`. * feat(forge): add forge link parser and metadata fetcher Problem: no way to associate tasks with GitHub, GitLab, or Codeberg issues/PRs, or to track their remote state. Solution: add `forge.lua` with shorthand (`gh:user/repo#42`) and full URL parsing, async metadata fetching via `curl`, label formatting, conceal pattern generation, token resolution, and `refresh()` for state pull (closed/merged -> done). * feat(config): add forge config defaults and `%l` eol specifier Problem: no configuration surface for forge link rendering, icons, issue format, or self-hosted instances. Solution: add `pending.ForgeConfig` class with per-forge `token`, `icon`, `issue_format`, and `instances` fields. Add `%l` to the default `eol_format` so forge labels render in virtual text. * feat(parse): extract forge refs from task body Problem: `parse.body()` had no awareness of forge link tokens, so `gh:user/repo#42` stayed in the description instead of metadata. Solution: add `forge_ref` field to `pending.Metadata` and extend the right-to-left token loop in `body()` to call `forge.parse_ref()` as the final fallback before breaking. * feat(diff): persist forge refs in store on write Problem: forge refs parsed from buffer lines were discarded during diff reconciliation and never stored in the JSON. Solution: thread `forge_ref` through `parse_buffer` entries into `diff.apply`, storing it in `task._extra._forge_ref` for both new and existing tasks. * feat(views): pass forge ref and cache to line metadata Problem: `LineMeta` had no forge fields, so `buffer.lua` could not render forge labels or apply forge-specific highlights. Solution: add `forge_ref` and `forge_cache` fields to `LineMeta`, populated from `task._extra` in both `category_view` and `priority_view`. * 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). * feat(complete): add forge shorthand omnifunc completions Problem: no completion support for `gh:`, `gl:`, or `cb:` tokens, requiring users to type owner/repo from memory. Solution: extend `omnifunc` to detect `gh:`/`gl:`/`cb:` prefixes and complete with `owner/repo#` candidates from existing forge refs in the store. * feat: trigger forge refresh on buffer open Problem: forge metadata was never fetched, so virt text highlights could not reflect remote issue/PR state. Solution: call `forge.refresh()` in `M.open()` so metadata is fetched once per `:Pending` invocation rather than on every render. * test(forge): add forge parsing spec Problem: no test coverage for forge link shorthand parsing, URL parsing, label formatting, or API URL generation. Solution: add `spec/forge_spec.lua` covering `_parse_shorthand`, `parse_ref` for all three forges, full URL parsing including nested GitLab groups, `format_label`, and `_api_url`. * docs: document forge links feature Problem: no user-facing documentation for forge link syntax, configuration, or behavior. Solution: add forge links section to `README.md` and `pending.txt` covering shorthand/URL syntax, config options, virtual text rendering, state pull, and auth resolution. * feat(forge): add `find_refs()` inline token scanner Problem: forge tokens were extracted by `parse.body()` which stripped them from the description, making editing awkward and multi-ref lines impossible. Solution: add `find_refs(text)` that scans a string for all forge tokens by whitespace tokenization, returning byte offsets and parsed refs without modifying the input. Remove unused `conceal_patterns()`. * refactor: move forge ref detection from `parse.body()` to `diff` Problem: `parse.body()` stripped forge tokens from the description, losing the raw text. This made inline overlay rendering impossible since the token no longer existed in the buffer. Solution: remove the `forge.parse_ref()` branch from `parse.body()` and call `forge.find_refs()` in `diff.parse_buffer()` instead. The description now retains forge tokens verbatim; `_extra._forge_ref` is still populated from the first matched ref. * feat(buffer): render forge links as inline conceal overlays Problem: forge tokens were stripped from the buffer and shown as EOL virtual text via `%l`. The token disappeared from the editable line, and multi-ref tasks broke. Solution: compute `forge_spans` in `views.lua` with byte offsets for each forge token in the rendered line. In `apply_inline_row()`, place extmarks with `conceal=''` and `virt_text_pos='inline'` to visually replace each raw token with its formatted label. Clear stale `forge_spans` on dirty rows to prevent `end_col` out-of-range errors after edits like `dd`. * fix(config): remove `%l` from default `eol_format` Problem: forge links are now rendered inline, making the `%l` EOL specifier redundant in the default format. Solution: change default `eol_format` from `'%l %c %r %d'` to `'%c %r %d'`. The `%l` specifier remains functional for users who explicitly set it. * test(forge): update specs for inline forge refs Problem: existing tests asserted that `parse.body()` stripped forge tokens from the description and populated `meta.forge_ref`. The `conceal_patterns` test referenced a removed function. Solution: update `parse.body` integration tests to assert tokens stay in the description. Add `find_refs()` tests covering single/multiple refs, URLs, byte offsets, and empty cases. Remove `conceal_patterns` test. Update diff tests to assert description includes the token. * docs: update forge links for inline overlay rendering Problem: documentation described forge tokens as stripped from the description and rendered via EOL `%l` specifier by default. Solution: update forge links section to describe inline conceal overlay rendering. Update default `eol_format` reference. Change `issue_format` field description from "EOL label" to "inline overlay label". * ci: format
This commit is contained in:
Barrett Ruth
parent
2d59868b82
commit
4c0ddad39c
10 changed files with 1071 additions and 23 deletions
|
|
@ -168,6 +168,19 @@ local function apply_inline_row(bufnr, row, m, icons)
|
|||
virt_text_pos = 'overlay',
|
||||
priority = 100,
|
||||
})
|
||||
if m.forge_spans then
|
||||
local forge = require('pending.forge')
|
||||
for _, span in ipairs(m.forge_spans) do
|
||||
local label_text, hl_group = forge.format_label(span.ref, span.cache)
|
||||
vim.api.nvim_buf_set_extmark(bufnr, ns_inline, row, span.col_start, {
|
||||
end_col = span.col_end,
|
||||
conceal = '',
|
||||
virt_text = { { label_text, hl_group } },
|
||||
virt_text_pos = 'inline',
|
||||
priority = 90,
|
||||
})
|
||||
end
|
||||
end
|
||||
elseif m.type == 'header' then
|
||||
local line = vim.api.nvim_buf_get_lines(bufnr, row, row + 1, false)[1] or ''
|
||||
vim.api.nvim_buf_set_extmark(bufnr, ns_inline, row, 0, {
|
||||
|
|
@ -213,6 +226,7 @@ function M.reapply_dirty_inline(bufnr)
|
|||
local line = vim.api.nvim_buf_get_lines(bufnr, row - 1, row, false)[1] or ''
|
||||
local old_status = m.status
|
||||
m.status = infer_status(line) or m.status
|
||||
m.forge_spans = nil
|
||||
log.debug(
|
||||
('reapply_dirty: row=%d line=%q old_status=%s new_status=%s'):format(
|
||||
row,
|
||||
|
|
@ -365,7 +379,7 @@ end
|
|||
---@param winid integer
|
||||
local function set_win_options(winid)
|
||||
vim.wo[winid].conceallevel = 3
|
||||
vim.wo[winid].concealcursor = 'nvic'
|
||||
vim.wo[winid].concealcursor = 'nc'
|
||||
vim.wo[winid].winfixheight = true
|
||||
end
|
||||
|
||||
|
|
@ -432,7 +446,7 @@ end
|
|||
|
||||
---@class pending.EolSegment
|
||||
---@field type 'specifier'|'literal'
|
||||
---@field key? 'c'|'r'|'d'
|
||||
---@field key? 'c'|'r'|'d'|'l'
|
||||
---@field text? string
|
||||
|
||||
---@param fmt string
|
||||
|
|
@ -444,7 +458,7 @@ local function parse_eol_format(fmt)
|
|||
while pos <= len do
|
||||
if fmt:sub(pos, pos) == '%' and pos + 1 <= len then
|
||||
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 })
|
||||
pos = pos + 2
|
||||
else
|
||||
|
|
@ -471,7 +485,10 @@ local function build_eol_virt(segments, m, icons)
|
|||
for i, seg in ipairs(segments) do
|
||||
if seg.type == 'specifier' then
|
||||
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
|
||||
hl = 'PendingHeader'
|
||||
elseif seg.key == 'r' and m.recur then
|
||||
|
|
@ -488,26 +505,20 @@ local function build_eol_virt(segments, m, icons)
|
|||
end
|
||||
|
||||
local virt_parts = {}
|
||||
for i, r in ipairs(resolved) do
|
||||
local pending_sep = nil
|
||||
for _, r in ipairs(resolved) do
|
||||
if r.literal then
|
||||
local prev_present, next_present = false, false
|
||||
for j = i - 1, 1, -1 do
|
||||
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 })
|
||||
if #virt_parts > 0 and not pending_sep then
|
||||
pending_sep = { r.text, r.hl }
|
||||
end
|
||||
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 })
|
||||
else
|
||||
pending_sep = nil
|
||||
end
|
||||
end
|
||||
return virt_parts
|
||||
|
|
@ -552,6 +563,8 @@ local function setup_highlights()
|
|||
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, '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
|
||||
|
||||
---@return string
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue