Cleanup.

Author: oscbyspro

Sources/DiffableTextKit/Helpers/Carets.swift

@@ -11,10 +11,9 @@
 // MARK: Declaration
 //*============================================================================*
 
-/// Up to two carets represented by the bounds in a range.
+/// One or two carets, represented by a range.
 ///
-/// An instance with equal bounds represents a single upper caret.
-/// This distinction matters for transformations such as map(lower:upper:).
+/// An empty range represents a single upper caret.
 ///
 @usableFromInline struct Carets<Caret: Comparable>: Equatable {
 

Sources/DiffableTextKit/Helpers/Layout.swift

@@ -53,16 +53,9 @@
     @inlinable func positions<T>(at indices: Carets<Index>) -> Carets<T.Position> where T: Offset {
         indices.map(caret: snapshot.position(at:))
     }
-}
-
-//=----------------------------------------------------------------------------=
-// MARK: Transformations
-//=----------------------------------------------------------------------------=
-
-extension Layout {
 
     //=------------------------------------------------------------------------=
-    // MARK: Snapshot
+    // MARK: Transformations
     //=------------------------------------------------------------------------=
 
     @inlinable mutating func merge(snapshot: Snapshot) {
@@ -79,9 +72,9 @@ extension Layout {
     }
 
     //=------------------------------------------------------------------------=
-    // MARK: Selection
+    // MARK: Transformations
     //=------------------------------------------------------------------------=
-
+    
     @inlinable mutating func merge<T>(selection: Carets<T.Position>, momentums: Bool) where T: Offset {
         //=--------------------------------------=
         // Values

Sources/DiffableTextKit/Models/Snapshot.swift

@@ -20,7 +20,7 @@
 ///
 /// Set the anchor to select the caret represented by its index. This may be done
 /// on snapshots containing only formatting characters. As an example, a pattern text style
-/// that is bound to an empty value may anchor at the first placeholder character.
+/// bound to an empty value may anchor at the pattern's first placeholder character.
 ///
 public struct Snapshot: BidirectionalCollection, RangeReplaceableCollection {
     @usableFromInline typealias Target = (Index) -> Bool
@@ -301,7 +301,7 @@ extension Snapshot {
         //=--------------------------------------=
         if let anchor = anchor { return anchor }
         //=--------------------------------------=
-        // Inspect Initial Index
+        // Inspect The Initial Index
         //=--------------------------------------=
         if peek(from: index, towards: preference).map(
         nonpassthrough(at:)) == true { return index }
@@ -310,21 +310,21 @@ extension Snapshot {
         //=--------------------------------------=
         let direction = direction ?? preference
         //=--------------------------------------=
-        // Search In Direction
+        // Search In The Direction
         //=--------------------------------------=
         if let caret = caret(from: index,
         towards: direction,
         jumping: direction == preference ? .to : .through,
         targeting: nonpassthrough(at:)) { return caret }
         //=--------------------------------------=
-        // Search In Other Direction
+        // Search In The Other Direction
         //=--------------------------------------=
         if let caret = caret(from: index,
         towards: direction.reversed(),
         jumping: Jump.to, // use Jump.to on each direction
         targeting: nonpassthrough(at:)) { return caret }
         //=--------------------------------------=
-        // Default To Instance's End Index
+        // Return End Index
         //=--------------------------------------=
         return self.endIndex
     }
@@ -358,4 +358,18 @@ extension Snapshot {
     @inlinable func caret(from index: Index, backwardsThrough target: Target) -> Index? {
         indices[..<index].last(where: target)
     }
+    
+    //*========================================================================*
+    // MARK: Declaration
+    //*========================================================================*
+
+    @usableFromInline enum Jump {
+        
+        //=--------------------------------------------------------------------=
+        // MARK: Instances
+        //=--------------------------------------------------------------------=
+        
+        case to
+        case through
+    }
 }

Sources/DiffableTextKit/Support/Collection.swift

@@ -8,15 +8,16 @@
 //=----------------------------------------------------------------------------=
 
 //*============================================================================*
-// MARK: Declaration
+// MARK: Extension
 //*============================================================================*
 
-@usableFromInline enum Jump {
+public extension RangeReplaceableCollection {
 
     //=------------------------------------------------------------------------=
-    // MARK: Instances
+    // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    case to
-    case through
+    @inlinable init(capacity: Int, transform: (inout Self) -> Void) {
+        self.init(); self.reserveCapacity(capacity); transform(&self)
+    }
 }

…urces/DiffableTextKit/Helpers/Jump.swift …DiffableTextKit/Utilities/Capacity.swiftSources/DiffableTextKit/Helpers/Jump.swift renamed to Sources/DiffableTextKit/Utilities/Capacity.swift Sources/DiffableTextKit/Helpers/Jump.swift renamed to Sources/DiffableTextKit/Utilities/Capacity.swift

@@ -55,6 +55,6 @@ extension Optional where Wrapped == Trigger {
     //=------------------------------------------------------------------------=
 
     @inlinable public static func += (lhs: inout Self, rhs: Self) {
-        (rhs != nil && lhs != nil) ? (lhs! += rhs!) : (lhs = rhs)
+        (lhs != nil && rhs != nil) ? (lhs! += rhs!) : (lhs = rhs)
     }
 }

…rces/DiffableTextKit/Support/Count.swift …es/DiffableTextKit/Utilities/Count.swiftSources/DiffableTextKit/Support/Count.swift renamed to Sources/DiffableTextKit/Utilities/Count.swift Sources/DiffableTextKit/Support/Count.swift renamed to Sources/DiffableTextKit/Utilities/Count.swift

@@ -48,15 +48,15 @@ public final class Lexicon {
 
     /// Requires that formatter.numberStyle == .none.
     @inlinable static func standard(_ formatter: NumberFormatter) -> Lexicon {
-        assert(formatter.numberStyle == .none); return .init(
+        assert(formatter.numberStyle == .none); return Self.init(
         signs:      .standard(formatter),
         digits:     .standard(formatter),
         separators: .standard(formatter))
     }
 
     /// Requires that formatter.numberStyle == .none.
     @inlinable static func currency(_ formatter: NumberFormatter) -> Lexicon {
-        assert(formatter.numberStyle == .none); return .init(
+        assert(formatter.numberStyle == .none); return Self.init(
         signs:      .currency(formatter),
         digits:     .currency(formatter),
         separators: .currency(formatter))

…ces/DiffableTextKit/Support/Suffix.swift …s/DiffableTextKit/Utilities/Suffix.swiftSources/DiffableTextKit/Support/Suffix.swift renamed to Sources/DiffableTextKit/Utilities/Suffix.swift Sources/DiffableTextKit/Support/Suffix.swift renamed to Sources/DiffableTextKit/Utilities/Suffix.swift

@@ -78,7 +78,7 @@ import Foundation
     // MARK: Transformations
     //=------------------------------------------------------------------------=
 
-    @inlinable mutating func link(_ component: Component, _ character: Character) {
+    @inlinable mutating func link( _ component: Component, _ character: Character) {
         self.components[character] = component
         self.characters[component] = character
     }