Omit calling UserDefaultsObservation.invalidate() in deinit

KenSenda · Jun 28, 2020 · 57b605d · 57b605d
1 parent 5732aa7
commit 57b605d
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 57 deletions.
diff --git a/CotEditor/Sources/DefaultKey+Observation.swift b/CotEditor/Sources/DefaultKey+Observation.swift
@@ -29,6 +29,8 @@ extension UserDefaults {
 
     /// Register the observer object to observe UserDefaults value change.
     ///
+    /// You don't need to invalidate an observer in its `deinit` method.
+    ///
     /// - Parameters:
     ///   - key: The typed UserDefaults key to obseve the change of its value.
     ///   - queue: The operation queue where to perform the `changeHandler`.

diff --git a/CotEditor/Sources/DocumentViewController.swift b/CotEditor/Sources/DocumentViewController.swift
@@ -47,7 +47,6 @@ final class DocumentViewController: NSSplitViewController, SyntaxParserDelegate,
 
     deinit {
         self.appearanceObserver?.invalidate()
-        self.defaultsObservers.forEach { $0.invalidate() }
     }
 
 

diff --git a/CotEditor/Sources/DocumentWindowController.swift b/CotEditor/Sources/DocumentWindowController.swift
@@ -38,15 +38,6 @@ final class DocumentWindowController: NSWindowController {
 
 
     // MARK: -
-    // MARK: Lifecycle
-
-    deinit {
-        self.windowAlphaObserver?.invalidate()
-        self.appearanceModeObserver?.invalidate()
-    }
-
-
-
     // MARK: Window Controller Methods
 
     /// prepare window

diff --git a/CotEditor/Sources/EditorTextView.swift b/CotEditor/Sources/EditorTextView.swift
@@ -198,7 +198,6 @@ final class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, URLDe
     deinit {
         self.insertionPointTimer?.cancel()
         self.urlDetectionQueue.cancelAllOperations()
-        self.defaultsObservers.forEach { $0.invalidate() }
 
         if let observer = self.windowOpacityObserver {
             NotificationCenter.default.removeObserver(observer)

diff --git a/CotEditor/Sources/EncodingManager.swift b/CotEditor/Sources/EncodingManager.swift
@@ -69,11 +69,6 @@ final class EncodingManager: NSObject {
     }
 
 
-    deinit {
-        self.encodingListObserver?.invalidate()
-    }
-
-
 
     // MARK: Public Methods
 

diff --git a/CotEditor/Sources/FindPanelButtonViewController.swift b/CotEditor/Sources/FindPanelButtonViewController.swift
@@ -8,7 +8,7 @@
 //
 //  ---------------------------------------------------------------------------
 //
-//  © 2014-2019 1024jp
+//  © 2014-2020 1024jp
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -36,14 +36,6 @@ final class FindPanelButtonViewController: NSViewController {
 
 
     // MARK: -
-    // MARK: Lifecycle
-
-    deinit {
-        self.findNextAfterReplaceObserver?.invalidate()
-    }
-
-
-
     // MARK: View Controller Methods
 
     /// setup UI

diff --git a/CotEditor/Sources/FindPanelFieldViewController.swift b/CotEditor/Sources/FindPanelFieldViewController.swift
@@ -52,7 +52,6 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate {
 
     deinit {
         self.scrollerStyleObserver?.invalidate()
-        self.defaultsObservers.forEach { $0.invalidate() }
     }
 
 

diff --git a/CotEditor/Sources/FindPanelLayoutManager.swift b/CotEditor/Sources/FindPanelLayoutManager.swift
@@ -66,12 +66,6 @@ final class FindPanelLayoutManager: NSLayoutManager, NSLayoutManagerDelegate, In
     }
 
 
-    deinit {
-        self.invisiblesDefaultsObservers.forEach { $0.invalidate() }
-        self.invisibleVisibilityObserver?.invalidate()
-    }
-
-
 
     // MARK: Layout Manager Methods
 

diff --git a/CotEditor/Sources/LayoutManager.swift b/CotEditor/Sources/LayoutManager.swift
@@ -106,12 +106,6 @@ final class LayoutManager: NSLayoutManager, InvisibleDrawing, ValidationIgnorabl
     }
 
 
-    deinit {
-        self.invisiblesDefaultsObservers.forEach { $0.invalidate() }
-        self.indentGuideObserver?.invalidate()
-    }
-
-
 
     // MARK: Layout Manager Methods
 

diff --git a/CotEditor/Sources/OutlineViewController.swift b/CotEditor/Sources/OutlineViewController.swift
@@ -69,8 +69,6 @@ final class OutlineViewController: NSViewController {
         if let observer = self.selectionObserver {
             NotificationCenter.default.removeObserver(observer)
         }
-
-        self.fontSizeObserver?.invalidate()
     }
 
 

diff --git a/CotEditor/Sources/StatusBarController.swift b/CotEditor/Sources/StatusBarController.swift
@@ -39,14 +39,6 @@ final class StatusBarController: NSViewController {
 
 
     // MARK: -
-    // MARK: Lifecycle
-
-    deinit {
-        self.defaultsObservers.forEach { $0.invalidate() }
-    }
-
-
-
     // MARK: View Controller Methods
 
     /// setup

diff --git a/CotEditor/Sources/ToolbarController.swift b/CotEditor/Sources/ToolbarController.swift
@@ -9,7 +9,7 @@
 //  ---------------------------------------------------------------------------
 //
 //  © 2004-2007 nakamuxu
-//  © 2014-2019 1024jp
+//  © 2014-2020 1024jp
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -105,14 +105,6 @@ final class ToolbarController: NSObject {
 
 
     // MARK: -
-    // MARK: Lifecycle
-
-    deinit {
-        self.recentStyleNamesObserver?.invalidate()
-    }
-
-
-
     // MARK: Object Methods
 
     override func awakeFromNib() {
-Original file line number
+Diff line change
@@ Expand Up @@
         deinit {
             self.appearanceObserver?.invalidate()
-            self.defaultsObservers.forEach { $0.invalidate() }
         }
@@ Expand Down @@