Cleanup.

Author: oscbyspro

Sources/DiffableTextKit/Models/Proposal.swift

@@ -63,23 +63,15 @@ public struct Proposal {
 
         @inlinable init(_ proposal: Proposal) { self.proposal = proposal }
 
-        //=--------------------------------------------------------------------=
-        // MARK: Accessors
-        //=--------------------------------------------------------------------=
-        
-        @inlinable public var base: Snapshot { proposal.base }
-        
-        @inlinable public var replacement: Snapshot { proposal.replacement }
-        
-        @inlinable public var range: Range<Snapshot.Index> { proposal.range }
-        
         //=--------------------------------------------------------------------=
         // MARK: Utilities
         //=--------------------------------------------------------------------=
 
         /// Returns a lazy snapshot with the proposed change applied to it.
-        @inlinable public func merged() -> LazySequence<FlattenSequence<[Snapshot.SubSequence]>> {
-            [base[..<range.lowerBound], replacement[...], base[range.upperBound...]].lazy.joined()
+        @inlinable public func merged() -> LazySequence<FlattenSequence<[Slice<Snapshot>]>> {[
+            proposal.base[..<proposal.range.lowerBound],
+            proposal.replacement[...], /*-------------*/
+            proposal.base[proposal.range.upperBound...]].lazy.joined()
         }
     }
 }

Tests/DiffableTextKitTests/Models/Proposal.swift

@@ -18,19 +18,26 @@ import XCTest
 //*============================================================================*
 
 final class ProposalTests: XCTestCase {
-    typealias C = Offset<Character>
-
+    
     //=------------------------------------------------------------------------=
     // MARK: Tests
     //=------------------------------------------------------------------------=
 
     func testMerged() {
         let snapshot    = Snapshot("AxxxE")
         let replacement = Snapshot( "BCD" )
-        let range = snapshot.indices(at: C(1) ..< 4)
+        let range = snapshot.indices(at:  Offset<Character>(1) ..< 4)
         let proposal = Proposal(snapshot, with: replacement, in: range)
         XCTAssertEqual(proposal.merged(), "ABCDE")
     }
+    
+    func testLazyMerged() {
+        let snapshot    = Snapshot("AxxxE")
+        let replacement = Snapshot( "BCD" )
+        let range = snapshot.indices(at:  Offset<Character>(1) ..< 4)
+        let proposal = Proposal(snapshot, with: replacement, in: range)
+        XCTAssertEqual(Snapshot(proposal.lazy.merged()), "ABCDE")
+    }
 }
 
 #endif

Tests/DiffableTextKitTests/Models/Snapshot.swift

@@ -91,7 +91,6 @@ final class SnapshotTests: XCTestCase {
         snapshot.append(Symbol(" "))
         let index = snapshot.endIndex;snapshot.select(index)
         snapshot.append(Symbol(" "))
-        
         XCTAssertEqual(snapshot.selection, Selection(index))
     }
 
@@ -183,7 +182,6 @@ final class SnapshotTests: XCTestCase {
 
     func testNumberOfAttributesMustEqualNumberOfJointCharacters() {
         snapshot = Snapshot("🇸🇪🇺🇸".unicodeScalars.map(Character.init))
-        
         XCTAssertEqual(snapshot.characters.count, 2)
         XCTAssertEqual(snapshot.attributes.count, 4)
         Assert("🇸🇪🇺🇸", [.content, .content, .content, .content])