Refactor LineEndingScanner

coteditor · Jul 9, 2024 · c7b9127 · c7b9127
1 parent c1f128d
commit c7b9127
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 26 deletions.
diff --git a/CotEditor/Sources/Document.swift b/CotEditor/Sources/Document.swift
@@ -73,7 +73,7 @@ extension Document: EditorSource {
     let textStorage = NSTextStorage()
     let syntaxParser: SyntaxParser
     @ObservationIgnored @Published private(set) var fileEncoding: FileEncoding
-    @ObservationIgnored @Published private(set) var lineEnding: LineEnding
+    @ObservationIgnored @Published private(set) var lineEnding: LineEnding  { didSet { self.lineEndingScanner.baseLineEnding = lineEnding } }
     @ObservationIgnored @Published private(set) var mode: Mode
     private(set) nonisolated(unsafe) var fileAttributes: FileAttributes?
 
@@ -137,7 +137,6 @@ extension Document: EditorSource {
 
         super.init()
 
-        self.lineEndingScanner.observe(lineEnding: self.$lineEnding)
         self.counter.source = self
 
         self.defaultObservers = [
@@ -958,9 +957,7 @@ extension Document: EditorSource {
 
         assert(Thread.isMainThread)
 
-        guard lineEnding != self.lineEnding ||
-                !self.lineEndingScanner.inconsistentLineEndings.isEmpty
-        else { return }
+        guard lineEnding != self.lineEnding || !self.lineEndingScanner.inconsistentLineEndings.isEmpty else { return }
 
         // register undo
         if let undoManager = self.undoManager {
@@ -979,14 +976,14 @@ extension Document: EditorSource {
                                              table: "MainMenu", comment: "undo action name"))
         }
 
+        // update line ending
+        self.lineEnding = lineEnding
+
         // update line endings in text storage
         let selection = self.textStorage.editorSelection
         let string = self.textStorage.string.replacingLineEndings(with: lineEnding)
         self.textStorage.replaceContent(with: string)
         self.textStorage.restoreEditorSelection(selection)
-
-        // update line ending
-        self.lineEnding = lineEnding
     }
 
 

diff --git a/CotEditor/Sources/LineEndingScanner.swift b/CotEditor/Sources/LineEndingScanner.swift
@@ -32,15 +32,15 @@ import ValueRange
 
 @Observable final class LineEndingScanner {
 
-    private(set) var baseLineEnding: LineEnding
+    var baseLineEnding: LineEnding
     private(set) var inconsistentLineEndings: [ValueRange<LineEnding>] = []
 
 
     // MARK: Private Properties
 
+    private let textStorage: NSTextStorage
     private var lineEndings: [ValueRange<LineEnding>]
 
-    private var lineEndingObserver: AnyCancellable?
     private var storageObserver: AnyCancellable?
 
 
@@ -51,21 +51,14 @@ import ValueRange
 
         self.baseLineEnding = lineEnding
 
+        self.textStorage = textStorage
         self.lineEndings = textStorage.string.lineEndingRanges()
         self.inconsistentLineEndings = self.lineEndings.filter { $0.value != lineEnding }
 
         self.storageObserver = NotificationCenter.default.publisher(for: NSTextStorage.didProcessEditingNotification, object: textStorage)
             .map { $0.object as! NSTextStorage }
             .filter { $0.editedMask.contains(.editedCharacters) }
-            .sink { [weak self] in self?.invalidate(string: $0.string, in: $0.editedRange, changeInLength: $0.changeInLength) }
-    }
-
-
-    func observe(lineEnding publisher: Published<LineEnding>.Publisher) {
-
-        self.lineEndingObserver = publisher
-            .removeDuplicates()
-            .sink { [weak self] in self?.baseLineEnding = $0 }
+            .sink { [weak self] in self?.invalidate(in: $0.editedRange, changeInLength: $0.changeInLength) }
     }
 
 
@@ -75,7 +68,6 @@ import ValueRange
     /// Cancels all observations.
     func cancel() {
 
-        self.lineEndingObserver?.cancel()
         self.storageObserver?.cancel()
     }
 
@@ -110,16 +102,14 @@ import ValueRange
     }
 
 
-
-    // MARK: Private Methods
-
     /// Updates inconsistent line endings by assuming the textStorage was edited.
     ///
     /// - Parameters:
-    ///   - string: The string to scan.
     ///   - editedRange: The edited range.
     ///   - delta: The change in length.
-    private func invalidate(string: String, in editedRange: NSRange, changeInLength delta: Int) {
+    private func invalidate(in editedRange: NSRange, changeInLength delta: Int) {
+
+        let string = self.textStorage.string.immutable
 
         // expand range to scan by considering the possibility that a part of CRLF was edited
         let nsString = string as NSString

diff --git a/Tests/LineEndingScannerTests.swift b/Tests/LineEndingScannerTests.swift
@@ -23,7 +23,7 @@
 //  limitations under the License.
 //
 
-import AppKit
+import AppKit.NSTextStorage
 import Testing
 import ValueRange
 @testable import CotEditor