Analysis: use default print width instead of taking it from syntax cli

Author: cknitt

analysis/src/Commands.ml

@@ -283,16 +283,16 @@ let format ~path =
     in
     if List.length diagnostics > 0 then ""
     else
-      Res_printer.print_implementation ~width:!Res_cli.ResClflags.width
-        ~comments structure
+      Res_printer.print_implementation
+        ~width:Res_multi_printer.default_print_width ~comments structure
   else if Filename.check_suffix path ".resi" then
     let {Res_driver.parsetree = signature; comments; diagnostics} =
       Res_driver.parsing_engine.parse_interface ~for_printer:true ~filename:path
     in
     if List.length diagnostics > 0 then ""
     else
-      Res_printer.print_interface ~width:!Res_cli.ResClflags.width ~comments
-        signature
+      Res_printer.print_interface ~width:Res_multi_printer.default_print_width
+        ~comments signature
   else ""
 
 let diagnosticSyntax ~path =

analysis/src/CreateInterface.ml

@@ -148,7 +148,7 @@ let printSignature ~extractor ~signature =
   Printtyp.reset_names ();
   let sigItemToString (item : Outcometree.out_sig_item) =
     item |> Res_outcome_printer.print_out_sig_item_doc
-    |> Res_doc.to_string ~width:!Res_cli.ResClflags.width
+    |> Res_doc.to_string ~width:Res_multi_printer.default_print_width
   in
 
   let genSigStrForInlineAttr lines attributes id vd =

analysis/src/Xform.ml

@@ -862,21 +862,24 @@ let parseImplementation ~filename =
   let printExpr ~(range : Protocol.range) (expr : Parsetree.expression) =
     let structure = [Ast_helper.Str.eval ~loc:expr.pexp_loc expr] in
     structure
-    |> Res_printer.print_implementation ~width:!Res_cli.ResClflags.width
+    |> Res_printer.print_implementation
+         ~width:Res_multi_printer.default_print_width
          ~comments:(comments |> filterComments ~loc:expr.pexp_loc)
     |> Utils.indent range.start.character
   in
   let printStructureItem ~(range : Protocol.range)
       (item : Parsetree.structure_item) =
     let structure = [item] in
     structure
-    |> Res_printer.print_implementation ~width:!Res_cli.ResClflags.width
+    |> Res_printer.print_implementation
+         ~width:Res_multi_printer.default_print_width
          ~comments:(comments |> filterComments ~loc:item.pstr_loc)
     |> Utils.indent range.start.character
   in
   let printStandaloneStructure ~(loc : Location.t) structure =
     structure
-    |> Res_printer.print_implementation ~width:!Res_cli.ResClflags.width
+    |> Res_printer.print_implementation
+         ~width:Res_multi_printer.default_print_width
          ~comments:(comments |> filterComments ~loc)
   in
   (structure, printExpr, printStructureItem, printStandaloneStructure)
@@ -896,7 +899,7 @@ let parseInterface ~filename =
       (item : Parsetree.signature_item) =
     let signature_item = [item] in
     signature_item
-    |> Res_printer.print_interface ~width:!Res_cli.ResClflags.width
+    |> Res_printer.print_interface ~width:Res_multi_printer.default_print_width
          ~comments:(comments |> filterComments ~loc:item.psig_loc)
     |> Utils.indent range.start.character
   in

compiler/syntax/src/res_multi_printer.mli

@@ -1,3 +1,5 @@
+val default_print_width : int
+
 (* Interface to print source code to res.
  * Takes a filename called "input" and returns the corresponding formatted res syntax *)
 val print : ?ignore_parse_errors:bool -> string -> string [@@dead "+print"]