Made Proposal easier to test. Cleanup: tests, misc.

Author: oscbyspro

Sources/DiffableTextKit/Models/Context.swift

@@ -227,8 +227,7 @@ extension Context {
         // Values
         //=--------------------------------------=
         let proposal = Proposal(layout!.snapshot,
-        with: Snapshot(characters, as: .content),
-        in: layout!.snapshot.indices(at:  range))
+        with: Snapshot(characters), in: range)
         //=--------------------------------------=
         // Commit
         //=--------------------------------------=

Sources/DiffableTextKit/Models/Proposal.swift

@@ -26,10 +26,14 @@ public struct Proposal {
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    @inlinable init(_ base: Snapshot, with replacement: Snapshot, in range: Range<Snapshot.Index>) {
+    @inlinable public init(_ base: Snapshot, with replacement: Snapshot, in range: Range<Snapshot.Index>) {
         self.base = base; self.replacement = replacement; self.range = range
     }
 
+    @inlinable public init<T>(_ base: Snapshot, with replacement: Snapshot, in range: Range<Offset<T>>) {
+        self.init(base, with: replacement,  in: base.indices(at:  range))
+    }
+    
     //=------------------------------------------------------------------------=
     // MARK: Accessors
     //=------------------------------------------------------------------------=

Sources/DiffableTextKit/Utilities/Info.swift

@@ -33,21 +33,25 @@ ExpressibleByStringInterpolation, ExpressibleByStringLiteral {
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    @inlinable @inline(__always) init(_ content: @autoclosure () -> [String] = []) {
+    @inlinable @inline(__always) init(_ content: @autoclosure () -> [String]) {
         #if DEBUG
         self.content = content()
         #endif
     }
 
+    //=------------------------------------------------------------------------=
+    // MARK: Initializers x Indirect
+    //=------------------------------------------------------------------------=
+    
+    @inlinable @inline(__always) public init() {
+        self.init([String]())
+    }
+    
     @inlinable @inline(__always) public init(stringLiteral content: String) {
         self.init([content])
     }
 
-    //=------------------------------------------------------------------------=
-    // MARK: Initializers
-    //=------------------------------------------------------------------------=
-    
-    @inlinable @inline(__always) init(_ instance: @autoclosure () -> Self) {
+    @inlinable @inline(__always) public init(_ instance: @autoclosure () -> Self) {
         self = instance()
     }
 
@@ -64,7 +68,7 @@ ExpressibleByStringInterpolation, ExpressibleByStringLiteral {
     }
 
     //=------------------------------------------------------------------------=
-    // MARK: Initializers
+    // MARK: Initializers x Builder
     //=------------------------------------------------------------------------=
 
     @inlinable @inline(__always) public init(@Info _ instance: () -> Self) {
@@ -76,11 +80,11 @@ ExpressibleByStringInterpolation, ExpressibleByStringLiteral {
     }
 
     //=------------------------------------------------------------------------=
-    // MARK: Initializers
+    // MARK: Initializers x Special
     //=------------------------------------------------------------------------=
 
     @inlinable @inline(__always) public static func note(_ item: @autoclosure () -> Any) -> Self {
-        self.init([String(describing: item())])
+        Self(["\(item())"])
     }
 
     @inlinable @inline(__always) public static func mark(_ item: @autoclosure () -> Any) -> Self {

Sources/DiffableTextKitXNumber/Graphs/Graph+Decimal.swift

@@ -14,6 +14,7 @@ import Foundation
 //*============================================================================*
 
 public final class _DecimalGraph: _Graph, _Numberable, _Percentable, _Currencyable {
+    
     public typealias Value = Decimal
     public typealias Input = Decimal
 
@@ -24,15 +25,15 @@ public final class _DecimalGraph: _Graph, _Numberable, _Percentable, _Currencyab
     public typealias Number   = _StandardStyle<Value.FormatStyle         >
     public typealias Percent  = _StandardStyle<Value.FormatStyle.Percent >
     public typealias Currency = _CurrencyStyle<Value.FormatStyle.Currency>
-
+    
     //=------------------------------------------------------------------------=
     // MARK: State
     //=------------------------------------------------------------------------=
 
     public let min: Value
     public let max: Value
     public let precision: Int
-
+    
     //=------------------------------------------------------------------------=
     // MARK: Initializers
     //=------------------------------------------------------------------------=

Sources/DiffableTextKitXNumber/Graphs/Graph+Optional.swift

@@ -15,6 +15,7 @@ import Foundation
 //*============================================================================*
 
 public struct _OptionalGraph<Base: _Graph>: _Graph where Base.Input == Base.Value {
+    
     public typealias Value = Base.Value?
     public typealias Input = Base.Input
 

Sources/DiffableTextKitXNumber/Styles/Default+Currency.swift

@@ -43,7 +43,8 @@ where Format: _Format & _Currency, Format.FormatInput: _Input {
     // MARK: * Cache
     //*========================================================================*
 
-    public final class Cache: _DefaultCache {        
+    public final class Cache: _DefaultCache {
+        
         public typealias Value = Format.FormatInput
 
         //=--------------------------------------------------------------------=

Sources/DiffableTextKitXNumber/Styles/Default+Standard.swift

@@ -43,6 +43,7 @@ where Format: _Format & _Standard, Format.FormatInput: _Input {
     //*========================================================================*
 
     public final class Cache: _DefaultCache {
+        
         public typealias Value = Format.FormatInput
 
         //=--------------------------------------------------------------------=

Sources/DiffableTextKitXNumber/Styles/Default+Style.swift

@@ -39,7 +39,7 @@ extension _DefaultStyle {
     //=------------------------------------------------------------------------=
 
     @inlinable public func locale(_ locale: Locale) -> Self {
-        var S0 = self; S0.locale = locale; return S0
+        var S0 = self;  S0.locale = locale; return S0
     }
 
     //=------------------------------------------------------------------------=
@@ -52,7 +52,7 @@ extension _DefaultStyle {
 
     @inlinable public func update(_ cache: inout Cache) {
         switch cache.compatible(self) {
-        case   true: cache.style = self
-        case  false: cache = self.cache() }
+        case  true: cache.style = self
+        case false: cache = self.cache() }
     }
 }

Sources/DiffableTextKitXNumber/Tokens/Digit.swift

@@ -42,7 +42,7 @@ import Foundation
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    @inlinable init(ascii: UInt8) { self.ascii = ascii }
+    private init(ascii: UInt8) { self.ascii = ascii }
 
     //=------------------------------------------------------------------------=
     // MARK: Utilities

Sources/DiffableTextKitXNumber/Tokens/Separator.swift

@@ -34,7 +34,7 @@ import Foundation
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    @inlinable init(ascii: UInt8) { self.ascii = ascii }
+    private init(ascii: UInt8) { self.ascii = ascii }
 
     //=------------------------------------------------------------------------=
     // MARK: Utilities