fix(todo_keywords): Do not set todo keyword on repeater if there was not any before

Closes #1096

Author: kristijanhusak

lua/orgmode/objects/todo_state.lua

@@ -153,8 +153,9 @@ function TodoState:_navigate_within_sequence(direction)
 end
 
 ---@param headline OrgHeadline|nil
----@return OrgTodoKeyword
-function TodoState:get_reset_todo(headline)
+---@param initial_todo_keyword string | nil The initial TODO keyword of the headline
+---@return OrgTodoKeyword | ''
+function TodoState:get_reset_todo(headline, initial_todo_keyword)
   local repeat_to_state = (headline and headline:get_property('REPEAT_TO_STATE'))
     or config.opts.org_todo_repeat_to_state
   local todo_keyword = self.todos:find(repeat_to_state)
@@ -163,6 +164,11 @@ function TodoState:get_reset_todo(headline)
     return todo_keyword
   end
 
+  -- If there was no TODO at the beginning, make sure we don't set one
+  if not initial_todo_keyword then
+    return TodoKeyword:empty()
+  end
+
   -- For repeating tasks, reset to first TODO of the same sequence
   if headline and self.current_state and not self.current_state:is_empty() then
     local seq_idx = self.current_state.sequence_index

lua/orgmode/org/mappings.lua

@@ -476,14 +476,9 @@ function OrgMappings:_todo_change_state(direction)
   -- Reset to first TODO of the same sequence for repeating tasks
   local todos = item.file:get_todo_keywords()
   local todo_state = TodoState:new({ current_state = new_todo, todos = todos })
-  local reset_keyword = todo_state:get_reset_todo(item)
+  local reset_keyword = todo_state:get_reset_todo(item, old_state)
 
-  if reset_keyword then
-    item:set_todo(reset_keyword.value)
-  else
-    self:_change_todo_state('reset')
-    new_todo = item:get_todo()
-  end
+  item:set_todo(reset_keyword.value)
 
   local prompt_repeat_note = config.org_log_repeat == 'note'
   local log_repeat_enabled = config.org_log_repeat ~= false
@@ -1066,14 +1061,6 @@ function OrgMappings:_change_todo_state(direction, use_fast_access)
 
   local todos = headline.file:get_todo_keywords()
 
-  -- Store the sequence index of the original keyword, if any
-  local original_sequence_index = nil
-  local current_keyword_obj = todos:find(current_keyword)
-
-  if current_keyword_obj then
-    original_sequence_index = current_keyword_obj.sequence_index
-  end
-
   local todo_state = TodoState:new({ current_state = current_keyword, todos = todos })
   local next_state = nil
 
@@ -1084,8 +1071,6 @@ function OrgMappings:_change_todo_state(direction, use_fast_access)
       next_state = todo_state:get_next()
     elseif direction == 'prev' then
       next_state = todo_state:get_prev()
-    elseif direction == 'reset' then
-      next_state = todo_state:get_reset_todo(headline)
     end
   end
 

tests/plenary/object/todo_state_spec.lua

@@ -188,7 +188,7 @@ describe('Todo state', function()
         current_state = headline1:get_todo(),
         todos = file:get_todo_keywords(),
       })
-      local reset_state1 = todo_state1:get_reset_todo(headline1)
+      local reset_state1 = todo_state1:get_reset_todo(headline1, 'TODO')
 
       -- It should reset to TODO, which is the first state in the first sequence
       assert.are.equal('TODO', reset_state1.value)
@@ -199,7 +199,7 @@ describe('Todo state', function()
         current_state = headline2:get_todo(),
         todos = file:get_todo_keywords(),
       })
-      local reset_state2 = todo_state2:get_reset_todo(headline2)
+      local reset_state2 = todo_state2:get_reset_todo(headline2, 'MEETING')
 
       -- It should reset to MEETING, which is the first state in the second sequence
       assert.are.equal('MEETING', reset_state2.value)