Move actions down

Author: Negabinary

src/web/app/Page.re

@@ -410,105 +410,6 @@ module Selection = {
            ~action=inject(Globals(Redo)),
            "Redo",
          ),
-         /* Navigation */
-         mk(
-           ~hotkey="F12",
-           ~mdIcon="arrow_forward",
-           ~section="Navigation",
-           ~action=
-             inject(
-               Globals(
-                 ActiveEditor(Move(Goal(BindingSiteOfIndicatedVar))),
-               ),
-             ),
-           "Go to Definition",
-         ),
-         mk(
-           ~hotkey="shift+tab",
-           ~mdIcon="swipe_left_alt",
-           ~section="Navigation",
-           ~action=inject(Globals(ActiveEditor(Move(Goal(Hole(Left)))))),
-           "Go to Previous Hole",
-         ),
-         mk(
-           ~mdIcon="swipe_right_alt",
-           ~section="Navigation",
-           ~action=
-             inject(Globals(ActiveEditor(Move(Goal(Hole(Right)))))),
-           "Go To Next Hole",
-         ),
-         /* Selection */
-         mk(
-           ~hotkey=meta ++ "+d",
-           ~mdIcon="select_all",
-           ~section="Selection",
-           ~action=inject(Globals(ActiveEditor(Select(Term(Current))))),
-           "Select current term",
-         ),
-         mk(
-           ~mdIcon="select_all",
-           ~hotkey=meta ++ "+a",
-           ~section="Selection",
-           ~action=inject(Globals(ActiveEditor(Select(All)))),
-           "Select All",
-         ),
-         mk(
-           ~mdIcon="flip_horizontal",
-           ~section="Selection",
-           ~action=inject(Globals(ActiveEditor(Select(ToggleFocus)))),
-           "Toggle Selection Focus",
-         ),
-         mk(
-           ~mdIcon="border_left",
-           ~section="Selection",
-           ~hotkey=meta ++ "+alt+shift+left",
-           ~action=inject(Globals(ActiveEditor(Select(SetFocus(Left))))),
-           "Set Selection Focus Left",
-         ),
-         mk(
-           ~mdIcon="border_right",
-           ~section="Selection",
-           ~hotkey=meta ++ "+alt+shift+right",
-           ~action=inject(Globals(ActiveEditor(Select(SetFocus(Right))))),
-           "Set Selection Focus Right",
-         ),
-         /* Projection */
-         mk(
-           ~hotkey="alt+f",
-           ~mdIcon="camera",
-           ~section="Projection",
-           ~action=
-             inject(
-               Globals(
-                 ActiveEditor(Project(SetIndicated(Specific(Fold)))),
-               ),
-             ),
-           "Fold",
-         ),
-         mk(
-           ~hotkey=meta ++ "+e",
-           ~mdIcon="camera",
-           ~section="Projection",
-           ~action=inject(Globals(ActiveEditor(Probe(ToggleManual)))),
-           "Probe",
-         ),
-         mk(
-           ~hotkey="alt+t",
-           ~mdIcon="camera",
-           ~section="Projection",
-           ~action=inject(Globals(ActiveEditor(Probe(ToggleStatics)))),
-           "Statics",
-         ),
-         mk(
-           ~hotkey="alt+l",
-           ~mdIcon="camera",
-           ~section="Projection",
-           ~action=
-             inject(
-               Globals(ActiveEditor(Project(SetIndicated(ChooseLivelit)))),
-             ),
-           "Livelit",
-         ),
          /* Settings */
          mk(
            ~section="Settings",
@@ -600,39 +501,20 @@ module Selection = {
            ~action=inject(Globals(Set(ExplainThis(ToggleShowFeedback)))),
            "Toggle Show Docs Feedback",
          ),
-         /* Editor tools */
-         mk(
-           ~hotkey=meta ++ "+/",
-           ~mdIcon="assistant",
-           ~action=inject(Globals(ActiveEditor(Buffer(Set(TyDi))))),
-           "TyDi Assistant",
-         ),
+         /* Export / Diagnostics */
          mk(
            ~mdIcon="download",
            ~section="Export",
            ~action=inject(Globals(ExportForInit)),
            "Export For Init",
          ),
-         mk(
-           ~section="Diagnostics",
-           ~mdIcon="refresh",
-           ~action=inject(Globals(ActiveEditor(Reparse))),
-           "Reparse Current Editor",
-         ),
          mk(
            ~mdIcon="timer",
            ~section="Diagnostics",
            ~hotkey="F7",
            ~action=inject(Benchmark(Start)),
            "Run Benchmark",
          ),
-         mk(
-           ~mdIcon="bolt",
-           ~section="Refactoring",
-           ~hotkey=meta ++ "+i",
-           ~action=inject(Globals(ActiveEditor(Introduce))),
-           "Introduce",
-         ),
        ]);
   };
 };
