fix #44

src/core/editor/Modify.re

@@ -90,7 +90,7 @@ let relabel =
   (normalized, Ctx.button(rest));
 };
 
-// None means token was removed
+// None means token was removed. Some(ctx) means token was molded (or deferred and tagged as an unmolded space), ctx includes the molded token.
 let mold =
     (ctx: Ctx.t, ~fill=Cell.dirty, tok: Token.Unmolded.t): option(Ctx.t) => {
   open Options.Syntax;
@@ -481,6 +481,8 @@ let insert = (s: string, z: Zipper.t) => {
            | Some(ctx) =>
              let (face, rest) = Ctx.pull(~from=L, ctx);
              switch (face, next_fill.marks.cursor) {
+             // if molded token is longer than original, then move cursor out of
+             // next_fill and into molded token at the end of its text
              | (Node(molded), Some(Point({hand, path: []})))
                  when Token.length(molded) > Token.Unmolded.length(tok) =>
                let marks = {...next_fill.marks, cursor: None};

src/core/structure/Token.re

@@ -256,7 +256,12 @@ module Unmolded = {
     Base.mk(~id?, ~text, ~marks?, mtrl);
   let length = (tok: t) => Utf8.length(tok.text);
   let defer = (tok: t): Molded.t =>
-    Molded.mk(~id=tok.id, ~text=tok.text, Space(Unmolded));
+    Molded.mk(
+      ~id=tok.id,
+      ~marks=?tok.marks,
+      ~text=tok.text,
+      Space(Unmolded),
+    );
   let has_lbl = (lbl: Label.t, tok: t) =>
     switch (tok.mtrl) {
     | Space(_)