revert file renames

src/haz3lweb/app/editors/Editors.re

@@ -332,7 +332,7 @@ module View = {
               ),
             ],
             List.map(
-              SlideSelect.option_view(
+              EditorModeView.option_view(
                 switch (editors) {
                 | Scratch(_) => "Scratch"
                 | Documentation(_) => "Documentation"

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

@@ -468,7 +468,7 @@ module View = {
       ~inject=globals.inject_global,
       ~instructor_mode=globals.settings.instructor_mode,
     )
-    @ SlideSelect.view(
+    @ EditorModeView.view(
         ~signal=
           fun
           | Previous =>
@@ -484,7 +484,7 @@ module View = {
               ),
             ),
         ~indicator=
-          SlideSelect.indicator_n(
+          EditorModeView.indicator_n(
             model.current,
             List.length(model.exercises),
           ),

src/haz3lweb/app/editors/result/EvalResult.re

@@ -26,7 +26,7 @@ module Model = {
         cached_settings: Calc.saved(Haz3lcore.CoreSettings.t),
         editor: Calc.saved((Haz3lcore.Exp.t, CodeSelectable.Model.t)),
       })
-    | Stepper(Stepper.Model.t);
+    | Stepper(StepperView.Model.t);
 
   [@deriving (show({with_path: false}), sexp, yojson)]
   type kind =
@@ -52,7 +52,7 @@ module Model = {
     | Stepper(s) =>
       Some(
         s.history
-        |> Stepper.Model.get_state
+        |> StepperView.Model.get_state
         |> Haz3lcore.EvaluatorState.get_tests
         |> Haz3lcore.TestResults.mk_results,
       )
@@ -74,7 +74,7 @@ module Model = {
     | Stepper(s) =>
       Some(
         s.history
-        |> Stepper.Model.get_state
+        |> StepperView.Model.get_state
         |> Haz3lcore.EvaluatorState.get_tests
         |> Haz3lcore.TestResults.mk_results,
       )
@@ -85,7 +85,7 @@ module Model = {
   let get_elaboration = (model: t): option(Haz3lcore.Exp.t) =>
     switch (model.result) {
     | Evaluation({elab, _}) => Some(elab)
-    | Stepper(s) => Stepper.Model.get_elaboration(s)
+    | Stepper(s) => StepperView.Model.get_elaboration(s)
     | _ => None
     };
 };
@@ -96,7 +96,7 @@ module Update = {
   [@deriving (show({with_path: false}), sexp, yojson)]
   type t =
     | ToggleStepper
-    | StepperAction(Stepper.Update.t)
+    | StepperAction(StepperView.Update.t)
     | EvalEditorAction(CodeSelectable.Update.t)
     | UpdateResult(Haz3lcore.ProgramResult.t(Haz3lcore.ProgramResult.inner));
 
@@ -108,7 +108,7 @@ module Update = {
     | (ToggleStepper, {kind: Evaluation, _}) =>
       {...model, kind: Stepper} |> Updated.return
     | (StepperAction(a), {result: Stepper(s), _}) =>
-      let* stepper = Stepper.Update.update(~settings, a, s);
+      let* stepper = StepperView.Update.update(~settings, a, s);
       {...model, result: Stepper(stepper)};
     | (StepperAction(_), _) => model |> Updated.return_quiet
     | (
@@ -223,11 +223,12 @@ module Update = {
         }
       | (Evaluation, _) => {...model, result: NoElab}
       | (Stepper, Stepper(s)) =>
-        let s' = Stepper.Update.calculate(~settings, elab, s);
+        let s' = StepperView.Update.calculate(~settings, elab, s);
         {...model, result: Stepper(s')};
       | (Stepper, _) =>
         let s =
-          Stepper.Model.init() |> Stepper.Update.calculate(~settings, elab);
+          StepperView.Model.init()
+          |> StepperView.Update.calculate(~settings, elab);
         {...model, result: Stepper(s)};
       };
 
@@ -289,7 +290,7 @@ module Selection = {
   [@deriving (show({with_path: false}), sexp, yojson)]
   type t =
     | Evaluation(CodeSelectable.Selection.t)
-    | Stepper(Stepper.Selection.t);
+    | Stepper(StepperView.Selection.t);
 
   let get_cursor_info = (~selection: t, mr: Model.t): cursor(Update.t) =>
     switch (selection, mr.result) {
@@ -299,7 +300,7 @@ module Selection = {
         CodeSelectable.Selection.get_cursor_info(~selection, editor |> snd);
       Update.EvalEditorAction(ci);
     | (Stepper(selection), Stepper(s)) =>
-      let+ ci = Stepper.Selection.get_cursor_info(~selection, s);
+      let+ ci = StepperView.Selection.get_cursor_info(~selection, s);
       Update.StepperAction(ci);
     | (_, Evaluation(_)) => empty
     | (_, Stepper(_)) => empty
@@ -317,7 +318,7 @@ module Selection = {
       )
       |> Option.map(x => Update.EvalEditorAction(x))
     | (Stepper(selection), Stepper(s)) =>
-      Stepper.Selection.handle_key_event(~selection, s, ~event)
+      StepperView.Selection.handle_key_event(~selection, s, ~event)
       |> Option.map(x => Update.StepperAction(x))
     | (_, Evaluation(_)) => None
     | (_, Stepper(_)) => None
@@ -443,7 +444,7 @@ module View = {
         ),
       ]
     | Stepper(s) =>
-      Stepper.View.view(
+      StepperView.View.view(
         ~globals,
         ~selection=
           switch (selected) {

src/haz3lweb/app/inspector/CursorInspector.re

@@ -324,7 +324,7 @@ let tpat_view = (~globals, _: Cls.t, status: Info.status_tpat) => {
     );
   switch (status) {
   | NotInHole(Empty) => div_ok([text("Fillable with a new alias")])
-  | NotInHole(Var(name)) => div_ok([CtxInspector.alias_view(name)])
+  | NotInHole(Var(name)) => div_ok([ContextInspector.alias_view(name)])
   | InHole(NotAVar(NotCapitalized)) =>
     div_err([text("Must begin with a capital letter")])
   | InHole(NotAVar(_)) => div_err([text("Expected an alias")])

src/haz3lweb/app/editors/mode/ExerciseMode.re → src/haz3lweb/view/ExerciseMode.re

@@ -413,7 +413,7 @@ module View = {
               switch (specific_ctx) {
               | None => Node.div([text("No context available")]) // TODO show exercise configuration error
               | Some(specific_ctx) =>
-                CtxInspector.ctx_view(~globals, specific_ctx)
+                ContextInspector.ctx_view(~globals, specific_ctx)
               };
             };
           };

src/haz3lweb/app/Page.re → src/haz3lweb/view/Page.re

@@ -496,7 +496,7 @@ module View = {
       ),
       sidebar,
       bottom_bar,
-      CtxInspector.view(~globals, cursor.info),
+      ContextInspector.view(~globals, cursor.info),
     ];
   };
 

src/haz3lweb/app/editors/mode/ScratchMode.re → src/haz3lweb/view/ScratchMode.re

@@ -346,7 +346,7 @@ module View = {
         ~inject: Update.t => 'a,
         model: Model.t,
       ) => {
-    SlideSelect.view(
+    EditorModeView.view(
       ~signal=
         fun
         | Previous =>
@@ -363,12 +363,12 @@ module View = {
           ),
       ~indicator=
         named_slides
-          ? SlideSelect.indicator_select(
+          ? EditorModeView.indicator_select(
               ~signal=i => inject(SwitchSlide(i)),
               model.current,
               List.map(((s, _)) => s, model.scratchpads),
             )
-          : SlideSelect.indicator_n(
+          : EditorModeView.indicator_n(
               model.current,
               List.length(model.scratchpads),
             ),