Cleanup

Author: oscbyspro

Sources/DiffableTextKit/Models/Context.swift

@@ -164,8 +164,7 @@ extension Context {
     //=------------------------------------------------------------------------=
 
     /// Use this method on view update.
-    @inlinable public mutating func merge(
-    _ status: Status, with cache: inout Cache,
+    @inlinable public mutating func merge(_ status: Status, with cache: inout Cache,
     and options: Synchronize) throws -> Update {
         var update = Update()
         //=--------------------------------------=
@@ -177,10 +176,10 @@ extension Context {
         //=--------------------------------------=
         // Validation
         //=--------------------------------------=
-        if  options.contains(.invariant), update.contains(.value) {
-            let  input = Info.mark(status.value)
-            let output = Info.mark(next  .value)
-            throw Info(["input \(input) != \(output) output"])
+        if  options.contains(.acyclical), update.contains(.value) {
+            let  input = Info.init([.note(status.value), "[input]"])
+            let output = Info.init([.note(next  .value),"[output]"])
+            throw Info([.mark("cyclical"), "\(input) != \(output)"])
         }
         //=--------------------------------------=
         // Update x Active == 2
@@ -207,8 +206,7 @@ extension Context {
     //=------------------------------------------------------------------------=
 
     /// Use this method on changes to text.
-    @inlinable public mutating func merge<T>(
-    _ text: String, in range: Range<Offset<T>>,
+    @inlinable public mutating func merge<T>(_ text: String, in range: Range<Offset<T>>,
     with cache: inout Cache) throws -> Update {
         var update = Update()
         //=--------------------------------------=
@@ -242,8 +240,8 @@ extension Context {
     //=------------------------------------------------------------------------=
 
     /// Use this method on changes to selection.
-    @inlinable public mutating func merge<T>(
-    _ selection: Range<Offset<T>>,  with options: Resolve) -> Update {
+    @inlinable public mutating func merge<T>(_ selection: Range<Offset<T>>,
+    with options: Resolve) -> Update {
         var update = Update()
         //=--------------------------------------=
         // Layout

Sources/DiffableTextKit/Models/Synchronize.swift

@@ -14,8 +14,8 @@
 /// A message describing synchronization behavior.
 @frozen public struct Synchronize: OptionSet {
 
-    /// Requires input and output values to be equal.
-    public static let invariant = Self(rawValue: 1 << 0)
+    /// Requires that input and output values are equal.
+    public static let acyclical = Self(rawValue: 1 << 0)
 
     //=------------------------------------------------------------------------=
 

Sources/DiffableTextKit/Utilities/Brrr.swift

@@ -16,7 +16,7 @@
 /// It uses conditional compilation such that it has no size or cost in RELEASE mode.
 ///
 public struct Brrr: Equatable {
-        
+    
     public static let dismiss          = Self("dismiss")
     public static let cancellation     = Self("cancellation")
     public static let autocorrection   = Self("autocorrection")

Sources/DiffableTextKitXUIKit/DiffableTextField.swift

@@ -152,7 +152,7 @@ public struct DiffableTextField<Style: DiffableTextStyle>: UIViewRepresentable {
             //=----------------------------------=
             // Synchronize
             //=----------------------------------=
-            self.synchronize(.invariant)
+            self.synchronize(.acyclical)
         }
 
         //=--------------------------------------------------------------------=
@@ -258,13 +258,13 @@ public struct DiffableTextField<Style: DiffableTextStyle>: UIViewRepresentable {
                 //=------------------------------=
                 self.push(update)
             //=----------------------------------=
-            // Dismiss
+            // Cyclical
             //=----------------------------------=
-            } catch let reason {
-                Brrr.unsynchronizable << Info(reason)
-                Brrr.dismiss << Info(["cyclical view updates are prohibited"])
+            } catch let cyclical {
+                Brrr.unsynchronizable << Info(cyclical)
+                Brrr.dismiss << Info([.mark("cyclical"), "view updates are prohibited"])
                 //=------------------------------=
-                // Task
+                // Dismiss
                 //=------------------------------=
                 Task { self.downstream.dismiss() }
             }

Tests/DiffableTextKitTests/Models/Synchronize.swift

@@ -23,7 +23,7 @@ final class SynchronizeTests: XCTestCase {
     // MARK: State
     //=------------------------------------------------------------------------=
 
-    let all: [Synchronize] = [.invariant]
+    let all: [Synchronize] = [.acyclical]
 
     //=------------------------------------------------------------------------=
     // MARK: Tests x Instances