fix #36

hazelgrove · Feb 16, 2025 · b144e0e · b144e0e
1 parent e9cc1de
commit b144e0e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/core/editor/Tab.re b/src/core/editor/Tab.re
@@ -18,9 +18,14 @@ let complete_face = (site: Zipper.Site.t, ctx: Ctx.t) =>
     complete(R);
   };
 
-let perform = (d: Dir.t, z: Zipper.t): option(Zipper.t) =>
+let modified = ref(false);
+
+let perform = (d: Dir.t, z: Zipper.t): option(Zipper.t) => {
+  modified := true;
   switch (Zipper.cursor_site(z)) {
-  | (Select(_), _) => Move.hstep(d, z)
+  | (Select(_), _) =>
+    modified := false;
+    Some(Move.unselect(~toward=d, z));
   | (Point(site), ctx) =>
     open Options.Syntax;
     // P.log("--- Tab.perform/Point");
@@ -33,6 +38,7 @@ let perform = (d: Dir.t, z: Zipper.t): option(Zipper.t) =>
         Modify.try_expand(" ", z);
       };
     // otherwise jump to next obligation
+    modified := false;
     let c = Zipper.zip(~save_cursor=true, z);
     // P.show("c", Cell.show(c));
     let normal = Zipper.normalize(~cell=c);
@@ -59,3 +65,4 @@ let perform = (d: Dir.t, z: Zipper.t): option(Zipper.t) =>
     |> Zipper.unzip_exn
     |> Option.some;
   };
+};
diff --git a/src/web/model/History.re b/src/web/model/History.re
@@ -45,8 +45,15 @@ let can_undo = ((_, after): t) => Chain.Affix.is_empty(after);
 //     last_attempt: Some(JsUtil.timestamp()),
 //   };
 // };
-let do_ = (a: Edit.t, z: Zipper.t, (pre, _): t) =>
-  Chain.Affix.(link(a, z, pre), empty);
+let do_ = (a: Edit.t, z: Zipper.t, (pre, _) as h: t) =>
+  switch (a) {
+  | Tab(_) when ! Tab.modified^ => h
+  | Move(_)
+  | Select(_) => h
+  | Tab(_)
+  | Insert(_)
+  | Delete(_) => Chain.Affix.(link(a, z, pre), empty)
+  };
 
 // let escaped = (history: t) => {
 //   ...history,