@@ -799,7 +681,10 @@ module View = {
             Effect.Ignore;
           } else {
             copy(cursor);
-            inject(Globals(ActiveEditor(Destruct(Right))));
+            switch (cursor.editor_action(Destruct(Right))) {
+            | Some(action) => inject(Editors(action))
+            | None => Effect.Ignore
+            };
           };
         | None => Effect.Ignore
         };

src/web/app/editors/cell/CellEditor.re

@@ -151,15 +151,25 @@ module Selection = {
     | MainEditor
     | Result(EvalResult.Selection.t);
 
-  let get_cursor_info = (~selection, model: Model.t): cursor(Update.t) => {
+  let get_cursor_info =
+      (~inject: Update.t => Ui_effect.t(unit), ~selection, model: Model.t)
+      : cursor(Update.t) => {
     switch (selection) {
     | MainEditor =>
       let+ ci =
-        CodeEditable.Selection.get_cursor_info(~selection=(), model.editor);
+        CodeEditable.Selection.get_cursor_info(
+          ~inject=a => inject(MainEditor(a)),
+          ~selection=(),
+          model.editor,
+        );
       Update.MainEditor(ci);
     | Result(selection) =>
       let+ ci =
-        EvalResult.Selection.get_cursor_info(~selection, model.result);
+        EvalResult.Selection.get_cursor_info(
+          ~inject=a => inject(ResultAction(a)),
+          ~selection,
+          model.result,
+        );
       Update.ResultAction(ci);
     };
   };

src/web/app/editors/code/CodeEditable.re

@@ -136,13 +136,130 @@ module Selection = {
   [@deriving (show({with_path: false}), sexp, yojson)]
   type t = unit;
 
-  let get_cursor_info = (~selection as (), model: Model.t): cursor(Update.t) => {
+  let get_cursor_info =
+      (
+        ~inject: Update.t => Ui_effect.t(unit),
+        ~selection as (),
+        model: Model.t,
+      )
+      : cursor(Update.t) => {
+    let sys = Util.Os.is_mac^ ? Util.Key.Mac : PC;
+    let meta = Keyboard.meta(sys);
+    let mk = ContextualAction.mk;
+    let action = a => inject(Perform(a));
     {
       ...
         CodeWithStatics.Model.get_cursor_info(model)
         |> map(x => Update.Perform(x)),
       editor_read_only: false,
-    };
+    }
+    |> Cursor.with_actions([
+         /* Navigation */
+         mk(
+           ~hotkey="F12",
+           ~mdIcon="arrow_forward",
+           ~section="Navigation",
+           ~action=action(Move(Goal(BindingSiteOfIndicatedVar))),
+           "Go to Definition",
+         ),
+         mk(
+           ~hotkey="shift+tab",
+           ~mdIcon="swipe_left_alt",
+           ~section="Navigation",
+           ~action=action(Move(Goal(Hole(Left)))),
+           "Go to Previous Hole",
+         ),
+         mk(
+           ~mdIcon="swipe_right_alt",
+           ~section="Navigation",
+           ~action=action(Move(Goal(Hole(Right)))),
+           "Go To Next Hole",
+         ),
+         /* Selection */
+         mk(
+           ~hotkey=meta ++ "+d",
+           ~mdIcon="select_all",
+           ~section="Selection",
+           ~action=action(Select(Term(Current))),
+           "Select current term",
+         ),
+         mk(
+           ~mdIcon="select_all",
+           ~hotkey=meta ++ "+a",
+           ~section="Selection",
+           ~action=action(Select(All)),
+           "Select All",
+         ),
+         mk(
+           ~mdIcon="flip_horizontal",
+           ~section="Selection",
+           ~action=action(Select(ToggleFocus)),
+           "Toggle Selection Focus",
+         ),
+         mk(
+           ~mdIcon="border_left",
+           ~section="Selection",
+           ~hotkey=meta ++ "+alt+shift+left",
+           ~action=action(Select(SetFocus(Left))),
+           "Set Selection Focus Left",
+         ),
+         mk(
+           ~mdIcon="border_right",
+           ~section="Selection",
+           ~hotkey=meta ++ "+alt+shift+right",
+           ~action=action(Select(SetFocus(Right))),
+           "Set Selection Focus Right",
+         ),
+         /* Projection */
+         mk(
+           ~hotkey="alt+f",
+           ~mdIcon="camera",
+           ~section="Projection",
+           ~action=action(Project(SetIndicated(Specific(Fold)))),
+           "Fold",
+         ),
+         mk(
+           ~hotkey=meta ++ "+e",
+           ~mdIcon="camera",
+           ~section="Projection",
+           ~action=action(Probe(ToggleManual)),
+           "Probe",
+         ),
+         mk(
+           ~hotkey="alt+t",
+           ~mdIcon="camera",
+           ~section="Projection",
+           ~action=action(Probe(ToggleStatics)),
+           "Statics",
+         ),
+         mk(
+           ~hotkey="alt+l",
+           ~mdIcon="camera",
+           ~section="Projection",
+           ~action=action(Project(SetIndicated(ChooseLivelit))),
+           "Livelit",
+         ),
+         /* Editor tools */
+         mk(
+           ~hotkey=meta ++ "+/",
+           ~mdIcon="assistant",
+           ~action=action(Buffer(Set(TyDi))),
+           "TyDi Assistant",
+         ),
+         mk(
+           ~section="Diagnostics",
+           ~mdIcon="refresh",
+           ~action=inject(Perform(Reparse)),
+           "Reparse Current Editor",
+         ),
+         mk(
+           ~mdIcon="bolt",
+           ~section="Refactoring",
+           ~hotkey=meta ++ "+i",
+           ~action=action(Introduce),
+           "Introduce",
+         ),
+       ]);
   };
 
   let handle_key_event =

src/web/app/editors/code/CodeSelectable.re

@@ -63,8 +63,17 @@ module Update = {
 module Selection = {
   [@deriving (show({with_path: false}), sexp, yojson)]
   type t = CodeEditable.Selection.t;
-  let get_cursor_info = (~selection, model) =>
-    CodeEditable.Selection.get_cursor_info(~selection, model)
+  let get_cursor_info = (~inject, ~selection, model) =>
+    CodeEditable.Selection.get_cursor_info(
+      ~inject=
+        a =>
+          switch (Update.convert_action(a)) {
+          | Some(action) => inject(action)
+          | None => Ui_effect.Ignore
+          },
+      ~selection,
+      model,
+    )
     |> (
       ci =>
         Cursor.{

src/web/app/editors/mode/ExercisesMode.re

@@ -445,12 +445,21 @@ module Selection = {
     let cursor =
       switch (current, selection) {
       | (Implementation(e), Implementation(selection)) =>
-        let+ ci = ExerciseMode.Selection.get_cursor_info(~selection, e);
+        let+ ci =
+          ExerciseMode.Selection.get_cursor_info(
+            ~inject=a => inject(Exercise(a)),
+            ~selection,
+            e,
+          );
         Update.Exercise(ci);
       | (Implementation(_), _) => Cursor.empty
       | (Theorem(e), TheoremExercise(selection)) =>
         let+ ci =
-          TheoremExerciseMode.Selection.get_cursor_info(~selection, e);
+          TheoremExerciseMode.Selection.get_cursor_info(
+            ~inject=a => inject(TheoremExercise(a)),
+            ~selection,
+            e,
+          );
         Update.TheoremExercise(ci);
       | (Theorem(_), _) => Cursor.empty
       };

src/web/app/editors/mode/TutorialsMode.re

@@ -301,14 +301,11 @@ module Selection = {
   [@deriving (show({with_path: false}), sexp, yojson)]
   type t = TutorialMode.Selection.t;
   let get_cursor_info =
-      (
-        ~inject as _: Update.t => Ui_effect.t(unit),
-        ~selection,
-        model: Model.t,
-      )
+      (~inject: Update.t => Ui_effect.t(unit), ~selection, model: Model.t)
       : cursor(Update.t) => {
     let+ ci =
       TutorialMode.Selection.get_cursor_info(
+        ~inject=a => inject(Tutorial(a)),
         ~selection,
         List.nth(model.exercises, model.current),
       );