Refactor EditorCounter cancellation

coteditor · Aug 24, 2024 · f1945e7 · f1945e7
1 parent 8ca26cd
commit f1945e7
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 19 deletions.
diff --git a/CotEditor/Sources/EditorCounter.swift b/CotEditor/Sources/EditorCounter.swift
@@ -114,7 +114,9 @@ struct EditorCount: Equatable {
     func cancel() {
 
         self.contentTask?.cancel()
+        self.contentTask = nil
         self.selectionTask?.cancel()
+        self.selectionTask = nil
     }
 
 
@@ -215,8 +217,7 @@ struct EditorCount: Equatable {
         self.types = self.updatesAll ? .all : self.statusBarRequirements
 
         if self.types.isEmpty {
-            self.contentTask?.cancel()
-            self.selectionTask?.cancel()
+            self.cancel()
             return
         }
 

diff --git a/CotEditor/Sources/EditorTextView.swift b/CotEditor/Sources/EditorTextView.swift
@@ -351,6 +351,7 @@ final class EditorTextView: NSTextView, CurrentLineHighlighting, MultiCursorEdit
             }
             self.keyStateObservers.removeAll()
             self.instanceHighlightTask?.cancel()
+            self.instanceHighlightTask = nil
         }
     }
 

diff --git a/CotEditor/Sources/FindPanelContentViewController.swift b/CotEditor/Sources/FindPanelContentViewController.swift
@@ -81,9 +81,9 @@ final class FindPanelContentViewController: NSSplitViewController {
 
         self.splitViewItems = [fieldViewItem, resultViewItem, buttonViewItem]
 
-        self.resultObservationTask = Task {
+        self.resultObservationTask = Task { [weak self] in
             for await textFinder in NotificationCenter.default.notifications(named: TextFinder.didFindAllNotification).map({ $0.object as! TextFinder }) {
-                self.didFinishFindAll(in: textFinder)
+                self?.didFinishFindAll(in: textFinder)
             }
         }
     }

diff --git a/CotEditor/Sources/NSTouchBar+Validation.swift b/CotEditor/Sources/NSTouchBar+Validation.swift
@@ -114,11 +114,6 @@ extension NSTouchBar {
     private init() { }
 
 
-    deinit {
-        self.applicationObservationTask?.cancel()
-    }
-
-
 
     // MARK: Private Methods
 

diff --git a/CotEditor/Sources/ScriptManager.swift b/CotEditor/Sources/ScriptManager.swift
@@ -73,7 +73,6 @@ final class ScriptManager: NSObject, NSFilePresenter, @unchecked Sendable {
 
 
     deinit {
-        self.menuUpdateTask?.cancel()
         if self.presentedItemURL != nil {
             NSFileCoordinator.removeFilePresenter(self)
         }

diff --git a/CotEditor/Sources/ShortcutField.swift b/CotEditor/Sources/ShortcutField.swift
@@ -144,6 +144,7 @@ final class ShortcutTextField: NSTextField, NSTextViewDelegate {
 
         if newWindow == nil {
             self.windowObservationTask?.cancel()
+            self.windowObservationTask = nil
         }
     }
 

diff --git a/CotEditor/Sources/SyntaxParser.swift b/CotEditor/Sources/SyntaxParser.swift
@@ -80,7 +80,9 @@ extension NSAttributedString.Key {
     func cancel() {
 
         self.outlineParseTask?.cancel()
+        self.outlineParseTask = nil
         self.highlightParseTask?.cancel()
+        self.highlightParseTask = nil
     }
 
 

diff --git a/CotEditor/Sources/TextFinder.swift b/CotEditor/Sources/TextFinder.swift
@@ -156,15 +156,6 @@ struct TextFindAllResult {
 
 
 
-    // MARK: Lifecycle
-
-    deinit {
-        self.findTask?.cancel()
-        self.highlightObservationTask?.cancel()
-    }
-
-
-
     // MARK: Public Methods
 
     /// Schedules an incremental search.

diff --git a/CotEditor/Sources/WindowContentViewController.swift b/CotEditor/Sources/WindowContentViewController.swift
@@ -142,7 +142,10 @@ final class WindowContentViewController: NSSplitViewController, NSToolbarItemVal
         super.viewDidDisappear()
 
         self.versionBrowserEnterObservationTask?.cancel()
+        self.versionBrowserEnterObservationTask = nil
         self.versionBrowserExitObservationTask?.cancel()
+        self.versionBrowserExitObservationTask = nil
+
         if let sidebarStateCache {
             self.sidebarViewItem?.isCollapsed = sidebarStateCache
             self.sidebarStateCache = nil