Cleanup n' some tests.

Author: oscbyspro

Sources/DiffableTextKit/Utilities/Info.swift

@@ -39,28 +39,36 @@ ExpressibleByStringInterpolation, ExpressibleByStringLiteral {
         #endif
     }
 
+    @inlinable @inline(__always) public init(stringLiteral content: String) {
+        self.init([content])
+    }
+    
     //=------------------------------------------------------------------------=
     // MARK: Initializers
     //=------------------------------------------------------------------------=
 
-    @inlinable @inline(__always) public init(stringLiteral content: String) {
-        self.init([content])
+    @inlinable @inline(__always) init(_ instance: @autoclosure () -> Self) {
+        self = instance()
     }
-    
-    @inlinable @inline(__always) public init(@Info _ info: () -> Self) {
-        self.init(info())
+        
+    @inlinable @inline(__always) public init(_ error: @autoclosure () -> any Error) {
+        self.init([String(describing: error())])
+    }
+        
+    @inlinable @inline(__always) public init(_ instances: @autoclosure () -> [Self]) {
+        self.init(instances().map(\.description))
     }
 
     @inlinable @inline(__always) public init(_ transform: (inout Self) -> Void) {
         self.init({ var instance = Self(); transform(&instance); return instance }())
     }
 
-    @inlinable @inline(__always) public init(_ error: @autoclosure () -> any Error) {
-        self.init([String(describing: error())])
-    }
+    //=------------------------------------------------------------------------=
+    // MARK: Initializers
+    //=------------------------------------------------------------------------=
 
-    @inlinable @inline(__always) public init(_ instances: @autoclosure () -> [Self]) {
-        self.init(instances().map(\.description))
+    @inlinable @inline(__always) public init(@Info _ instance: () -> Self) {
+        self.init(instance())
     }
 
     @inlinable @inline(__always) public static func buildBlock(_ instances: Self...) -> Self {

Tests/DiffableTextKitTests/Mock.swift

@@ -55,7 +55,7 @@ struct Mock: DiffableTextStyle {
     }
 
     func resolve(_ proposal: Proposal, with cache: inout Void) throws -> Commit<Value> {
-        interpret(proposal.merged().characters)
+        interpret(proposal.lazy.merged().nonvirtuals())
     }
 }
 

Tests/DiffableTextKitTests/Styles/Constant.swift

@@ -17,7 +17,7 @@ import XCTest
 // MARK: * Constant x Tests
 //*============================================================================*
 
-final class ConstantTests: XCTestCase {
+final class ConstantTextStyleTests: XCTestCase {
 
     //=------------------------------------------------------------------------=
     // MARK: Tests

Tests/DiffableTextKitTests/Styles/Equals.swift

@@ -17,7 +17,7 @@ import XCTest
 // MARK: * Equals x Tests
 //*============================================================================*
 
-final class EqualsTests: XCTestCase {
+final class EqualsTextStyleTests: XCTestCase {
 
     //=------------------------------------------------------------------------=
     // MARK: Tests

Tests/DiffableTextKitTests/Styles/Normal.swift

@@ -17,7 +17,7 @@ import XCTest
 // MARK: * Normal x Tests
 //*============================================================================*
 
-final class NormalTests: XCTestCase {
+final class NormalTextStyleTests: XCTestCase {
 
     //=------------------------------------------------------------------------=
     // MARK: State
@@ -38,9 +38,9 @@ final class NormalTests: XCTestCase {
     }
 
     func testResolve() {
-        let base = Snapshot("13") + Snapshot("o(><)o", as: .phantom)
-        let middle = base.index(base.startIndex, offsetBy: 1)
-        let proposal = Proposal(base, with: "2", in: middle ..< middle)
+        let snapshot = Snapshot("13") + Snapshot("o(><)o", as: .phantom)
+        let position = snapshot.index(snapshot.startIndex, offsetBy: 01)
+        let proposal = Proposal(snapshot, with: "2", in: position ..< position)
 
         let resolved = try! normal.resolve(proposal)
 

Tests/DiffableTextKitTests/Styles/Prefix.swift

@@ -17,7 +17,7 @@ import XCTest
 // MARK: * Prefix x Tests
 //*============================================================================*
 
-final class PrefixTests: XCTestCase {
+final class PrefixTextStyleTests: XCTestCase {
 
     typealias C = Offset<Character>
 
@@ -34,6 +34,17 @@ final class PrefixTests: XCTestCase {
         Commit("🇺🇸",  Snapshot("🇸🇪", as: .phantom) + "🇺🇸"))
     }
 
+    func testResolve() {
+        let snapshot = Snapshot("")
+        let proposal = Proposal(snapshot, with: "🇺🇸", in: snapshot.endIndex ..<  snapshot.endIndex)
+        
+        let mock = Mock().prefix("🇸🇪")
+        let resolved = try! mock.resolve(proposal)
+        
+        XCTAssertEqual(resolved.value,    "🇺🇸")
+        XCTAssertEqual(resolved.snapshot, Snapshot("🇸🇪", as: .phantom) + "🇺🇸")
+    }
+    
     func testSelectionInBaseIsOffsetByPrefixSize() {
         let characters = "0123456789"
 

Tests/DiffableTextKitTests/Styles/Suffix.swift

@@ -17,7 +17,7 @@ import XCTest
 // MARK: * Suffix x Tests
 //*============================================================================*
 
-final class SuffixTests: XCTestCase {
+final class SuffixTextStyleTests: XCTestCase {
 
     typealias C = Offset<Character>
 
@@ -34,6 +34,17 @@ final class SuffixTests: XCTestCase {
         Commit("🇺🇸", "🇺🇸" + Snapshot("🇸🇪", as: .phantom)))
     }
 
+    func testResolve() {
+        let snapshot = Snapshot("")
+        let proposal = Proposal(snapshot, with: "🇺🇸", in: snapshot.endIndex ..<  snapshot.endIndex)
+        
+        let mock = Mock().suffix("🇸🇪")
+        let resolved = try! mock.resolve(proposal)
+        
+        XCTAssertEqual(resolved.value,    "🇺🇸")
+        XCTAssertEqual(resolved.snapshot, "🇺🇸" + Snapshot("🇸🇪", as: .phantom))
+    }
+    
     func testSelectionIsSame() {
         let characters = "0123456789"