Update parameter name

Author: theolampert

Sources/Quilt/OpID.swift

@@ -7,23 +7,23 @@ public struct OpID: Comparable, Hashable, Codable, Equatable, CustomStringConver
     /// - Parameters:
     ///   - counter: The sequence number of this operation
     ///   - id: The UUID of the user who created this operation
-    public init(counter: Int, id: UUID) {
+    public init(counter: Int, userID: UUID) {
         self.counter = counter
-        self.id = id
+        self.userID = userID
     }
 
     public static func < (lhs: OpID, rhs: OpID) -> Bool {
         if lhs.counter == rhs.counter {
-            return lhs.id.uuidString < rhs.id.uuidString
+            return lhs.userID.uuidString < rhs.userID.uuidString
         } else {
             return lhs.counter < rhs.counter
         }
     }
 
     public let counter: Int
-    public let id: UUID
+    public let userID: UUID
 
     public var description: String {
-        "\(counter)@\(id)"
+        "\(counter)@\(userID)"
     }
 }

Sources/Quilt/Quilt.swift

@@ -52,7 +52,7 @@ public struct Quilt: Sendable {
     public mutating func insert(character: Character, atIndex: Int) {
         // Use currentContent since we're interested in the index of a character not action
         let operation = Operation(
-            opId: .init(counter: counter, id: user),
+            opId: .init(counter: counter, userID: user),
             type: .insert(character),
             afterId: currentContent[safeIndex: atIndex - 1]?.opId
         )
@@ -68,7 +68,7 @@ public struct Quilt: Sendable {
         guard let opID = currentContent[safeIndex: atIndex]?.opId
             ?? currentContent.first?.opId else { return }
         let operation = Operation(
-            opId: .init(counter: counter, id: user),
+            opId: .init(counter: counter, userID: user),
             type: .remove(opID)
         )
         operationLog.append(operation)
@@ -90,7 +90,7 @@ public struct Quilt: Sendable {
         let start: SpanMarker = .before(currentContent[fromIndex].opId)
         let end: SpanMarker = .before(currentContent[toIndex].opId)
         let operation = Operation(
-            opId: .init(counter: counter, id: user),
+            opId: .init(counter: counter, userID: user),
             type: .addMark(type: mark, start: start, end: end)
         )
         operationLog.append(operation)
@@ -111,7 +111,7 @@ public struct Quilt: Sendable {
         let start: SpanMarker = .before(currentContent[fromIndex].opId)
         let end: SpanMarker = .before(currentContent[toIndex].opId)
         let operation = Operation(
-            opId: .init(counter: counter, id: user),
+            opId: .init(counter: counter, userID: user),
             type: .removeMark(
                 type: mark,
                 start: start,

Tests/QuiltTests/QuiltTests.swift

@@ -27,7 +27,7 @@ func getString(_ doc: Quilt) -> String {
 
     #expect(
         quilt.operationLog[0] == Operation(
-            opId: OpID(counter: 0, id: user),
+            opId: OpID(counter: 0, userID: user),
             type: .insert("T"),
             afterId: nil
         )
@@ -37,7 +37,7 @@ func getString(_ doc: Quilt) -> String {
 
     #expect(
         quilt.operationLog[1] == Operation(
-            opId: OpID(counter: 1, id: user),
+            opId: OpID(counter: 1, userID: user),
             type: .insert("H"),
             afterId: quilt.operationLog[0].id
         )
@@ -47,7 +47,7 @@ func getString(_ doc: Quilt) -> String {
 
     #expect(
         quilt.operationLog[2] == Operation(
-            opId: OpID(counter: 2, id: user),
+            opId: OpID(counter: 2, userID: user),
             type: .remove(quilt.operationLog[1].id)
         )
     )
@@ -64,11 +64,11 @@ func getString(_ doc: Quilt) -> String {
     quilt.addMark(mark: .bold, fromIndex: 0, toIndex: 4)
 
     #expect(quilt.operationLog[5] == Operation(
-        opId: OpID(counter: 5, id: user),
+        opId: OpID(counter: 5, userID: user),
         type: .addMark(
             type: .bold,
-            start: .before(OpID(counter: 0, id: user)),
-            end: .before(OpID(counter: 4, id: user))
+            start: .before(OpID(counter: 0, userID: user)),
+            end: .before(OpID(counter: 4, userID: user))
         )
     ))
 
@@ -79,11 +79,11 @@ func getString(_ doc: Quilt) -> String {
     )
 
     #expect(quilt.operationLog[6] == Operation(
-        opId: OpID(counter: 6, id: user),
+        opId: OpID(counter: 6, userID: user),
         type: .removeMark(
             type: .bold,
-            start: .before(OpID(counter: 0, id: user)),
-            end: .before(OpID(counter: 4, id: user))
+            start: .before(OpID(counter: 0, userID: user)),
+            end: .before(OpID(counter: 4, userID: user))
         )
     ))
 }
@@ -100,9 +100,9 @@ func getString(_ doc: Quilt) -> String {
 // MARK: - OpID Tests
 
 @Test func testOpIDComparison() {
-    let id1 = OpID(counter: 1, id: user)
-    let id2 = OpID(counter: 2, id: user)
-    let id3 = OpID(counter: 2, id: otherUser)
+    let id1 = OpID(counter: 1, userID: user)
+    let id2 = OpID(counter: 2, userID: user)
+    let id3 = OpID(counter: 2, userID: otherUser)
 
     #expect(id1 < id2)
     #expect(id2 > id1)
@@ -113,11 +113,6 @@ func getString(_ doc: Quilt) -> String {
     #expect(id2 < id3)
 }
 
-@Test func testOpIDDescription() {
-    let id = OpID(counter: 42, id: user)
-    #expect(id.description == "42@\(user)")
-}
-
 // MARK: - Quilt Merge Tests
 
 @Test func testMergeQuilt() {
@@ -170,6 +165,43 @@ func getString(_ doc: Quilt) -> String {
     #expect(getString(doc2) == "The quick brown catdog")
 }
 
+@Test func testConcurrentEditsOfSameWord() {
+    var doc1 = Quilt(user: user)
+    var doc2 = Quilt(user: otherUser)
+
+    let str = "The quick brown fox"
+    str.enumerated().forEach { (idx, char) in
+        doc1.insert(character: char, atIndex: idx)
+    }
+
+    doc2.merge(doc1)
+
+    doc2.remove(atIndex: 18)
+    doc2.remove(atIndex: 17)
+    doc2.remove(atIndex: 16)
+
+    doc2.insert(character: "c", atIndex: 16)
+    doc2.insert(character: "a", atIndex: 17)
+    doc2.insert(character: "t", atIndex: 18)
+
+    doc1.remove(atIndex: 18)
+    doc1.remove(atIndex: 17)
+    doc1.remove(atIndex: 16)
+
+    doc1.insert(character: "c", atIndex: 16)
+    doc1.insert(character: "a", atIndex: 17)
+    doc1.insert(character: "t", atIndex: 18)
+
+    #expect(getString(doc1) == "The quick brown cat")
+    #expect(getString(doc2) == "The quick brown cat")
+
+    doc1.merge(doc2)
+    doc2.merge(doc1)
+
+    #expect(getString(doc1) == "The quick brown cat")
+    #expect(getString(doc2) == "The quick brown cat")
+}
+
 @Test func testMergeDuplicateOperations() {
     var quilt1 = Quilt(user: user)
     var quilt2 = Quilt(user: otherUser)  // Changed to different user