use ocp-indent api for Partial_ast.indent

dune-project

@@ -55,7 +55,7 @@
    (>= 20200624))
   (menhirSdk
    (>= 20200624))
-  (ocp-indent :with-test)
+  ocp-indent
   (bisect_ppx
    (and
     :with-test
@@ -100,7 +100,7 @@
    (>= 20200624))
   (menhirSdk
    (>= 20200624))
-  (ocp-indent :with-test)
+  ocp-indent
   (bisect_ppx
    (and
     :with-test

lib/Indent.ml

@@ -112,26 +112,16 @@ module Valid_ast = struct
 end
 
 module Partial_ast = struct
-  let indent_line ?prev ~i ~line nlines =
-    if i = nlines + 1 then 0
-    else
-      let indent = String.(length line - length (lstrip line)) in
-      match prev with
-      | Some (prev_indent, prev_line) -> (
-        match last_token prev_line with
-        | Some last_tok -> (
-            let first_tok = first_token prev_line in
-            match Source.indent_after_token last_tok with
-            | Some i -> prev_indent + i
-            | None -> (
-                let tok = first_token line in
-                match
-                  Source.indent_before_token ~start_prev_line:first_tok tok
-                with
-                | Some i -> max 0 (prev_indent + i)
-                | None -> indent ) )
-        | None -> indent )
-      | _ -> indent
-
-  let indent_range ~lines ~range = indent_aux ~lines ~range ~indent_line
+  let indent_range ~source ~range:(low, high) =
+    let config, _, _ = IndentConfig.local_default () in
+    let output : _ IndentPrinter.output =
+      { debug= false
+      ; config
+      ; in_lines= (fun i -> low <= i && i <= high)
+      ; adaptive= true
+      ; indent_empty= false
+      ; kind= Numeric (fun i acc -> i :: acc) }
+    in
+    let stream = Nstream.of_string source in
+    List.rev @@ IndentPrinter.proceed output stream IndentBlock.empty []
 end

lib/Indent.mli

@@ -20,7 +20,5 @@ module Valid_ast : sig
 end
 
 module Partial_ast : sig
-  val indent_line : ?prev:int * string -> i:int -> line:string -> int -> int
-
-  val indent_range : lines:string list -> range:int * int -> int list
+  val indent_range : source:string -> range:int * int -> int list
 end

lib/Translation_unit.ml

@@ -433,7 +433,7 @@ let numeric (type a b) (fg0 : a list Ast_passes.Ast0.t)
   check_range nlines range
   >>| fun () ->
   Ocaml_common.Location.input_name := input_name ;
-  let fallback () = Indent.Partial_ast.indent_range ~lines ~range in
+  let fallback () = Indent.Partial_ast.indent_range ~source ~range in
   let indent_parsed ({ast= parsed_ast; source= parsed_source; _} as parsed)
       source range =
     match

lib/dune

@@ -14,20 +14,21 @@
 (library
  (name ocamlformat_lib)
  (flags
-  (:standard -open Base -open Import -open Compat))
+  (:standard -open Base -open Import -open Ocamlformat_compat.Compat))
  (instrumentation
   (backend bisect_ppx))
  (libraries
   format_
   import
   ocaml-version
+  ocp-indent.lib
   odoc.model
   odoc.parser
   parse_wyc
   re
   uuseg
   uuseg.string
   token_latest
-  compat
+  ocamlformat_compat
   dune-build-info
   ppxlib))

ocamlformat-rpc.opam

@@ -23,7 +23,7 @@ depends: [
   "menhir" {>= "20180528"}
   "menhirLib" {>= "20200624"}
   "menhirSdk" {>= "20200624"}
-  "ocp-indent" {with-test}
+  "ocp-indent"
   "bisect_ppx" {with-test & >= "2.5.0"}
   "odoc" {>= "1.4.2"}
   "ppxlib" {>= "0.22.0"}

ocamlformat.opam

@@ -22,7 +22,7 @@ depends: [
   "menhir" {>= "20180528"}
   "menhirLib" {>= "20200624"}
   "menhirSdk" {>= "20200624"}
-  "ocp-indent" {with-test}
+  "ocp-indent"
   "bisect_ppx" {with-test & >= "2.5.0"}
   "odoc" {>= "1.4.2"}
   "ppxlib" {>= "0.22.0"}

test/passing/dune.inc

@@ -1947,7 +1947,7 @@
  (deps .ocamlformat )
  (action
    (with-outputs-to partial.ml.output
-     (run %{bin:ocamlformat} --numeric=1-14 %{dep:partial.ml}))))
+     (run %{bin:ocamlformat} --numeric=2-14 %{dep:partial.ml}))))
 
 (rule
  (alias runtest)

test/passing/format_invalid_files_with_locations.ml.ref

@@ -4,8 +4,8 @@
 0
 0
 0
+21
+21
 0
-0
-0
-0
-0
+21
+21

test/passing/partial.ml.opts

@@ -1 +1 @@
---numeric=1-14
+--numeric=2-14

test/passing/partial.ml.ref

@@ -1,4 +1,3 @@
-3
 5
 5
 5

test/unit/test_indent.ml

@@ -1,81 +1,16 @@
-open Base
 open Ocamlformat_lib
 
 module Partial_ast = struct
-  let get_indent line = String.(length line - length (lstrip line))
-
-  let get_inputs input =
-    let lines = String.split_lines input in
-    let nb_lines = List.length lines in
-    match List.last lines with
-    | Some last -> (Some (get_indent last, last), nb_lines, "", nb_lines)
-    | None -> (None, 0, "", nb_lines)
-
-  let prepare_output input indent =
-    let spaces = String.make indent ' ' in
-    input ^ "\n" ^ spaces ^ "^"
-
-  let tests_indent_line =
-    let test name ~input ~expected =
-      let test_name = "Partial_ast.indent_line: " ^ name in
-      ( test_name
-      , `Quick
-      , fun () ->
-          let prev, i, line, nb_lines = get_inputs input in
-          let indent =
-            Indent.Partial_ast.indent_line ?prev ~i ~line nb_lines
-          in
-          let output = prepare_output input indent in
-          Alcotest.(check string) test_name expected output )
-    in
-    [ test "empty" ~input:{||} ~expected:{|
-^|}
-    ; test "after if" ~input:{|
-if|} ~expected:{|
-if
-  ^|}
-    ; test "after then" ~input:{|
-let foo () =
-  if bar then|}
-        ~expected:{|
-let foo () =
-  if bar then
-    ^|}
-    ; test "after module struct" ~input:{|
-module M = struct|}
-        ~expected:{|
-module M = struct
-  ^|}
-    ; test "after module sig" ~input:{|
-module M : sig|}
-        ~expected:{|
-module M : sig
-  ^|}
-    ; test "after =" ~input:{|
-let x =
-  let y =|}
-        ~expected:{|
-let x =
-  let y =
-    ^|}
-    ; test "after = but over indented"
-        ~input:{|
-let x =
-      let y =|}
-        ~expected:{|
-let x =
-      let y =
-        ^|} ]
-
   let tests_indent_range =
-    let test name ~input ~range ~expected =
+    let test name ~input:source ~range ~expected =
       let test_name = "Partial_ast.indent_range: " ^ name in
       ( test_name
       , `Quick
       , fun () ->
-          let lines = String.split_lines input in
-          let indent = Indent.Partial_ast.indent_range ~lines ~range in
-          let output = Test_translation_unit.reindent ~lines ~range indent in
+          let indent = Indent.Partial_ast.indent_range ~source ~range in
+          let output =
+            Test_translation_unit.reindent ~source ~range indent
+          in
           Alcotest.(check string) test_name expected output )
     in
     [ test "empty" ~input:"" ~range:(1, 1) ~expected:""
@@ -115,9 +50,9 @@ in
       fooooooo
     in
     foooooooooooooooooooooooooo
-        foooooooooooooooooooo foooooooooooooooo fooooooooo
-      in|}
-    ; test "partial let" ~range:(1, 14)
+      foooooooooooooooooooo foooooooooooooooo fooooooooo
+  in|}
+    ; test "partial let" ~range:(2, 14)
         ~input:
           {|   let () =
  ffff;
@@ -151,7 +86,7 @@ quot, rem
        quot, rem|}
     ]
 
