Merge 88a0789 into b47bd73

lsp/src/string_zipper.ml

@@ -183,8 +183,9 @@ let rec prev_newline t =
           })
 
 let beginning_of_line t =
+  let line = t.line in
   let t = prev_newline t in
-  if is_begin t then t else advance_char t
+  if is_begin t && t.line = line then t else advance_char t
 
 let rec goto_line_backward t = function
   | 0 -> beginning_of_line t
@@ -292,7 +293,7 @@ let drop_until from until =
       | [] -> empty
       | current :: left ->
         let rel_pos = Substring.length current in
-        let abs_pos = from.rel_pos + rel_pos in
+        let abs_pos = from.abs_pos + rel_pos in
         { from with right; left; current; rel_pos; abs_pos })
 
 let add_buffer_between b start stop =

lsp/test/text_document_tests.ml

@@ -240,3 +240,24 @@ let%expect_test "absolute_position" =
   [%expect {| position: 7/13 |}];
   test (100, 0);
   [%expect {| position: 13/13 |}]
+
+let%expect_test "replace second line first line is \\n" =
+  let range = tuple_range (1, 2) (1, 2) in
+  let doc = make_document (Uri.of_path "foo.ml") ~text:"\nfoo\nbar\nbaz\n" in
+  let edit = TextEdit.create ~newText:"change" ~range in
+  let new_doc = Text_document.apply_text_document_edits doc [ edit ] in
+  new_doc |> Text_document.text |> String.escaped |> print_endline;
+  [%expect {|
+    \nfochangeo\nbar\nbaz\n |}]
+
+let%expect_test "get position after change" =
+  let range = tuple_range (1, 2) (1, 2) in
+  let doc = make_document (Uri.of_path "foo.ml") ~text:"\nfoo\nbar\nbaz\n" in
+  let edit = TextDocumentContentChangeEvent.create ~text:"change" ~range () in
+  let new_doc = Text_document.apply_content_changes doc [ edit ] in
+  let pos = Text_document.absolute_position new_doc range.start in
+  new_doc |> Text_document.text |> String.escaped |> print_endline;
+  printf "pos: %d\n" pos;
+  [%expect {|
+    \nfochangeo\nbar\nbaz\n
+    pos: 22 |}]

ocaml-lsp-server/test/e2e-new/action_mark_remove.ml

@@ -47,7 +47,11 @@ let%expect_test "mark value in top level let" =
 let $f$ =
   let x = 1 in
   0
-|}
+|};
+  [%expect {|
+    let _f =
+      let x = 1 in
+      0 |}]
 
 let%expect_test "mark value in match" =
   mark_test `Value {|