Fixes a bug in completing future tasks (#470)

Author: chuck-flowers

lua/orgmode/objects/date.lua

@@ -757,16 +757,25 @@ function Date:apply_repeater()
   if not repeater then
     return self
   end
+
+  -- Repeater relative to completion time
   if repeater:match('^%.%+%d+') then
-    return date:set_todays_date():adjust(repeater:sub(2))
+    -- Strip the '.' from the repeater
+    local offset = repeater:sub(2)
+    return date:set_todays_date():adjust(offset)
   end
+
+  -- Repeater relative to deadline/scheduled date
   if repeater:match('^%+%+%d') then
-    while date.timestamp < current_time.timestamp do
-      date = date:adjust(repeater:sub(2))
-    end
+    -- Strip the '+' from the repeater
+    local offset = repeater:sub(2)
+    repeat
+      date = date:adjust(offset)
+    until date.timestamp > current_time.timestamp
     return date
   end
 
+  -- Simple repeat; apply repeater once to deadline/scheduled date
   return date:adjust(repeater)
 end
 

tests/plenary/object/date_spec.lua

@@ -571,6 +571,13 @@ describe('Date object', function()
     assert.are.same(inTwoWeeks:to_string(), sunday:apply_repeater_until(inTwoWeeks):to_string())
   end)
 
+  it('should apply repeater to future dates', function()
+    local tomorrow = Date.now({ adjustments = { '++1d' } }):add({ day = 1 })
+    local day_after_tomorrow = tomorrow:add({ day = 1 })
+    local updated_date = tomorrow:apply_repeater()
+    assert.are.same(updated_date:to_string(), day_after_tomorrow:to_string())
+  end)
+
   it('should cache check for today', function()
     local today = Date.today()
     assert.is.Nil(today.is_today_date)