-  let tests = tests_indent_line @ tests_indent_range
+  let tests = tests_indent_range
 end
 
 let tests = Partial_ast.tests

test/unit/test_translation_unit.ml

@@ -115,7 +115,8 @@ let test_parse_and_format_expression =
   [ make_test "List.map" ~input:"List.map (fun x->\nx*x) [(1 + 9); 2;3] "
       ~expected:(Ok "List.map (fun x -> x * x) [ 1 + 9; 2; 3 ]\n") ]
 
-let reindent ~lines ~range:(low, high) indents =
+let reindent ~source ~range:(low, high) indents =
+  let lines = String.split_lines source in
   let low = low - 1 and high = high - 1 in
   String.concat ~sep:"\n"
   @@ List.mapi lines ~f:(fun i line ->
@@ -139,10 +140,9 @@ let test_numeric =
     , fun () ->
         let opts = Conf.{debug= false; margin_check= false} in
         let got =
-          let lines = String.split_lines source in
           Translation_unit.numeric Use_file ~input_name:"_" ~source ~range
             Conf.default_profile opts
-          |> Result.map ~f:(reindent ~lines ~range)
+          |> Result.map ~f:(reindent ~source ~range)
         in
         Alcotest.check Alcotest.(result string errmsg) test_name expected got
     )
