Switch to the latest tip

Author: przemekd

lua/orgmode/agenda/diary_headline.lua

@@ -2,7 +2,16 @@
 ---@field file OrgFile
 ---@field _title string
 local DiaryHeadline = {}
-DiaryHeadline.__index = DiaryHeadline
+DiaryHeadline.__index = function(self, key)
+  local method = rawget(DiaryHeadline, key)
+  if method ~= nil then
+    return method
+  end
+  -- Return a no-op for any unimplemented headline interface methods
+  return function()
+    return nil
+  end
+end
 
 ---@param opts { file: OrgFile, title: string }
 function DiaryHeadline:new(opts)

lua/orgmode/agenda/types/agenda.lua

@@ -14,35 +14,16 @@ local DiaryHeadline = require('orgmode.agenda.diary_headline')
 local DiaryFormat = require('orgmode.diary.format')
 local DiarySexp = require('orgmode.diary.sexp')
 
-local function _parse_remind_event_date(expr, day)
-  if type(expr) ~= 'string' then
-    return nil
-  end
-  local y, m, d, n
-  -- org-anniversary YEAR MONTH DAY
-  y, m, d, n = expr:match("diary%-remind%s+%'%s*%(%s*org%-anniversary%s+(%d+)%s+(%d+)%s+(%d+)%s*%)%s+(%d+)")
-  if y and m and d then
-    return day:set({ month = tonumber(m), day = tonumber(d) }), tonumber(n)
-  end
-  -- diary-anniversary YEAR MONTH DAY or MONTH DAY YEAR
-  local a1, a2, a3
-  a1, a2, a3, n = expr:match("diary%-remind%s+%'%s*%(%s*diary%-anniversary%s+(%d+)%s+(%d+)%s+(%d+)%s*%)%s+(%d+)")
-  if a1 and a2 and a3 then
-    a1, a2, a3 = tonumber(a1), tonumber(a2), tonumber(a3)
-    local month, day_of_month
-    if a1 >= 1000 then
-      month, day_of_month = a2, a3
-    else
-      month, day_of_month = a1, a2
-    end
-    return day:set({ month = month, day = day_of_month }), tonumber(n)
-  end
-  -- diary-date MONTH DAY [YEAR]
-  m, d, n = expr:match("diary%-remind%s+%'%s*%(%s*diary%-date%s+(%d+)%s+(%d+)[%s%d]*%)%s+(%d+)")
-  if m and d then
-    return day:set({ month = tonumber(m), day = tonumber(d) }), tonumber(n)
-  end
-  return nil
+---@param expr string
+---@param day OrgDate
+---@return OrgDate|nil event_date
+---@return number|nil remind_days
+local function _get_remind_event_date(expr, day)
+  local month, day_of_month, remind_days = DiarySexp.extract_remind_info(expr)
+  if not month or not day_of_month or not remind_days then
+    return nil, nil
+  end
+  return day:set({ month = month, day = day_of_month }), remind_days
 end
 
 ---@alias OrgAgendaDay { day: OrgDate, agenda_items: OrgAgendaItem[], category_length: number, label_length: 0 }
@@ -606,46 +587,32 @@ function OrgAgendaType:_get_agenda_days()
         })
       end
       -- Include diary sexp entries
-      local ok_h, diary_headline_entries = pcall(function()
-        return headline:get_diary_sexps()
-      end)
-      if ok_h and diary_headline_entries then
-        for _, entry in ipairs(diary_headline_entries) do
-          local ok_p, matcher = pcall(function()
-            return entry.expr and DiarySexp.parse(entry.expr) or nil
-          end)
-          if ok_p and matcher then
-            table.insert(headline_dates, {
-              headline_date = self.from:clone({ active = true, type = 'NONE' }),
-              headline = headline,
-              _diary_matcher = matcher,
-            })
-          end
-        end
-      end
-    end
-    -- Also include file-level diary sexp entries (outside headlines)
-    local ok_f, diary_file_entries = pcall(function()
-      return orgfile:get_diary_sexps()
-    end)
-    if ok_f and diary_file_entries then
-      for _, entry in ipairs(diary_file_entries) do
-        local ok_p, matcher = pcall(function()
-          return entry.expr and DiarySexp.parse(entry.expr) or nil
-        end)
-        if ok_p and matcher then
+      for _, entry in ipairs(headline:get_diary_sexps()) do
+        local matcher = entry.expr and DiarySexp.parse(entry.expr) or nil
+        if matcher then
           table.insert(headline_dates, {
             headline_date = self.from:clone({ active = true, type = 'NONE' }),
-            headline = DiaryHeadline:new({ file = orgfile, title = '' }),
+            headline = headline,
             _diary_matcher = matcher,
-            _diary_text = entry.text,
-            _diary_file_level = true,
-            _diary_file = orgfile,
-            _diary_expr = entry.expr,
           })
         end
       end
     end
