Cleanup

Author: rtetley

language-server/dm/document.ml

@@ -145,7 +145,7 @@ let compare_code_line x y =
 
 let code_lines_sorted_by_loc parsed =
   List.sort compare_code_line @@ List.concat [
-    (List.map (fun (_,x) -> Sentence x) @@ LM.bindings parsed.sentences_by_end) ;
+    (List.map (fun (_,x) -> Sentence x) @@ SM.bindings parsed.sentences_by_id) ;
     (List.map (fun (_,x) -> ParsingError x) @@ LM.bindings parsed.parsing_errors_by_end) ;
     []  (* todo comments *)
    ]
@@ -257,29 +257,19 @@ type diff =
 
 let same_tokens (s1 : sentence) (s2 : pre_sentence) =
     CList.equal Tok.equal s1.ast.tokens s2.ast.tokens
-
-let print_tokens (s1 : sentence ) (s2 : pre_sentence )=
-  log @@ Format.sprintf "%s vs %s" (string_of_parsed_ast s1.ast) (string_of_parsed_ast s2.ast)
 
-
-
 (* TODO improve diff strategy (insertions,etc) *)
 let rec diff old_sentences new_sentences =
   match old_sentences, new_sentences with
   | [], [] -> []
-  | [], new_sentences -> log "ADDED"; [Added new_sentences]
-  | old_sentences, [] -> log @@ "DELETED"; [Deleted (List.map (fun s -> s.id) old_sentences)]
+  | [], new_sentences -> [Added new_sentences]
+  | old_sentences, [] -> [Deleted (List.map (fun s -> s.id) old_sentences)]
     (* FIXME something special should be done when `Deleted` is applied to a parsing effect *)
   | old_sentence::old_sentences, new_sentence::new_sentences ->
-    if same_tokens old_sentence new_sentence then (
-      log @@ "EQUAL";
-      print_tokens old_sentence new_sentence;
-      Equal [(old_sentence.id,new_sentence)] :: diff old_sentences new_sentences)
-    else (
-      log @@ "DELETED 2";
-      print_tokens old_sentence new_sentence;
+    if same_tokens old_sentence new_sentence then 
+      Equal [(old_sentence.id,new_sentence)] :: diff old_sentences new_sentences
+    else 
       Deleted [old_sentence.id] :: Added [new_sentence] :: diff old_sentences new_sentences
-    )
 
 let string_of_diff_item doc = function
   | Deleted ids ->

language-server/dm/executionManager.ml

@@ -757,7 +757,6 @@ let all_feedback st =
   List.fold_left (fun acc (id, (_,l)) -> List.map (fun x -> (id, x)) l @ acc) [] @@ SM.bindings st.of_sentence
 
 let shift_overview st ~before ~after ~start ~offset =
-  log @@ "SHIFTING OVERVIEW";
   let shift_loc loc_start loc_end =
     if loc_start >= start then (loc_start + offset, loc_end + offset)
     else if loc_end > start then (loc_start, loc_end + offset)
@@ -773,12 +772,7 @@ let shift_overview st ~before ~after ~start ~offset =
   let processing = CList.Smart.map shift_range st.overview.processing in
   let prepared = CList.Smart.map shift_range st.overview.prepared in
   let overview = {processed; processing; prepared} in
-  log @@ "BEFORE";
-  print_exec_overview st;
-  let st = {st with overview} in
-  log @@ "AFTER";
-  print_exec_overview st;
-  st
+  {st with overview}
 
 let shift_diagnostics_locs st ~start ~offset =
   let shift_loc loc =

language-server/tests/common.ml

@@ -124,12 +124,12 @@ let task st id spec =
 
 
 let rec handle_events n (events : DocumentManager.event Sel.Todo.t) st =
-  if n <= 0 then (Stdlib.Format.eprintf "handle_events run out of steps:\nTodo = %a\n" (Sel.Todo.pp DocumentManager.pp_event) events; Caml.exit 1)
+  if n <= 0 then (Stdlib.Format.eprintf "handle_events run out of steps:\nTodo = %a\n" (Sel.Todo.pp DocumentManager.pp_event) events; Stdlib.exit 1)
   else if Sel.Todo.is_empty events then st
 
   else begin
     (*Stdlib.Format.eprintf "waiting %a\n%!" Sel.(pp_todo DocumentManager.pp_event) events;*)
-    Caml.flush_all ();
+    Stdlib.flush_all ();
     let (ready, remaining) = Sel.pop_timeout ~stop_after_being_idle_for:0.1 events in
     match ready with
     | None -> 
@@ -164,7 +164,7 @@ let check_diag st specl =
     (range, message, severity) in
   let match_diagnostic r s rex (range, message, severity) =
     Range.included ~in_:r range &&
-    Caml.(=) severity (Some s) &&
+    Stdlib.(=) severity (Some s) &&
     Str.string_match (Str.regexp rex) message 0
   in
   let diagnostics = DocumentManager.all_diagnostics st in