Merge pull request #2992 from ilandikov/refactor-simplify-handleNewSt…

…atus

refactor: simplify `Task.handleNewStatus()`

src/Task/Task.ts

@@ -361,31 +361,34 @@ export class Task extends ListItem {
             today,
         );
 
-        let nextOccurrence: Occurrence | null = null;
-        if (newStatus.isCompleted()) {
-            if (!this.status.isCompleted() && this.recurrence !== null) {
-                nextOccurrence = this.recurrence.next(today);
-            }
-        }
-
         const toggledTask = new Task({
             ...this,
             status: newStatus,
             doneDate: newDoneDate,
             cancelledDate: newCancelledDate,
         });
 
-        const newTasks: Task[] = [];
+        if (!newStatus.isCompleted()) {
+            return [toggledTask];
+        }
 
-        if (nextOccurrence !== null) {
-            const nextTask = this.createNextOccurrence(newStatus, nextOccurrence);
-            newTasks.push(nextTask);
+        if (this.status.isCompleted()) {
+            return [toggledTask];
         }
 
-        // Write next occurrence before previous occurrence.
-        newTasks.push(toggledTask);
+        const recurrence = this.recurrence;
+        if (recurrence === null) {
+            return [toggledTask];
+        }
 
-        return newTasks;
+        const nextOccurrence = recurrence.next(today);
+        if (nextOccurrence === null) {
+            return [toggledTask];
+        }
+
+        const nextTask = this.createNextOccurrence(newStatus, nextOccurrence);
+        // Write next occurrence before previous occurrence.
+        return [nextTask, toggledTask];
     }
 
     /**