fixup! fixup! Offer better protections against solution overwriting

Signed-off-by: Yann Regis-Gianas <[email protected]>

Author: yurug

src/ace-lib/ace.ml

@@ -86,6 +86,8 @@ let set_synchronized_status editor status =
   List.iter (fun obs -> obs status) editor.sync_observers;
   editor.synchronized <- status
 
+let focus { editor } = editor##focus
+
 let create_editor editor_div check_valid_state =
   let editor = edit editor_div in
   Js.Unsafe.set editor "$blockScrolling" (Js.Unsafe.variable "Infinity");
@@ -100,7 +102,7 @@ let create_editor editor_div check_valid_state =
   editor##.customData := (data, None);
   editor##setOption (Js.string "displayIndentGuides") (Js.bool false);
   editor##on (Js.string "change") (fun () ->
-      check_valid_state (set_contents data) ;
+      check_valid_state (set_contents data) (fun () -> focus data);
       set_synchronized_status data false);
   data
 
@@ -192,7 +194,6 @@ let clear_marks editor =
 let record_event_handler editor event handler =
   editor.editor##(on (Js.string event) handler)
 
-let focus { editor } = editor##focus
 let resize { editor } force = editor##(resize (Js.bool force))
 
 let get_keybinding_menu e =

src/ace-lib/ace.mli

@@ -17,7 +17,8 @@ type loc = {
   loc_end: int * int;
 }
 
-val create_editor: Dom_html.divElement Js.t -> ((string -> unit) -> unit) -> 'a editor
+val create_editor: Dom_html.divElement Js.t
+  -> ((string -> unit) -> (unit -> unit) -> unit) -> 'a editor
 
 val is_synchronized : 'a editor -> bool
 

src/ace-lib/ocaml_mode.mli

@@ -24,7 +24,8 @@ type error = msg list
 
 type warning = error
 
-val create_ocaml_editor: Dom_html.divElement Js.t -> ((string -> unit) -> unit) -> editor
+val create_ocaml_editor:
+  Dom_html.divElement Js.t -> ((string -> unit) -> (unit -> unit) -> unit) -> editor
 val get_editor: editor -> editor Ace.editor
 
 val report_error: editor -> ?set_class: bool -> error option -> warning list -> unit Lwt.t

src/app/learnocaml_common.ml

@@ -730,7 +730,7 @@ let is_synchronized_with_server () = !is_synchronized_with_server_callback ()
 
 let check_valid_editor_state id =
   let last_changed = ref (Unix.gettimeofday ()) in
-  fun update_content ->
+  fun update_content focus_back ->
   let update_local_copy checking_time () =
     match Learnocaml_local_storage.(retrieve (exercise_state id)) with
     | { Answer.mtime; solution; _ } ->
@@ -739,16 +739,17 @@ let check_valid_editor_state id =
             if is_synchronized_with_server () then
               [
                 [%i "Fetch from server"],
-                (fun () -> Lwt.return (update_content solution));
+                (fun () -> Lwt.return (focus_back (); update_content solution));
                 [%i "Ignore & keep editing"],
-                (fun () -> Lwt.return_unit)
+                (fun () -> Lwt.return (focus_back ()));
               ]
             else
               [
                 [%i "Ignore & keep editing"],
-                (fun () -> Lwt.return_unit);
+                (fun () -> Lwt.return (focus_back ()));
                 [%i "Fetch from server & overwrite"],
-                (fun () -> Lwt.return (update_content solution));
+                (fun () ->
+                   Lwt.return (focus_back (); update_content solution));
               ]
          in
          lwt_alert ~title:"Question"
@@ -759,7 +760,7 @@ let check_valid_editor_state id =
     | exception Not_found -> Lwt.return ()
   in
   let now = Unix.gettimeofday () in
-  if now -. !last_changed > 30. then (
+  if now -. !last_changed > 180. then (
     let checking_time = !last_changed in
     last_changed := now;
     Lwt.async (update_local_copy checking_time)
@@ -771,7 +772,7 @@ let ace_display tab =
     let answer =
       Ocaml_mode.create_ocaml_editor
         (Tyxml_js.To_dom.of_div tab)
-        ignore
+        (fun _ _ -> ())
     in
     let ace = Ocaml_mode.get_editor answer in
     Ace.set_font_size ace 16;