Remove automerge

Author: adzialocha

Cargo.lock

@@ -4,16 +4,16 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+aardvark-doc = { path = "../aardvark-doc" }
 aardvark-node = { path = "../aardvark-node" }
 anyhow = "1.0.94"
-automerge = "0.5.12"
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
 gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.128"
+sourceview = { package = "sourceview5", version = "0.9" }
 tokio = { version = "1.42.0", features = ["full"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-sourceview = { package = "sourceview5", version = "0.9" }
 
 [dependencies.adw]
 package = "libadwaita"

aardvark-app/Cargo.toml

@@ -20,16 +20,15 @@
 
 use std::cell::{OnceCell, RefCell};
 
+use aardvark_doc::{TextCrdt, TextCrdtEvent};
 use aardvark_node::network;
 use adw::prelude::*;
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
 use gtk::{gio, glib};
 use tokio::sync::{mpsc, oneshot};
-use automerge::PatchAction;
 
 use crate::config::VERSION;
-use crate::document::Document;
 use crate::glib::closure_local;
 use crate::{AardvarkTextBuffer, AardvarkWindow};
 
@@ -46,8 +45,7 @@ mod imp {
         backend_shutdown: oneshot::Sender<()>,
     }
 
-    impl AardvarkApplication {
-    }
+    impl AardvarkApplication {}
 
     #[glib::object_subclass]
     impl ObjectSubclass for AardvarkApplication {
@@ -182,24 +180,16 @@ impl AardvarkApplication {
 
         // Apply remote changes to our local text CRDT
         if let Err(err) = document.load_incremental(&message) {
-            eprintln!(
-                "failed applying text change from remote peer to automerge document: {err}"
-            );
-            window.add_toast(adw::Toast::new(
-                "The network provided bad data!"
-            ));
+            eprintln!("failed applying text change from remote peer to automerge document: {err}");
+            window.add_toast(adw::Toast::new("The network provided bad data!"));
             return;
         }
 
         // Get latest changes and apply them to our local text buffer
         for patch in document.diff_incremental() {
             match &patch.action {
                 PatchAction::SpliceText { index, value, .. } => {
-                    buffer.splice(
-                        *index as i32,
-                        0,
-                        value.make_string().as_str(),
-                    );
+                    buffer.splice(*index as i32, 0, value.make_string().as_str());
                 }
                 PatchAction::DeleteSeq { index, length } => {
                     buffer.splice(*index as i32, *length as i32, "");
@@ -210,7 +200,9 @@ impl AardvarkApplication {
 
         // Sanity check that the text buffer and CRDT are in the same state
         if buffer.full_text() != document.text() {
-            window.add_toast(adw::Toast::new("The CRDT and the text view have different states!"));
+            window.add_toast(adw::Toast::new(
+                "The CRDT and the text view have different states!",
+            ));
             // if the state diverged, use the CRDT as the source of truth
             buffer.set_text(&document.text());
         }