Update the string splice transform logic

Fixes convergencelabs/convergence-project#264
convergencelabs · Feb 4, 2022 · 3b4ed65 · 3b4ed65
1 parent c61725d
commit 3b4ed65
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 5 deletions.
diff --git a/...nvergence/server/backend/services/domain/model/ot/xform/string/StringSpliceSpliceTF.scala b/...nvergence/server/backend/services/domain/model/ot/xform/string/StringSpliceSpliceTF.scala
@@ -391,14 +391,21 @@ private[ot] object StringSpliceSpliceTF extends OperationTransformationFunction[
       case FinishedBy =>
         (
           s.copy(deleteCount = s.deleteCount - c.deleteCount),
-          c.copy(deleteCount = 0, index = s.index + s.insertValue.length),
+          c.copy(deleteCount = 0, index = s.index + s.insertValue.length)
         )
 
       case EqualTo =>
-        (
-          s.copy(deleteCount = 0),
-          c.copy(index = c.index + s.insertValue.length, deleteCount = 0),
-        )
+        if (s.insertValue != c.insertValue) {
+          (
+            s,
+            c.copy(noOp = true)
+          )
+        } else {
+          (
+            s.copy(noOp = true),
+            c.copy(noOp = true)
+          )
+        }
     }
   }
 

diff --git a/src/test/otfspec/otf-string-splice-replace-splice-replace-spec.json b/src/test/otfspec/otf-string-splice-replace-splice-replace-spec.json
@@ -0,0 +1,28 @@
+{
+  "serverOpType": "StringSplice",
+  "clientOpType": "StringSplice",
+  "cases": [
+    {
+      "id": "S-PP-1",
+      "input": {
+        "serverOp": {"type": "StringSplice", "noOp": false, "index": 4, "deleteCount": 1, "insertValue": "X"},
+        "clientOp": {"type": "StringSplice", "noOp": false, "index": 4, "deleteCount": 1, "insertValue": "Y"}
+      },
+      "output": {
+        "serverOp": {"type": "StringSplice", "noOp": false, "index": 4, "deleteCount": 1, "insertValue": "X"},
+        "clientOp": {"type": "StringSplice", "noOp": true, "index": 4, "deleteCount": 1, "insertValue": "Y"}
+      }
+    },
+    {
+      "id": "S-PP-2",
+      "input": {
+        "serverOp": {"type": "StringSplice", "noOp": false, "index": 4, "deleteCount": 1, "insertValue": "X"},
+        "clientOp": {"type": "StringSplice", "noOp": false, "index": 4, "deleteCount": 1, "insertValue": "X"}
+      },
+      "output": {
+        "serverOp": {"type": "StringSplice", "noOp": true, "index": 4, "deleteCount": 1, "insertValue": "X"},
+        "clientOp": {"type": "StringSplice", "noOp": true, "index": 4, "deleteCount": 1, "insertValue": "X"}
+      }
+    }
+  ]
+}