98e4abffc7
* fix(buffer): keep conceal active in all modes and add `%l` EOL forge labels Problem: `concealcursor` was missing `i` and `v`, so concealed text (task IDs, forge tokens) leaked in insert and visual modes. Forge labels only rendered for the first span when multiple refs existed. Solution: set `concealcursor = 'nicv'` to keep conceal in all modes. Add `%l` EOL format specifier that renders all forge spans with independent highlights. Update default `eol_format` to include `%l`. * refactor: remove `- ` prefix from task line rendering Problem: task lines rendered as `- [ ] description` with a redundant markdown list marker prefix that added visual noise. Solution: render task lines as `[ ] description` instead. Update all line generation in `views.lua`, parsing patterns in `buffer.lua`, `diff.lua`, `textobj.lua`, syntax rules, and corresponding specs.
292 lines
9 KiB
Lua
292 lines
9 KiB
Lua
require('spec.helpers')
|
|
|
|
local config = require('pending.config')
|
|
local diff = require('pending.diff')
|
|
|
|
describe('filter', function()
|
|
local tmpdir
|
|
local pending
|
|
local buffer
|
|
|
|
before_each(function()
|
|
tmpdir = vim.fn.tempname()
|
|
vim.fn.mkdir(tmpdir, 'p')
|
|
vim.g.pending = { data_path = tmpdir .. '/tasks.json' }
|
|
config.reset()
|
|
package.loaded['pending'] = nil
|
|
package.loaded['pending.buffer'] = nil
|
|
pending = require('pending')
|
|
buffer = require('pending.buffer')
|
|
buffer.set_filter({}, {})
|
|
pending.store():load()
|
|
end)
|
|
|
|
after_each(function()
|
|
vim.fn.delete(tmpdir, 'rf')
|
|
vim.g.pending = nil
|
|
config.reset()
|
|
package.loaded['pending'] = nil
|
|
package.loaded['pending.buffer'] = nil
|
|
end)
|
|
|
|
describe('filter predicates', function()
|
|
it('cat: hides tasks with non-matching category', function()
|
|
local s = pending.store()
|
|
s:add({ description = 'Work task', category = 'Work' })
|
|
s:add({ description = 'Home task', category = 'Home' })
|
|
s:save()
|
|
pending.filter('cat:Work')
|
|
local hidden = buffer.hidden_ids()
|
|
local tasks = s:active_tasks()
|
|
local work_task = nil
|
|
local home_task = nil
|
|
for _, t in ipairs(tasks) do
|
|
if t.category == 'Work' then
|
|
work_task = t
|
|
end
|
|
if t.category == 'Home' then
|
|
home_task = t
|
|
end
|
|
end
|
|
assert.is_not_nil(work_task)
|
|
assert.is_not_nil(home_task)
|
|
assert.is_nil(hidden[work_task.id])
|
|
assert.is_true(hidden[home_task.id])
|
|
end)
|
|
|
|
it('cat: hides tasks with no category (default category)', function()
|
|
local s = pending.store()
|
|
s:add({ description = 'Work task', category = 'Work' })
|
|
s:add({ description = 'Inbox task' })
|
|
s:save()
|
|
pending.filter('cat:Work')
|
|
local hidden = buffer.hidden_ids()
|
|
local tasks = s:active_tasks()
|
|
local inbox_task = nil
|
|
for _, t in ipairs(tasks) do
|
|
if t.category ~= 'Work' then
|
|
inbox_task = t
|
|
end
|
|
end
|
|
assert.is_not_nil(inbox_task)
|
|
assert.is_true(hidden[inbox_task.id])
|
|
end)
|
|
|
|
it('overdue hides non-overdue tasks', function()
|
|
local s = pending.store()
|
|
s:add({ description = 'Old task', due = '2020-01-01' })
|
|
s:add({ description = 'Future task', due = '2099-01-01' })
|
|
s:add({ description = 'No due task' })
|
|
s:save()
|
|
pending.filter('overdue')
|
|
local hidden = buffer.hidden_ids()
|
|
local tasks = s:active_tasks()
|
|
local overdue_task, future_task, nodue_task
|
|
for _, t in ipairs(tasks) do
|
|
if t.due == '2020-01-01' then
|
|
overdue_task = t
|
|
end
|
|
if t.due == '2099-01-01' then
|
|
future_task = t
|
|
end
|
|
if not t.due then
|
|
nodue_task = t
|
|
end
|
|
end
|
|
assert.is_nil(hidden[overdue_task.id])
|
|
assert.is_true(hidden[future_task.id])
|
|
assert.is_true(hidden[nodue_task.id])
|
|
end)
|
|
|
|
it('today hides non-today tasks', function()
|
|
local s = pending.store()
|
|
local today = os.date('%Y-%m-%d') --[[@as string]]
|
|
s:add({ description = 'Today task', due = today })
|
|
s:add({ description = 'Old task', due = '2020-01-01' })
|
|
s:add({ description = 'Future task', due = '2099-01-01' })
|
|
s:save()
|
|
pending.filter('today')
|
|
local hidden = buffer.hidden_ids()
|
|
local tasks = s:active_tasks()
|
|
local today_task, old_task, future_task
|
|
for _, t in ipairs(tasks) do
|
|
if t.due == today then
|
|
today_task = t
|
|
end
|
|
if t.due == '2020-01-01' then
|
|
old_task = t
|
|
end
|
|
if t.due == '2099-01-01' then
|
|
future_task = t
|
|
end
|
|
end
|
|
assert.is_nil(hidden[today_task.id])
|
|
assert.is_true(hidden[old_task.id])
|
|
assert.is_true(hidden[future_task.id])
|
|
end)
|
|
|
|
it('priority hides non-priority tasks', function()
|
|
local s = pending.store()
|
|
s:add({ description = 'Important', priority = 1 })
|
|
s:add({ description = 'Normal' })
|
|
s:save()
|
|
pending.filter('priority')
|
|
local hidden = buffer.hidden_ids()
|
|
local tasks = s:active_tasks()
|
|
local important_task, normal_task
|
|
for _, t in ipairs(tasks) do
|
|
if t.priority and t.priority > 0 then
|
|
important_task = t
|
|
end
|
|
if not t.priority or t.priority == 0 then
|
|
normal_task = t
|
|
end
|
|
end
|
|
assert.is_nil(hidden[important_task.id])
|
|
assert.is_true(hidden[normal_task.id])
|
|
end)
|
|
|
|
it('multi-predicate AND: cat:Work + overdue', function()
|
|
local s = pending.store()
|
|
s:add({ description = 'Work overdue', category = 'Work', due = '2020-01-01' })
|
|
s:add({ description = 'Work future', category = 'Work', due = '2099-01-01' })
|
|
s:add({ description = 'Home overdue', category = 'Home', due = '2020-01-01' })
|
|
s:save()
|
|
pending.filter('cat:Work overdue')
|
|
local hidden = buffer.hidden_ids()
|
|
local tasks = s:active_tasks()
|
|
local work_overdue, work_future, home_overdue
|
|
for _, t in ipairs(tasks) do
|
|
if t.description == 'Work overdue' then
|
|
work_overdue = t
|
|
end
|
|
if t.description == 'Work future' then
|
|
work_future = t
|
|
end
|
|
if t.description == 'Home overdue' then
|
|
home_overdue = t
|
|
end
|
|
end
|
|
assert.is_nil(hidden[work_overdue.id])
|
|
assert.is_true(hidden[work_future.id])
|
|
assert.is_true(hidden[home_overdue.id])
|
|
end)
|
|
|
|
it('filter clear removes all predicates and hidden ids', function()
|
|
local s = pending.store()
|
|
s:add({ description = 'Work task', category = 'Work' })
|
|
s:add({ description = 'Home task', category = 'Home' })
|
|
s:save()
|
|
pending.filter('cat:Work')
|
|
assert.are.equal(1, #buffer.filter_predicates())
|
|
pending.filter('clear')
|
|
assert.are.equal(0, #buffer.filter_predicates())
|
|
assert.are.same({}, buffer.hidden_ids())
|
|
end)
|
|
|
|
it('filter empty string clears filter', function()
|
|
local s = pending.store()
|
|
s:add({ description = 'Work task', category = 'Work' })
|
|
s:save()
|
|
pending.filter('cat:Work')
|
|
assert.are.equal(1, #buffer.filter_predicates())
|
|
pending.filter('')
|
|
assert.are.equal(0, #buffer.filter_predicates())
|
|
end)
|
|
|
|
it('filter predicates persist across set_filter calls', function()
|
|
local s = pending.store()
|
|
s:add({ description = 'Work task', category = 'Work' })
|
|
s:add({ description = 'Home task', category = 'Home' })
|
|
s:save()
|
|
pending.filter('cat:Work')
|
|
local preds = buffer.filter_predicates()
|
|
assert.are.equal(1, #preds)
|
|
assert.are.equal('cat:Work', preds[1])
|
|
local hidden = buffer.hidden_ids()
|
|
local tasks = s:active_tasks()
|
|
local home_task
|
|
for _, t in ipairs(tasks) do
|
|
if t.category == 'Home' then
|
|
home_task = t
|
|
end
|
|
end
|
|
assert.is_true(hidden[home_task.id])
|
|
end)
|
|
end)
|
|
|
|
describe('diff.apply with hidden_ids', function()
|
|
it('does not mark hidden tasks as deleted', function()
|
|
local s = pending.store()
|
|
s:add({ description = 'Visible task' })
|
|
s:add({ description = 'Hidden task' })
|
|
s:save()
|
|
local tasks = s:active_tasks()
|
|
local hidden_task
|
|
for _, t in ipairs(tasks) do
|
|
if t.description == 'Hidden task' then
|
|
hidden_task = t
|
|
end
|
|
end
|
|
local hidden_ids = { [hidden_task.id] = true }
|
|
local lines = {
|
|
'/1/[ ] Visible task',
|
|
}
|
|
diff.apply(lines, s, hidden_ids)
|
|
s:load()
|
|
local hidden = s:get(hidden_task.id)
|
|
assert.are.equal('pending', hidden.status)
|
|
end)
|
|
|
|
it('marks tasks deleted when not hidden and not in buffer', function()
|
|
local s = pending.store()
|
|
s:add({ description = 'Keep task' })
|
|
s:add({ description = 'Delete task' })
|
|
s:save()
|
|
local tasks = s:active_tasks()
|
|
local keep_task, delete_task
|
|
for _, t in ipairs(tasks) do
|
|
if t.description == 'Keep task' then
|
|
keep_task = t
|
|
end
|
|
if t.description == 'Delete task' then
|
|
delete_task = t
|
|
end
|
|
end
|
|
local lines = {
|
|
'/' .. keep_task.id .. '/[ ] Keep task',
|
|
}
|
|
diff.apply(lines, s, {})
|
|
s:load()
|
|
local deleted = s:get(delete_task.id)
|
|
assert.are.equal('deleted', deleted.status)
|
|
end)
|
|
|
|
it('strips FILTER: line before parsing', function()
|
|
local s = pending.store()
|
|
s:add({ description = 'My task' })
|
|
s:save()
|
|
local tasks = s:active_tasks()
|
|
local task = tasks[1]
|
|
local lines = {
|
|
'FILTER: cat:Work',
|
|
'/' .. task.id .. '/[ ] My task',
|
|
}
|
|
diff.apply(lines, s, {})
|
|
s:load()
|
|
local t = s:get(task.id)
|
|
assert.are.equal('pending', t.status)
|
|
end)
|
|
|
|
it('parse_buffer skips FILTER: header line', function()
|
|
local lines = {
|
|
'FILTER: overdue',
|
|
'/1/[ ] A task',
|
|
}
|
|
local result = diff.parse_buffer(lines)
|
|
assert.are.equal(1, #result)
|
|
assert.are.equal('task', result[1].type)
|
|
assert.are.equal('A task', result[1].description)
|
|
end)
|
|
end)
|
|
end)
|