Fixing highlights when there is a non invalidating edit WIP

Author: rtetley

language-server/dm/documentManager.ml

@@ -311,13 +311,14 @@ let reset { uri; opts; init_vs; document; execution_state; observe_id } =
 
 let apply_text_edits state edits =
   let document = Document.apply_text_edits state.document edits in
-  let shift_diagnostics_locs exec_st (range, new_text) =
+  let shift_diagnostics_locs_and_overview exec_st (range, new_text) =
     let edit_start = RawDocument.loc_of_position (Document.raw_document state.document) range.Range.start in
     let edit_stop = RawDocument.loc_of_position (Document.raw_document state.document) range.Range.end_ in
     let edit_length = edit_stop - edit_start in
-    ExecutionManager.shift_diagnostics_locs exec_st ~start:edit_stop ~offset:(String.length new_text - edit_length)
+    let exec_st = ExecutionManager.shift_diagnostics_locs exec_st ~start:edit_stop ~offset:(String.length new_text - edit_length) in
+    ExecutionManager.shift_overview exec_st (Document.raw_document state.document) ~start:edit_stop ~offset:(String.length new_text - edit_length)
   in
-  let execution_state = List.fold_left shift_diagnostics_locs state.execution_state edits in
+  let execution_state = List.fold_left shift_diagnostics_locs_and_overview state.execution_state edits in
   validate_document { state with document; execution_state }
 
 let handle_event ev st =

language-server/dm/executionManager.ml

@@ -744,17 +744,15 @@ 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 raw_doc ~start ~offset =
-  let shift_loc loc =
-    let (loc_start, loc_stop) = Loc.unloc loc in
-    if loc_start >= start then Loc.shift_loc offset offset loc
-    else if loc_stop > start then Loc.shift_loc 0 offset loc
-    else loc
+  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)
+    else (loc_start, loc_end)
   in
   let shift_range range =
     let r_start = RawDocument.loc_of_position raw_doc range.Range.start in
     let r_stop = RawDocument.loc_of_position raw_doc range.Range.end_ in
-    let r_start' = shift_loc r_start in
-    let r_stop' = shift_loc r_stop in
+    let r_start', r_stop' = shift_loc r_start r_stop in
     Range.create ~start:(RawDocument.position_of_loc raw_doc r_start') ~end_:(RawDocument.position_of_loc raw_doc r_stop')
   in
   let processed = CList.Smart.map shift_range st.overview.processed in

language-server/dm/executionManager.mli

@@ -54,6 +54,7 @@ val feedback :  state -> sentence_id -> feedback_message list
 val all_errors : state -> (sentence_id * (Loc.t option * Pp.t)) list
 val all_feedback : state -> (sentence_id * feedback_message) list
 
+val shift_overview : state -> RawDocument.t -> start:int -> offset:int -> state
 val shift_diagnostics_locs : state -> start:int -> offset:int -> state
 val executed_ids : state -> sentence_id list
 val is_executed : state -> sentence_id -> bool