Exercise Mode Editing Capabilities

src/haz3lweb/Export.re

@@ -59,12 +59,7 @@ let import_all = (~import_log: string => unit, data, ~specs) => {
   ExplainThisModel.Store.import(all.explainThisModel);
   let instructor_mode = settings.instructor_mode;
   ScratchMode.Store.import(all.scratch);
-  ExercisesMode.Store.import(
-    ~settings=settings.core,
-    all.exercise,
-    ~specs,
-    ~instructor_mode,
-  );
+  ExercisesMode.Store.import(all.exercise, ~specs, ~instructor_mode);
   import_log(all.log);
 };
 

src/haz3lweb/Settings.re

@@ -36,7 +36,7 @@ module Model = {
     },
     async_evaluation: false,
     context_inspector: false,
-    instructor_mode: true,
+    instructor_mode: false,
     benchmark: false,
     explainThis: {
       show: true,

src/haz3lweb/Store.re

@@ -9,7 +9,7 @@ type key =
   | Scratch
   | Documentation
   | CurrentExercise
-  | Exercise(Exercise.key);
+  | Exercise(Haz3lcore.Id.t);
 
 let key_to_string =
   fun
@@ -19,7 +19,7 @@ let key_to_string =
   | Scratch => "SAVE_SCRATCH"
   | Documentation => "SAVE_DOCUMENTATION"
   | CurrentExercise => "CUR_EXERCISE"
-  | Exercise(key) => key |> Exercise.sexp_of_key |> Sexplib.Sexp.to_string;
+  | Exercise(id) => Haz3lcore.Id.to_string(id);
 
 module F =
        (

src/haz3lweb/app/Page.re

@@ -345,6 +345,21 @@ module Selection = {
 };
 
 module View = {
+  let is_input_field = (elId: option(string)) => {
+    switch (elId) {
+    | Some("title-input-box")
+    | Some("module-name-input")
+    | Some("prompt-input-box")
+    | Some("test-required-input")
+    | Some("point-max-input") => true
+    | Some(id) when String.starts_with(~prefix="hint-input", id) => true
+    | Some(id) when String.starts_with(~prefix="syntax-hint-input", id) =>
+      true
+    | Some(id) when String.starts_with(~prefix="impl-hint-input", id) => true
+    | _ => false
+    };
+  };
+
   let handlers =
       (
         ~inject: Update.t => Ui_effect.t(unit),
@@ -380,47 +395,77 @@ module View = {
         JsUtil.focus_clipboard_shim();
         Effect.Ignore;
       }),
-      Attr.on_copy(_ => {
-        let str = (cursor.selected_text |> Option.value(~default=() => ""))();
-        /* Note that we cannot use the ClipboardCache system here unless
-         * we refine it further to replace unique ids on paste */
-        Haz3lcore.ClipboardCache.set(cursor.selection, str);
-        JsUtil.copy(str);
+      Attr.on_copy(evt => {
+        let target = Js.Opt.to_option(evt##.target);
+        switch (target) {
+        | Some(el) =>
+          let elId = Js.Opt.to_option(Js.Unsafe.coerce(el)##.id);
+          if (is_input_field(elId)) {
+            ();
+          } else {
+            let str =
+              (cursor.selected_text |> Option.value(~default=() => ""))();
+            /* Note that we cannot use the ClipboardCache system here unless
+             * we refine it further to replace unique ids on paste */
+            Haz3lcore.ClipboardCache.set(cursor.selection, str);
+            JsUtil.copy(str);
+          };
+        | None => ()
+        };
         Effect.Ignore;
       }),
-      Attr.on_cut(_ => {
-        let str = (cursor.selected_text |> Option.value(~default=() => ""))();
-        Haz3lcore.ClipboardCache.set(cursor.selection, str);
-        JsUtil.copy(str);
-        Option.map(
-          inject,
-          Selection.handle_key_event(
-            ~selection=Some(model.selection),
-            ~event=
-              Key.{
-                key: D("Delete"),
-                sys: Os.is_mac^ ? Mac : PC,
-                shift: Up,
-                meta: Up,
-                ctrl: Up,
-                alt: Up,
-              },
-            model,
-          ),
-        )
-        |> Option.value(~default=Effect.Ignore);
+      Attr.on_cut(evt => {
+        let target = Js.Opt.to_option(evt##.target);
+        switch (target) {
+        | Some(el) =>
+          let elId = Js.Opt.to_option(Js.Unsafe.coerce(el)##.id);
+          if (is_input_field(elId)) {
+            Effect.Ignore;
+          } else {
+            JsUtil.copy(
+              (cursor.selected_text |> Option.value(~default=() => ""))(),
+            );
+            Option.map(
+              inject,
+              Selection.handle_key_event(
+                ~selection=Some(model.selection),
+                ~event=
+                  Key.{
+                    key: D("Delete"),
+                    sys: Os.is_mac^ ? Mac : PC,
+                    shift: Up,
+                    meta: Up,
+                    ctrl: Up,
+                    alt: Up,
+                  },
+                model,
+              ),
+            )
+            |> Option.value(~default=Effect.Ignore);
+          };
+        | None => Effect.Ignore
+        };
       }),
     ]
     @ [
       Attr.on_paste(evt => {
-        Dom.preventDefault(evt);
-        let action =
-          Js.to_string(evt##.clipboardData##getData(Js.string("text")))
-          |> Haz3lcore.ClipboardCache.get
-          |> cursor.editor_action;
-        switch (action) {
+        let target = Js.Opt.to_option(evt##.target);
+        switch (target) {
+        | Some(el) =>
+          let elId = Js.Opt.to_option(Js.Unsafe.coerce(el)##.id);
+          if (is_input_field(elId)) {
+            Effect.Ignore;
+          } else {
+            let pasted_text =
+              Js.to_string(evt##.clipboardData##getData(Js.string("text")))
+              |> Str.global_replace(Str.regexp("\n[ ]*"), "\n");
+            Dom.preventDefault(evt);
+            switch (cursor.editor_action(Paste(String(pasted_text)))) {
+            | None => Effect.Ignore
+            | Some(action) => inject(Editors(action))
+            };
+          };
         | None => Effect.Ignore
-        | Some(action) => inject(Editors(action))
         };
       }),
     ];

src/haz3lweb/app/common/Icons.re

@@ -222,6 +222,30 @@ let backpack =
     ],
   );
 
+let pencil =
+  simple_icon(
+    ~view="0 0 512 512",
+    [
+      "M403.914,0L54.044,349.871L0,512l162.128-54.044L512,108.086L403.914,0z M295.829,151.319l21.617,21.617L110.638,379.745 l-21.617-21.617L295.829,151.319z M71.532,455.932l-15.463-15.463l18.015-54.043l51.491,51.491L71.532,455.932z M153.871,422.979 l-21.617-21.617l206.809-206.809l21.617,21.617L153.871,422.979z M382.297,194.555l-64.852-64.852l21.617-21.617l64.852,64.852 L382.297,194.555z M360.679,86.468l43.234-43.235l64.853,64.853l-43.235,43.234L360.679,86.468z",
+    ],
+  );
+
+let confirm =
+  simple_icon(
+    ~view="0 0 32 32",
+    [
+      "m16 0c8.836556 0 16 7.163444 16 16s-7.163444 16-16 16-16-7.163444-16-16 7.163444-16 16-16zm0 2c-7.7319865 0-14 6.2680135-14 14s6.2680135 14 14 14 14-6.2680135 14-14-6.2680135-14-14-14zm6.6208153 9.8786797c.3905243.3905242.3905243 1.0236892 0 1.4142135l-7.0710678 7.0710678c-.3626297.3626297-.9344751.3885319-1.3269928.0777064l-.0872208-.0777064-4.24264068-4.2426407c-.39052429-.3905242-.39052429-1.0236892 0-1.4142135.39052428-.3905243 1.02368928-.3905243 1.41421358 0l3.5348268 3.5348268 6.3646681-6.3632539c.3905243-.3905243 1.0236893-.3905243 1.4142136 0z",
+    ],
+  );
+
+let cancel =
+  simple_icon(
+    ~view="0 0 32 32",
+    [
+      "m16 0c8.836556 0 16 7.163444 16 16s-7.163444 16-16 16-16-7.163444-16-16 7.163444-16 16-16zm0 2c-7.7319865 0-14 6.2680135-14 14s6.2680135 14 14 14 14-6.2680135 14-14-6.2680135-14-14-14zm4.2426407 9.7573593c.3905243.3905243.3905243 1.0236893 0 1.4142136l-2.8284271 2.8284271 2.8284271 2.8284271c.3905243.3905243.3905243 1.0236893 0 1.4142136s-1.0236893.3905243-1.4142136 0l-2.8284271-2.8284271-2.8284271 2.8284271c-.3905243.3905243-1.0236893.3905243-1.4142136 0s-.3905243-1.0236893 0-1.4142136l2.8284271-2.8284271-2.8284271-2.8284271c-.3905243-.3905243-.3905243-1.0236893 0-1.4142136s1.0236893-.3905243 1.4142136 0l2.8284271 2.8284271 2.8284271-2.8284271c.3905243-.3905243 1.0236893-.3905243 1.4142136 0z",
+    ],
+  );
+
 let command_palette_sparkle =
   simple_icon(
     ~view="400 400 400 400",
@@ -231,3 +255,24 @@ let command_palette_sparkle =
       "m554.76 426.6c6.5195-23.285 24.715-41.48 48-48-23.297-6.5-41.5-24.707-48-48-6.5 23.293-24.707 41.5-48 48 23.281 6.5195 41.477 24.715 48 48z",
     ],
   );
+
+let add =
+  simple_icon(
+    ~view="0 0 24 24",
+    [
+      "M12.75 9C12.75 8.58579 12.4142 8.25 12 8.25C11.5858 8.25 11.25 8.58579 11.25 9L11.25 11.25H9C8.58579 11.25 8.25 11.5858 8.25 12C8.25 12.4142 8.58579 12.75 9 12.75H11.25V15C11.25 15.4142 11.5858 15.75 12 15.75C12.4142 15.75 12.75 15.4142 12.75 15L12.75 12.75H15C15.4142 12.75 15.75 12.4142 15.75 12C15.75 11.5858 15.4142 11.25 15 11.25H12.75V9Z",
+      "M12 1.25C6.06294 1.25 1.25 6.06294 1.25 12C1.25 17.9371 6.06294 22.75 12 22.75C17.9371 22.75 22.75 17.9371 22.75 12C22.75 6.06294 17.9371 1.25 12 1.25ZM2.75 12C2.75 6.89137 6.89137 2.75 12 2.75C17.1086 2.75 21.25 6.89137 21.25 12C21.25 17.1086 17.1086 21.25 12 21.25C6.89137 21.25 2.75 17.1086 2.75 12Z",
+    ],
+  );
+
+let delete =
+  simple_icon(
+    ~view="0 0 24 24",
+    [
+      "M12 2.75C11.0215 2.75 10.1871 3.37503 9.87787 4.24993C9.73983 4.64047 9.31134 4.84517 8.9208 4.70713C8.53026 4.56909 8.32557 4.1406 8.46361 3.75007C8.97804 2.29459 10.3661 1.25 12 1.25C13.634 1.25 15.022 2.29459 15.5365 3.75007C15.6745 4.1406 15.4698 4.56909 15.0793 4.70713C14.6887 4.84517 14.2602 4.64047 14.1222 4.24993C13.813 3.37503 12.9785 2.75 12 2.75Z",
+      "M2.75 6C2.75 5.58579 3.08579 5.25 3.5 5.25H20.5001C20.9143 5.25 21.2501 5.58579 21.2501 6C21.2501 6.41421 20.9143 6.75 20.5001 6.75H3.5C3.08579 6.75 2.75 6.41421 2.75 6Z",
+      "M5.91508 8.45011C5.88753 8.03681 5.53015 7.72411 5.11686 7.75166C4.70356 7.77921 4.39085 8.13659 4.41841 8.54989L4.88186 15.5016C4.96735 16.7844 5.03641 17.8205 5.19838 18.6336C5.36678 19.4789 5.6532 20.185 6.2448 20.7384C6.83639 21.2919 7.55994 21.5307 8.41459 21.6425C9.23663 21.75 10.2751 21.75 11.5607 21.75H12.4395C13.7251 21.75 14.7635 21.75 15.5856 21.6425C16.4402 21.5307 17.1638 21.2919 17.7554 20.7384C18.347 20.185 18.6334 19.4789 18.8018 18.6336C18.9637 17.8205 19.0328 16.7844 19.1183 15.5016L19.5818 8.54989C19.6093 8.13659 19.2966 7.77921 18.8833 7.75166C18.47 7.72411 18.1126 8.03681 18.0851 8.45011L17.6251 15.3492C17.5353 16.6971 17.4712 17.6349 17.3307 18.3405C17.1943 19.025 17.004 19.3873 16.7306 19.6431C16.4572 19.8988 16.083 20.0647 15.391 20.1552C14.6776 20.2485 13.7376 20.25 12.3868 20.25H11.6134C10.2626 20.25 9.32255 20.2485 8.60915 20.1552C7.91715 20.0647 7.54299 19.8988 7.26957 19.6431C6.99616 19.3873 6.80583 19.025 6.66948 18.3405C6.52891 17.6349 6.46488 16.6971 6.37503 15.3492L5.91508 8.45011Z",
+      "M9.42546 10.2537C9.83762 10.2125 10.2051 10.5132 10.2464 10.9254L10.7464 15.9254C10.7876 16.3375 10.4869 16.7051 10.0747 16.7463C9.66256 16.7875 9.29502 16.4868 9.25381 16.0746L8.75381 11.0746C8.71259 10.6625 9.0133 10.2949 9.42546 10.2537Z",
+      "M15.2464 11.0746C15.2876 10.6625 14.9869 10.2949 14.5747 10.2537C14.1626 10.2125 13.795 10.5132 13.7538 10.9254L13.2538 15.9254C13.2126 16.3375 13.5133 16.7051 13.9255 16.7463C14.3376 16.7875 14.7051 16.4868 14.7464 16.0746L15.2464 11.0746Z",
+    ],
+  );

src/haz3lweb/app/editors/Editors.re

@@ -44,7 +44,7 @@ module Store = {
     | Exercises =>
       Model.Exercises(
         ExercisesMode.Store.load(~settings, ~instructor_mode)
-        |> ExercisesMode.Model.unpersist(~settings, ~instructor_mode),
+        |> ExercisesMode.Model.unpersist(~instructor_mode),
       )
     };
   };
@@ -143,7 +143,6 @@ module Update = {
           ~instructor_mode=globals.settings.instructor_mode,
         )
         |> ExercisesMode.Model.unpersist(
-             ~settings=globals.settings.core,
              ~instructor_mode=globals.settings.instructor_mode,
            ),
       )
@@ -245,7 +244,7 @@ module Selection = {
     fun
     | Model.Scratch(_) => Scratch(MainEditor)
     | Model.Documentation(_) => Scratch(MainEditor)
-    | Model.Exercises(_) => Exercises((Exercise.Prelude, MainEditor));
+    | Model.Exercises(_) => Exercises(Cell(Exercise.Prelude, MainEditor));
 };
 
 module View = {

src/haz3lweb/app/editors/cell/CellCommon.re

@@ -42,3 +42,29 @@ let title_cell = title => {
     ),
   ]);
 };
+
+let wrong_impl_caption = (~inject_delete, sub: string, n: int) => {
+  div(
+    ~attrs=[Attr.class_("wrong-impl-cell-caption")],
+    [
+      caption("", ~rest=sub),
+      div(
+        ~attrs=[
+          Attr.class_("instructor-edit-icon"),
+          Attr.on_mousedown(_ =>
+            Virtual_dom.Vdom.Effect.(
+              Many([Prevent_default, Stop_propagation])
+            )
+          ),
+        ],
+        [
+          Widgets.button(
+            Icons.delete,
+            _ => inject_delete(n),
+            ~tooltip="Delete Buggy Implementation",
+          ),
+        ],
+      ),
+    ],
+  );
+};