Skip to content

fix(agenda): make spans work like emacs #915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2025
Merged

fix(agenda): make spans work like emacs #915

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions lua/orgmode/agenda/types/agenda.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,18 @@ function OrgAgendaType:change_span(span)
return
end
end
local from = nil
if self.view and self.view:is_in_range() then
local agenda_line = self:get_line(vim.fn.line('.'))
local metadata = agenda_line and agenda_line.metadata or {}
---@type OrgDate
local cursor_date = metadata.agenda_day or (metadata.agenda_item and metadata.agenda_item.date)
if cursor_date and type(span) == 'string' then
from = cursor_date:start_of(span)
end
end
self.span = span
self:_set_date_range()
self:_set_date_range(from)
return self
end

Expand Down Expand Up @@ -430,11 +440,13 @@ end
function OrgAgendaType:_set_date_range(from)
local span = self.span
from = from or self.from
local is_week = span == 'week' or span == '7'
if is_week and self.start_on_weekday then
from = from:set_isoweekday(self.start_on_weekday)
end

if self.start_on_weekday then
local is_week = span == 'week' or span == '7'
if is_week and from:is_same(Date.today(), 'week') then
from = from:set_isoweekday(self.start_on_weekday)
end
end
local to = nil
local modifier = { [span] = 1 }
if type(span) == 'number' then
Expand Down Expand Up @@ -463,9 +475,7 @@ function OrgAgendaType:_get_title()
span = string.format('%d days', span)
end
local span_number = ''
if span == 'week' then
span_number = string.format(' (W%s)', self.from:get_week_number())
end
span_number = string.format(' (W%s)', self.from:format('%V'))
return utils.capitalize(span) .. '-agenda' .. span_number .. ':'
end

Expand Down