not sure why this partial revert fixes a grouter failure but it does …

…when inserting x in let |<> >=< <> >in< <>
hazelgrove · Sep 30, 2024 · 63d3ee1 · 63d3ee1
1 parent e5129c9
commit 63d3ee1
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/src/core/structure/Cell.re b/src/core/structure/Cell.re
@@ -275,22 +275,28 @@ module Space = {
     if (!is_space(l) || !is_space(r)) {
       raise(Invalid_argument("Cell.Space.merge"));
     };
-    let shift_opt =
-      l.meld |> Option.map(m => 2 * List.length(Meld.tokens(m)));
-    let shift = Option.value(shift_opt, ~default=0);
     let marks =
       r.marks
-      |> Marks.map_paths(
-           fun
-           | [] => {
-               assert(r.meld == None);
-               [shift];
-             }
-           | [hd, ...tl] => [hd + shift, ...tl],
-         )
+      |> (
+        switch (l.meld) {
+        | None => Fun.id
+        | Some(m) =>
+          let shift = 2 * List.length(Meld.tokens(m));
+          Marks.map_paths(
+            fun
+            | [] => {
+                assert(r.meld == None);
+                [shift];
+              }
+            | [hd, ...tl] => [hd + shift, ...tl],
+          );
+        }
+      )
       |> Marks.union(
-           switch (shift_opt) {
-           | Some(n) => Marks.cons(n, fill.marks)
+           switch (l.meld) {
+           | Some(m) =>
+             let n = 2 * List.length(Meld.tokens(m));
+             Marks.cons(n, fill.marks);
            | None => fill.marks
            },
          )