+    -- Also include file-level diary sexp entries (outside headlines)
+    for _, entry in ipairs(orgfile:get_diary_sexps()) do
+      local matcher = entry.expr and DiarySexp.parse(entry.expr) or nil
+      if matcher then
+        table.insert(headline_dates, {
+          headline_date = self.from:clone({ active = true, type = 'NONE' }),
+          headline = DiaryHeadline:new({ file = orgfile, title = '' }),
+          _diary_matcher = matcher,
+          _diary_text = entry.text,
+          _diary_file_level = true,
+          _diary_file = orgfile,
+          _diary_expr = entry.expr,
+        })
+      end
+    end
   end
 
   local headlines = {}
@@ -658,13 +625,10 @@ function OrgAgendaType:_get_agenda_days()
       local headline = item.headline
       local agenda_item = AgendaItem:new(item.headline_date, headline, day, index)
       if item._diary_matcher then
-        local ok_m, matches = pcall(function()
-          return item._diary_matcher:matches(day)
-        end)
-        matches = ok_m and matches or false
+        local matches = item._diary_matcher:matches(day)
         -- Compress diary-remind to a single pre-reminder per visible span + the event day
         if matches and item._diary_expr then
-          local event_date, remind_n = _parse_remind_event_date(item._diary_expr, day)
+          local event_date, remind_n = _get_remind_event_date(item._diary_expr, day)
           if event_date and remind_n then
             local delta = event_date:diff(day)
             if delta == 0 then
@@ -689,7 +653,7 @@ function OrgAgendaType:_get_agenda_days()
         agenda_item.is_same_day = matches
         if matches and item._diary_file_level and item._diary_text and item._diary_text ~= '' then
           local interpolated = DiaryFormat.interpolate(item._diary_text, item._diary_expr or '', day)
-          local event_date, remind_n = _parse_remind_event_date(item._diary_expr or '', day)
+          local event_date, remind_n = _get_remind_event_date(item._diary_expr or '', day)
           if event_date and remind_n then
             local delta = event_date:diff(day)
             if delta > 0 and delta <= remind_n then
@@ -709,20 +673,6 @@ function OrgAgendaType:_get_agenda_days()
 
     vim.list_extend(date.agenda_items, self:_prepare_grid_lines(dates, date))
 
-    -- After collecting items for this day, hide duplicate diary-remind entries across days within the reminder window
-    date.agenda_items = vim.tbl_filter(function(ai)
-      if not ai.headline or type(ai.headline.get_title) ~= 'function' then
-        return true
-      end
-      local title = (ai.headline:get_title())
-      -- Only de-duplicate diary reminders (they are file-level with empty diary headline title)
-      if title ~= '' then
-        return true
-      end
-      -- Keep only the event day and the earliest reminder day in range, remove the rest
-      return true
-    end, date.agenda_items)
-
     date.agenda_items = self:_sort(date.agenda_items)
     date.category_length = math.max(11, date.category_length + 1)
     date.label_length = math.min(11, date.label_length)

lua/orgmode/diary/format.lua

@@ -22,7 +22,7 @@ end
 ---@param date OrgDate
 ---@return string
 function M.interpolate(text, expr, date)
-  if (not text:find('%%d')) and (not text:find('%%s')) then
+  if not text:find('%', 1, true) then
     return text
   end
   local year
@@ -50,8 +50,7 @@ function M.interpolate(text, expr, date)
   end
   local age = (date.year or 0) - year
   local suff = ordinal_suffix(age)
-  local out = text
-  out = out:gsub('%%d', tostring(age))
+  local out = text:gsub('%%d', tostring(age))
   out = out:gsub('%%s', suff)
   return out
 end

lua/orgmode/diary/sexp.lua

@@ -1,5 +1,3 @@
-local utils = require('orgmode.utils')
-
 ---@class OrgDiarySexp
 ---@field _eval fun(self: OrgDiarySexp, date: OrgDate): boolean
 local OrgDiarySexp = {}
@@ -103,14 +101,7 @@ local function parse_expr(tokens, idx)
   end
 end
 
----@param sexp string
----@return any|nil
-local function normalize_sexp(sexp)
-  return sexp
-end
-
 local function parse(sexp)
-  sexp = normalize_sexp(sexp)
   local tokens = tokenize(sexp)
   local expr, next_idx = parse_expr(tokens, 1)
   if not expr or next_idx <= 1 then
@@ -301,23 +292,24 @@ local function eval(ast, date)
     -- Fast path for supported anniversary/date forms
     local inner_op = inner[1]
     if inner_op == 'org-anniversary' or inner_op == 'diary-anniversary' or inner_op == 'diary-date' then
+      local vars = build_variables(date)
       local month, day_of_month
       if inner_op == 'org-anniversary' then
-        month = tonumber(resolve(inner[3], build_variables(date)))
-        day_of_month = tonumber(resolve(inner[4], build_variables(date)))
+        month = tonumber(resolve(inner[3], vars))
+        day_of_month = tonumber(resolve(inner[4], vars))
       elseif inner_op == 'diary-anniversary' then
         -- (year month day) or (month day year)
