Cleanup

Author: oscbyspro

Sources/DiffableTextKit/Utilities/Info.swift

@@ -40,7 +40,7 @@ ExpressibleByStringInterpolation, ExpressibleByStringLiteral {
     }
 
     //=------------------------------------------------------------------------=
-    // MARK: Initializers x Indirect
+    // MARK: Initializers
     //=------------------------------------------------------------------------=
 
     @inlinable @inline(__always) public init() {
@@ -68,7 +68,7 @@ ExpressibleByStringInterpolation, ExpressibleByStringLiteral {
     }
 
     //=------------------------------------------------------------------------=
-    // MARK: Initializers x Builder
+    // MARK: Initializers
     //=------------------------------------------------------------------------=
 
     @inlinable @inline(__always) public init(@Info _ instance: () -> Self) {
@@ -80,7 +80,7 @@ ExpressibleByStringInterpolation, ExpressibleByStringLiteral {
     }
 
     //=------------------------------------------------------------------------=
-    // MARK: Initializers x Special
+    // MARK: Initializers
     //=------------------------------------------------------------------------=
 
     @inlinable @inline(__always) public static func note(_ item: @autoclosure () -> Any) -> Self {

Sources/DiffableTextKitXNumber/Graphs/Graph+Floats.swift

@@ -36,7 +36,7 @@ where Value: _Input & BinaryFloatingPoint & SignedNumeric {
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    /// - Limited by `Double.max` due to `FloatingPointFormatStyle`.
+    /// - Limited by Double.max due to FloatingPointFormatStyle.
     fileprivate init() where Value: LosslessStringConvertible {
         let size = Swift.min(Value.significandBitCount, Double.significandBitCount)
         self.precision = Int(log10(pow(2, Double.init(size))))/*-*/

Sources/DiffableTextKitXNumber/Graphs/Graph+Integers.swift

@@ -36,8 +36,8 @@ where Value: _Input & FixedWidthInteger {
     //=------------------------------------------------------------------------=
 
     /// - Limited by Int.max due to IntegerFormatStyle.
-    /// - Limited by longest sequence of 9s due to IntegerFormatStyle.
-    fileprivate init() where Value: LosslessStringConvertible {
+    /// - Limited by the longest representable sequence of 9s due to IntegerFormatStyle.
+    fileprivate init() {
         let limit = Value(clamping: Int.max)
         self.precision = Int(floor(log10(Double(limit))))
         self.max = Value(String(repeating: "9", count: precision))!

Sources/DiffableTextKitXNumber/Models/Components.swift

@@ -17,35 +17,35 @@ import Foundation
 @usableFromInline struct Components {
 
     @usableFromInline static let ascii = Self(
-    signs:      .ascii(),
-    digits:     .ascii(),
+    signs:/*-*/ .ascii(),
+    digits:/**/ .ascii(),
     separators: .ascii())
 
     //=------------------------------------------------------------------------=
 
-    @usableFromInline let signs:      Links<Sign>
-    @usableFromInline let digits:     Links<Digit>
+    @usableFromInline let signs:/*-*/ Links<Sign>
+    @usableFromInline let digits:/**/ Links<Digit>
     @usableFromInline let separators: Links<Separator>
 
     //=------------------------------------------------------------------------=
 
     @inlinable init(signs: Links<Sign>, digits: Links<Digit>, separators: Links<Separator>) {
-        self.signs      = signs
-        self.digits     = digits
+        self.signs/*-*/ = signs
+        self.digits/**/ = digits
         self.separators = separators
     }
 
     @inlinable static func standard(_ formatter: NumberFormatter) -> Self {
         assert(formatter.numberStyle == .none); return Self.init(
-        signs:      .standard(formatter),
-        digits:     .standard(formatter),
+        signs:/*-*/ .standard(formatter),
+        digits:/**/ .standard(formatter),
         separators: .standard(formatter))
     }
 
     @inlinable static func currency(_ formatter: NumberFormatter) -> Self {
         assert(formatter.numberStyle == .none); return Self.init(
-        signs:      .currency(formatter),
-        digits:     .currency(formatter),
+        signs:/*-*/ .currency(formatter),
+        digits:/**/ .currency(formatter),
         separators: .currency(formatter))
     }
 
@@ -68,8 +68,8 @@ import Foundation
     }
 
     @inlinable func nonvirtual(_ character: Character) -> Bool {
-        signs     [character] != nil ||
-        digits    [character] != nil ||
+        signs/*-*/[character] != nil ||
+        digits/**/[character] != nil ||
         separators[character] == Separator.fraction
     }
 }

Sources/DiffableTextKitXNumber/Models/Interpreter.swift

@@ -52,7 +52,7 @@ import Foundation
 
     @inlinable func number(_ symbols: some Sequence<Symbol>,
     as value: (some _Value).Type) throws -> Number? {
-        let unformatted = symbols.lazy.nonvirtuals() /*--------------------------*/
+        let unformatted = symbols.lazy.nonvirtuals()
         return try Number(unformatted: unformatted, signs: components.signs.tokens,
         digits: components.digits.tokens, separators: components.separators.tokens,
         optional: value.optional, unsigned: value.unsigned, integer: value.integer)

Sources/DiffableTextKitXNumber/Models/Translator.swift

@@ -23,8 +23,8 @@ import DiffableTextKit
     //=------------------------------------------------------------------------=
 
     @inlinable init(from source: Components, to target: Components) {
-        source.signs     .tokens.forEach { self.singular[$0] = target.signs     [$1] }
-        source.digits    .tokens.forEach { self.singular[$0] = target.digits    [$1] }
+        source.signs/*-*/.tokens.forEach { self.singular[$0] = target.signs/*-*/[$1] }
+        source.digits/**/.tokens.forEach { self.singular[$0] = target.digits/**/[$1] }
         source.separators.tokens.forEach { self.singular[$0] = target.separators[$1] }
 
         let fraction = target.separators.characters[.fraction]

Sources/DiffableTextKitXNumber/Styles/Default+Currency.swift

@@ -17,10 +17,11 @@ import Foundation
 public struct _CurrencyStyle<Format>: _DefaultStyle, _Currency
 where Format: _Format & _Currency, Format.FormatInput: _Input {
 
-    public typealias Graph = Format.FormatInput.NumberTextGraph
     public typealias Value = Format.FormatInput
     public typealias Input = Format.FormatInput
 
+    public typealias Graph = Format.FormatInput.NumberTextGraph
+    
     //=------------------------------------------------------------------------=
     // MARK: State
     //=------------------------------------------------------------------------=

Sources/DiffableTextKitXNumber/Styles/Default+Optional.swift

@@ -17,11 +17,12 @@ import Foundation
 public struct _OptionalStyle<Base>: _Style, WrapperTextStyle where
 Base: _Style & NullableTextStyle, Base.Value == Base.Input {
 
-    public typealias Graph = _OptionalGraph<Base.Graph>
     public typealias Cache = Base .Cache
     public typealias Value = Graph.Value
     public typealias Input = Graph.Input
 
+    public typealias Graph = _OptionalGraph<Base.Graph>
+    
     //=------------------------------------------------------------------------=
     // MARK: State
     //=------------------------------------------------------------------------=

Sources/DiffableTextKitXNumber/Styles/Default+Standard.swift

@@ -17,10 +17,11 @@ import Foundation
 public struct _StandardStyle<Format>: _DefaultStyle, _Standard
 where Format: _Format & _Standard, Format.FormatInput: _Input {
 
-    public typealias Graph = Format.FormatInput.NumberTextGraph
     public typealias Value = Format.FormatInput
     public typealias Input = Format.FormatInput
 
+    public typealias Graph = Format.FormatInput.NumberTextGraph
+    
     //=------------------------------------------------------------------------=
     // MARK: State
     //=------------------------------------------------------------------------=

Tests/DiffableTextKitTests/Models/Snapshot.swift

@@ -184,8 +184,8 @@ final class SnapshotTests: XCTestCase {
 
     func testReplaceSubrangeWithCharacters() {
         snapshot = Snapshot(repeating: " ", count: 4)
-        snapshot.replaceSubrange(snapshot.indices(at: C(0) ..< 2), with: Snapshot("AA", as: .content))
-        snapshot.replaceSubrange(snapshot.indices(at: C(2) ..< 4), with: Snapshot("BB", as: .phantom))
+        snapshot.replaceSubrange(snapshot.indices(at: C(0) ..< 2), with: "AA", as: .content)
+        snapshot.replaceSubrange(snapshot.indices(at: C(2) ..< 4), with: "BB", as: .phantom)
 
         Assert("AABB", [.content, .content, .phantom, .phantom])
     }