From 01ec08ac008729fc41f73f6700cfbed52a01c632 Mon Sep 17 00:00:00 2001
From: DarkSky <25152247+darkskygit@users.noreply.github.com>
Date: Sat, 27 Jan 2024 17:01:51 +0800
Subject: [PATCH] fix: conflict check when reference right is none (#40)

---
 .cargo/config.toml                             |   3 +++
 y-octo/src/doc/codec/update.rs                 |   5 +++++
 y-octo/src/doc/document.rs                     |  17 +++++++++++++++++
 y-octo/src/doc/store.rs                        |   2 +-
 .../edge-case-left-right-same-node.bin         | Bin 0 -> 6673 bytes
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 y-octo/src/fixtures/edge-case-left-right-same-node.bin

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 4768414..2603371 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,2 +1,5 @@
 [env]
 CARGO_WORKSPACE_DIR = { value = "", relative = true }
+
+[unstable]
+gc = true
diff --git a/y-octo/src/doc/codec/update.rs b/y-octo/src/doc/codec/update.rs
index 1f48eb0..d107666 100644
--- a/y-octo/src/doc/codec/update.rs
+++ b/y-octo/src/doc/codec/update.rs
@@ -466,6 +466,11 @@ mod tests {
             (include_bytes!("../../fixtures/database.bin").to_vec(), 1, 149),
             (include_bytes!("../../fixtures/large.bin").to_vec(), 1, 9036),
             (include_bytes!("../../fixtures/with-subdoc.bin").to_vec(), 2, 30),
+            (
+                include_bytes!("../../fixtures/edge-case-left-right-same-node.bin").to_vec(),
+                2,
+                243,
+            ),
         ];
 
         for (doc, clients, structs) in docs {
diff --git a/y-octo/src/doc/document.rs b/y-octo/src/doc/document.rs
index a180ffc..8acad3f 100644
--- a/y-octo/src/doc/document.rs
+++ b/y-octo/src/doc/document.rs
@@ -608,4 +608,21 @@ mod tests {
             assert_eq!(&text.to_string(), "hello world");
         });
     }
+
+    #[test]
+    #[cfg_attr(any(miri, loom), ignore)]
+    fn test_apply_update() {
+        let updates = [
+            include_bytes!("../fixtures/basic.bin").to_vec(),
+            include_bytes!("../fixtures/database.bin").to_vec(),
+            include_bytes!("../fixtures/large.bin").to_vec(),
+            include_bytes!("../fixtures/with-subdoc.bin").to_vec(),
+            include_bytes!("../fixtures/edge-case-left-right-same-node.bin").to_vec(),
+        ];
+
+        for update in updates {
+            let mut doc = Doc::new();
+            doc.apply_update_from_binary_v1(&update).unwrap();
+        }
+    }
 }
diff --git a/y-octo/src/doc/store.rs b/y-octo/src/doc/store.rs
index aeb8316..d13eaea 100644
--- a/y-octo/src/doc/store.rs
+++ b/y-octo/src/doc/store.rs
@@ -554,7 +554,6 @@ impl DocStore {
                             let mut right = right.get_mut_unchecked();
                             right.left = item_owner_ref.clone();
                         }
-                        this.right = right.clone();
                     } else {
                         // no right, parent.start = this, delete this.left
                         if let Some(parent_sub) = &this.parent_sub {
@@ -565,6 +564,7 @@ impl DocStore {
                             }
                         }
                     }
+                    this.right = right.clone();
 
                     let parent_deleted = parent.item.get().map(|item| item.deleted()).unwrap_or(false);
 
diff --git a/y-octo/src/fixtures/edge-case-left-right-same-node.bin b/y-octo/src/fixtures/edge-case-left-right-same-node.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c598191e22f76dbbe31283bf842935d152550615
GIT binary patch
literal 6673
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
D#h@(P

literal 0
HcmV?d00001