Further modifications

Author: tcr

Cargo.lock

@@ -455,7 +455,7 @@ fn run() -> Result<(), Error> {
         }
 
         Cli::WasmBuild { no_vendor } => {
-            let release_flag = Some("--release");
+            // let release_flag = None; //Some("--release");
 
             // Install wasm target
             execute!(
@@ -469,9 +469,9 @@ fn run() -> Result<(), Error> {
             execute!(
                 r"
                     cd edit-client
-                    cargo build {release_flag} --lib --target wasm32-unknown-unknown {cargo_args}
+                    cargo build --lib --target wasm32-unknown-unknown {cargo_args}
                 ",
-                release_flag = release_flag,
+                // release_flag = ,
                 cargo_args = CARGO_ARGS_EDIT_CLIENT,
             )?;
 

build-tools/src/main.rs

@@ -328,17 +328,18 @@ fn controller_command<C: ClientController>(
             match (focus, anchor) {
                 (Some(focus), Some(anchor)) => {
                     client.client_op(|mut ctx| {
-                        let op = cur_to_caret(ctx.clone(), &focus, Pos::Focus)?;
-                        ctx.doc = Op::apply(&ctx.doc, &op);
-                        let op2 = cur_to_caret(ctx, &anchor, Pos::Anchor)?;
-                        Ok(Op::compose(&op, &op2))
+                        let op = cur_to_caret(&ctx, &focus, Pos::Focus)?;
+                        ctx = ctx.apply(&op)?;
+                        let op2 = cur_to_caret(&ctx, &anchor, Pos::Anchor)?;
+                        ctx = ctx.apply(&op2)?;
+                        Ok(ctx.result())
                     })?;
                 }
                 (Some(focus), None) => {
-                    client.client_op(|doc| cur_to_caret(doc, &focus, Pos::Focus))?;
+                    client.client_op(|ctx| cur_to_caret(&ctx, &focus, Pos::Focus))?;
                 }
                 (None, Some(anchor)) => {
-                    client.client_op(|doc| cur_to_caret(doc, &anchor, Pos::Anchor))?;
+                    client.client_op(|ctx| cur_to_caret(&ctx, &anchor, Pos::Anchor))?;
                 }
                 (None, None) => {} // ???
             }
@@ -428,7 +429,7 @@ pub trait ClientController {
 
                     value = Task::ControllerCommand(ControllerCommand::Cursor {
                         focus: Some(cursors[idx].clone()),
-                        anchor: None,
+                        anchor: Some(cursors[idx].clone()),
                     });
                 }
 

edit-client/src/client.rs

@@ -238,10 +238,10 @@ pub fn caret_clear(ctx: &ActionContext, position: Pos) -> Result<Op, Error> {
     caret_clear_inner(ctx.get_walker(position)?)
 }
 
-pub fn cur_to_caret(ctx: ActionContext, cur: &CurSpan, pos: Pos) -> Result<Op, Error> {
+pub fn cur_to_caret(ctx: &ActionContext, cur: &CurSpan, pos: Pos) -> Result<Op, Error> {
     Ok(Op::transform_advance::<RtfSchema>(&{
         // First operation removes the caret.
-        caret_clear(&ctx, pos).unwrap_or_else(|_| Op::empty())
+        caret_clear(ctx, pos).unwrap_or_else(|_| Op::empty())
     }, &{
         // Second operation inserts a new caret.
         let walker = Walker::to_cursor(&ctx.doc, cur);

edit-client/src/client/actions/caret.rs

@@ -1,3 +1,5 @@
+//! Actions that edit the document structure. Modify blocks or characters.
+
 use super::*;
 use crate::walkers::*;
 use failure::Error;

edit-client/src/client/actions/modify.rs

@@ -185,6 +185,15 @@ const DEBUG = {
         return div;
     },
 
+    randomCaretPosition: () => {
+        globalClientBindings!.command(JSON.stringify({
+            ControllerCommand: {
+                "tag" : "RandomTarget" ,
+                "fields" : { "position" : Math.random() , } ,
+            },
+        }));
+    },
+
     // Bindings to global ref for client module
     // NOTE: only for debugging! bindings should not be referenced globally.
 

edit-frontend/src/debug.ts

@@ -747,16 +747,16 @@ export function start() {
     />,
     document.querySelector('#content')!,
     () => {
-      // Default notification
-      if (!sessionStorage.getItem("its-only-funny-once")) {
-        editorFrame!.showNotification({
-          element: (<div>
-            Check out <a href="http://github.com/tcr/edit-text">edit-text</a> on Github for more information.
-          </div>),
-          level: 'notice',
-        });
-        sessionStorage.setItem("its-only-funny-once", 'true');
-      }
+      // NUX notification.
+      // if (!sessionStorage.getItem("its-only-funny-once")) {
+      //   editorFrame!.showNotification({
+      //     element: (<div>
+      //       Check out <a href="http://github.com/tcr/edit-text">edit-text</a> on Github for more information.
+      //     </div>),
+      //     level: 'notice',
+      //   });
+      //   sessionStorage.setItem("its-only-funny-once", 'true');
+      // }
 
       // Connect client.
       DEBUG.measureTime('connect-client');

edit-frontend/src/ui/app.tsx

@@ -24,6 +24,7 @@ r2d2 = "0.8.2"
 r2d2-diesel = "1.0.0"
 open = "1.2.2"
 rand = "0.4"
+regex = "1"
 reqwest = "0.8.5"
 ron = "0.4"
 libsqlite3-sys = { version = "*", features = ["bundled"] }

edit-server/Cargo.toml

@@ -14,6 +14,7 @@ extern crate failure;
 
 use md5;
 use reqwest;
+use regex::Regex;
 use crypto::md5::Md5;
 use crypto::digest::Digest;
 use yansi::Paint;

edit-server/src/bin/edit-server.rs

@@ -405,8 +405,8 @@ pub fn apply_del_bc(spanvec: &DocSpan, del: &DelSpan) -> (DocSpan, Program) {
         let actual = output_doc.clone();
         if actual != compare {
             console_log!("\n\n\n🚫🚫🚫 DELETION: {:?}", del);
-            for item in &bc.0 {
-                console_log!("      -> {:?}", item);
+            for _item in &bc.0 {
+                console_log!("      -> {:?}", _item);
             }
             console_log!(
                 "\ntest =====> [ {} ]\n\nactual:\n  {:?}\n\ncompare:\n  {:?}\n\n",

oatie/src/core/apply.rs

@@ -1,4 +1,7 @@
-//! Performs operational transform.
+//! Contains types that define the different groups and styles the document
+//! tree can contain. This code should live outside of `oatie`, once all of
+//! DocSpan and Op are made generic over a <S: Schema> trait. Until then,
+//! oatie is hard-coded to this Markdown-like schema.
 
 use super::transform::{
     Schema,

oatie/src/core/schema.rs

@@ -233,11 +233,16 @@ impl<'a> DocMutator for RecordingDocMutator<'a> {
         if self.flush_chars() {
             count -= 1;
         }
+        
+        console_log!("advance elements: {:?}", count);
 
         for _ in 0..count {
             self.bc.place(Bytecode::AdvanceElements(1));
 
-            self.writer.place(&self.stepper.head_raw().expect("oh god"));
+            self.writer.place(match self.stepper.head_raw() {
+                Some(head) => head,
+                _ => panic!("no head element"),
+            });
 
             self.stepper.next();
         }