@@ -286,7 +286,7 @@ foooooo|}
       in
       list_fl grps fmt_grp|}
       )
-  ; make_test "partial let" ~range:(1, 14)
+  ; make_test "partial let" ~range:(2, 14)
       ~source:
         {|   let () =
  ffff;
@@ -336,6 +336,9 @@ let read_file f = Stdio.In_channel.with_file f ~f:Stdio.In_channel.input_all
 let test_numeric_file =
   let fmt_ast_source = read_file "../../lib/Fmt_ast.ml" in
   let partial_source = read_file "../passing/partial.ml" in
+  let inv_with_loc_source =
+    read_file "../passing/format_invalid_files_with_locations.ml"
+  in
   let make_test name ~source ~range ~expected =
     let test_name = "numeric (file): " ^ name in
     ( test_name
@@ -355,7 +358,15 @@ let test_numeric_file =
   ; make_test "fmt_ast.ml (111)" ~source:fmt_ast_source ~range:(111, 111)
       ~expected:(Ok [6])
   ; make_test "partial.ml (1-14)" ~source:partial_source ~range:(1, 14)
-      ~expected:(Ok [3; 5; 5; 5; 5; 7; 9; 9; 9; 7; 7; 7; 0; 7]) ]
+      ~expected:(Ok [0; 2; 2; 2; 2; 4; 6; 6; 6; 4; 4; 4; 0; 4])
+  ; make_test "partial.ml (2-14)" ~source:partial_source ~range:(2, 14)
+      ~expected:(Ok [5; 5; 5; 5; 7; 9; 9; 9; 7; 7; 7; 0; 7])
+  ; make_test "format_invalid_files_with_locations.ml (7-11)" ~range:(7, 11)
+      ~source:inv_with_loc_source
+      ~expected:(Ok [21; 21; 0; 21; 21])
+  ; make_test "format_invalid_files_with_locations.ml (10-11)"
+      ~range:(10, 11) ~source:inv_with_loc_source
+      ~expected:(Ok [0; 0]) ]
 
 let tests =
   List.concat

test/unit/test_translation_unit.mli

@@ -1,3 +1,3 @@
 val tests : unit Alcotest.test_case list
 
-val reindent : lines:string list -> range:int * int -> int list -> string
+val reindent : source:string -> range:int * int -> int list -> string

vendor/compat/dune

@@ -7,6 +7,6 @@
   (run ./gen/gen.exe)))
 
 (library
- (name compat)
+ (name ocamlformat_compat)
  (package ocamlformat)
  (libraries base compiler-libs.common))