fix: Cycle through statuses until TODO is found when marking recurring tasks as DONE

src/Task.ts

@@ -428,7 +428,11 @@ export class Task {
             if (setCreatedDate) {
                 createdDate = window.moment();
             }
-            const nextStatus = StatusRegistry.getInstance().getNextStatusOrCreate(newStatus);
+            const statusRegistry = StatusRegistry.getInstance();
+            let nextStatus = statusRegistry.getNextStatusOrCreate(newStatus);
+            while (nextStatus.type !== StatusType.TODO) {
+                nextStatus = statusRegistry.getNextStatusOrCreate(nextStatus);
+            }
             const nextTask = new Task({
                 ...this,
                 ...nextOccurrence,
@@ -467,7 +471,6 @@ export class Task {
      */
     public toggleWithRecurrenceInUsersOrder(): Task[] {
         const newTasks = this.toggle();
-
         const { recurrenceOnNextLine: recurrenceOnNextLine } = getSettings();
         return recurrenceOnNextLine ? newTasks.reverse() : newTasks;
     }

tests/Commands/ToggleDone.test.ts

@@ -8,7 +8,7 @@ import { getNewCursorPosition, toggleLine } from '../../src/Commands/ToggleDone'
 import { GlobalFilter } from '../../src/Config/GlobalFilter';
 import { StatusRegistry } from '../../src/StatusRegistry';
 import { Status } from '../../src/Status';
-import { StatusConfiguration } from '../../src/StatusConfiguration';
+import { StatusConfiguration, StatusType } from '../../src/StatusConfiguration';
 
 window.moment = moment;
 
@@ -227,5 +227,21 @@ describe('ToggleDone', () => {
         });
     });
 
+    it('should proceed through the statuses until a TODO status is reached when a task is completed', () => {
+        // Arrange
+        const statusRegistry = StatusRegistry.getInstance();
+        statusRegistry.resetToDefaultStatuses();
+        statusRegistry.set([
+            new Status(new StatusConfiguration('x', 'Done', '-', false, StatusType.DONE)),
+            ...statusRegistry.registeredStatuses,
+        ]);
+
+        testToggleLine(
+            '- [ ] Recurring task should start with TODO| 🔁 every day 📅 2022-09-04 ',
+            `- [ ] Recurring task should start with TODO 🔁 every day 📅 2022-09-05
+- [x] Recurring task should start with TODO| 🔁 every day 📅 2022-09-04 ✅ 2022-09-04`,
+        );
+    });
+
     todaySpy.mockClear();
 });