use printer version returning a string so we can do the JSON escaping in the analysis bin

Author: zth

analysis/src/Cli.ml

@@ -90,7 +90,8 @@ let main () =
   | [_; "createInterface"; path; cmiFile] ->
     Printf.printf "\"%s\""
       (Json.escape (CreateInterface.command ~path ~cmiFile))
-  | [_; "format"; path] -> Commands.format ~path
+  | [_; "format"; path] ->
+    Printf.printf "\"%s\"" (Json.escape (Commands.format ~path))
   | [_; "test"; path] -> Commands.test ~path
   | args when List.mem "-h" args || List.mem "--help" args -> prerr_endline help
   | _ ->

analysis/src/Commands.ml

@@ -256,14 +256,13 @@ let format ~path =
       Res_driver.parsingEngine.parseImplementation ~forPrinter:true
         ~filename:path
     in
-    Res_driver.printEngine.printImplementation !Res_cli.ResClflags.width path
-      comments structure
+    Res_printer.printImplementation !Res_cli.ResClflags.width structure comments
   else if Filename.check_suffix path ".resi" then
     let {Res_driver.parsetree = signature; comments} =
       Res_driver.parsingEngine.parseInterface ~forPrinter:true ~filename:path
     in
-    Res_driver.printEngine.printInterface !Res_cli.ResClflags.width path
-      comments signature
+    Res_printer.printInterface !Res_cli.ResClflags.width signature comments
+  else ""
 
 let test ~path =
   Uri2.stripPath := true;

server/src/utils.ts

@@ -121,7 +121,6 @@ export let formatUsingValidBscNativePath = (
       let result = runAnalysisAfterSanityCheck(
         formatTempFileFullPath,
         ["format", formatTempFileFullPath],
-        false,
         false
       );
 
@@ -144,8 +143,7 @@ export let formatUsingValidBscNativePath = (
 export let runAnalysisAfterSanityCheck = (
   filePath: p.DocumentUri,
   args: Array<any>,
-  projectRequired = false,
-  parseJson = true
+  projectRequired = false
 ) => {
   let binaryPath;
   if (fs.existsSync(c.analysisDevPath)) {
@@ -166,11 +164,7 @@ export let runAnalysisAfterSanityCheck = (
   };
   let stdout = childProcess.execFileSync(binaryPath, args, options);
 
-  if (parseJson) {
-    return JSON.parse(stdout.toString());
-  } else {
-    return stdout.toString();
-  }
+  return JSON.parse(stdout.toString());
 };
 
 export let runAnalysisCommand = (