Fix recurring event sorting in agenda view. Closes #337

Author: kristijanhusak

lua/orgmode/agenda/agenda_item.lua

@@ -28,13 +28,13 @@ local AgendaItem = {}
 ---@param index number
 function AgendaItem:new(headline_date, headline, date, index)
   local opts = {}
-  opts.headline_date = headline_date
+  opts.headline_date = headline_date:apply_repeater_until(date)
   opts.headline = headline
   opts.date = date
   opts.index = index or 1
   opts.is_valid = false
   opts.is_today = date:is_today()
-  opts.is_same_day = headline_date:is_same(date, 'day') or headline_date:repeats_on(date)
+  opts.is_same_day = opts.headline_date:is_same(date, 'day')
   opts.is_in_date_range = headline_date:is_none() and headline_date:is_in_date_range(date)
   opts.date_range_days = headline_date:get_date_range_days()
   opts.label = ''

tests/plenary/object/date_spec.lua

@@ -565,6 +565,12 @@ describe('Date object', function()
     assert.is.True(closest_friday:diff(Date.now()) < 8)
   end)
 
+  it('should apply repeater date until provided date', function()
+    local sunday = Date.from_string('2022-06-19 Sun 12:30 +1w')
+    local inTwoWeeks = Date.from_string('2022-06-26 Sun 12:30 +1w')
+    assert.are.same(inTwoWeeks:to_string(), sunday:apply_repeater_until(inTwoWeeks):to_string())
+  end)
+
   it('should cache check for today', function()
     local today = Date.today()
     assert.is.Nil(today.is_today_date)