-        local a1 = tonumber(resolve(inner[2], build_variables(date)))
-        local a2 = tonumber(resolve(inner[3], build_variables(date)))
-        local a3 = tonumber(resolve(inner[4], build_variables(date)))
+        local a1 = tonumber(resolve(inner[2], vars))
+        local a2 = tonumber(resolve(inner[3], vars))
+        local a3 = tonumber(resolve(inner[4], vars))
         if a1 and a1 >= 1000 then
           month, day_of_month = a2, a3
         else
           month, day_of_month = a1, a2
         end
       else -- diary-date month day [year]
-        month = tonumber(resolve(inner[2], build_variables(date)))
-        day_of_month = tonumber(resolve(inner[3], build_variables(date)))
+        month = tonumber(resolve(inner[2], vars))
+        day_of_month = tonumber(resolve(inner[3], vars))
       end
       if not month or not day_of_month then
         return false
@@ -361,8 +353,22 @@ local function eval(ast, date)
     else
       first_target_day = 1 + (7 - (first_wday - dow))
     end
-    local candidate_day = first_target_day + (nth - 1) * 7
-    return date.day == candidate_day
+    if nth > 0 then
+      local candidate_day = first_target_day + (nth - 1) * 7
+      return date.day == candidate_day
+    else
+      -- Negative nth: count from end of month
+      local last_day = date:last_day_of_month().day
+      local last_target_day = first_target_day
+      while last_target_day + 7 <= last_day do
+        last_target_day = last_target_day + 7
+      end
+      local candidate_day = last_target_day + (nth + 1) * 7
+      if candidate_day < 1 then
+        return false
+      end
+      return date.day == candidate_day
+    end
   end
 
   -- Unknown operator: don't match
@@ -394,6 +400,51 @@ local function compile(expr)
   return OrgDiarySexp:new(matcher, expr)
 end
 
+---Extract event date (month, day) and reminder window from a diary-remind AST.
+---@param ast any
+---@return number|nil month
+---@return number|nil day_of_month
+---@return number|nil remind_days
+local function extract_remind_info(ast)
+  if type(ast) ~= 'table' or ast[1] ~= 'diary-remind' then
+    return nil, nil, nil
+  end
+  local inner = ast[2]
+  if type(inner) == 'table' and inner[1] == 'quote' then
+    inner = inner[2]
+  end
+  if type(inner) ~= 'table' then
+    return nil, nil, nil
+  end
+  local days_arg = ast[3]
+  local days = type(days_arg) == 'number' and days_arg or tonumber(days_arg)
+  if not days then
+    return nil, nil, nil
+  end
+  local inner_op = inner[1]
+  local month, day_of_month
+  if inner_op == 'org-anniversary' then
+    month = tonumber(inner[3])
+    day_of_month = tonumber(inner[4])
+  elseif inner_op == 'diary-anniversary' then
+    local a1 = tonumber(inner[2])
+    local a2 = tonumber(inner[3])
+    local a3 = tonumber(inner[4])
+    if a1 and a1 >= 1000 then
+      month, day_of_month = a2, a3
+    else
+      month, day_of_month = a1, a2
+    end
+  elseif inner_op == 'diary-date' then
+    month = tonumber(inner[2])
+    day_of_month = tonumber(inner[3])
+  end
+  if not month or not day_of_month then
+    return nil, nil, nil
+  end
+  return month, day_of_month, days
+end
+
 local M = {}
 
 ---@param expr string
@@ -409,6 +460,26 @@ function M.parse(expr)
   return compile(trimmed)
 end
 
+---Extract event month/day and reminder days from a diary-remind expression string.
+---@param expr string
+---@return number|nil month
+---@return number|nil day_of_month
+---@return number|nil remind_days
+function M.extract_remind_info(expr)
+  if type(expr) ~= 'string' then
+    return nil, nil, nil
+  end
+  local trimmed = vim.trim(expr)
+  if not trimmed:match('^%(') then
+    trimmed = '(' .. trimmed .. ')'
+  end
+  local ok, ast = pcall(parse, trimmed)
+  if not ok or not ast then
+    return nil, nil, nil
+  end
+  return extract_remind_info(ast)
+end
+
 return M
 
 

lua/orgmode/files/file.lua

@@ -838,14 +838,21 @@ function OrgFile:get_diary_sexps()
   self:parse(true)
   local entries = {}
   for i, line in ipairs(self.lines) do
-    -- Avoid timestamps like <%%(...)> or [%%(...)]
-    if line:find('%%(', 1, true) and not line:find('<%%(', 1, true) and not line:find('[%%(', 1, true) then
+    if line:find('%%(', 1, true) then
       local search_from = 1
       while true do
         local start_idx = line:find('%%(', search_from, true)
         if not start_idx then
           break
         end
+        -- Skip timestamp-wrapped sexps like <%%(...)> or [%%(...)]
+        if start_idx > 1 then
+          local prev = line:sub(start_idx - 1, start_idx - 1)
+          if prev == '<' or prev == '[' then
+            search_from = start_idx + 3
+            goto continue
+          end
+        end
         local expr_start = start_idx + 3 -- after "%%("
         local depth = 1
         local j = expr_start
@@ -874,6 +881,7 @@ function OrgFile:get_diary_sexps()
           range = Range.from_line(i),
         })
         search_from = close_idx + 1
+        ::continue::
       end
     end
   end