Clean up json printing.

Author: cristianoc

src/EmitJson.ml

@@ -7,19 +7,18 @@ let finish () = Format.fprintf Format.std_formatter "\n]\n"
 let emitClose () =
   Format.fprintf Format.std_formatter (if !items = 0 then "\n}" else "\n}")
 
-let emitItem ~isFirst ~isClosing ~name ~kind ~file ~range ~message =
+let emitItem ~name ~kind ~file ~range ~message =
   let open Format in
   items := !items + 1;
   let ppf = std_formatter in
   let startLine, startCharacter, endLine, endCharacter = range in
-  fprintf ppf "%s{\n" (if isFirst then "\n" else ",\n");
+  fprintf ppf "%s{\n" (if !items = 1 then "\n" else ",\n");
   fprintf ppf "  \"name\": \"%s\",@." name;
   fprintf ppf "  \"kind\": \"%s\",@." kind;
   fprintf ppf "  \"file\": \"%s\",@." file;
   fprintf ppf "  \"range\": [%d,%d,%d,%d],@." startLine startCharacter endLine
     endCharacter;
-  fprintf ppf "  \"message\": \"%s\"" message;
-  if isClosing then emitClose ()
+  fprintf ppf "  \"message\": \"%s\"" message
 
 let emitAnnotate ~line ~character ~text =
   Format.fprintf Format.std_formatter

src/Log_.ml

@@ -145,21 +145,21 @@ let first = ref true
 let logKind ~count ~kind ~(loc : CL.Location.t) ~name ~notFinished body =
   if Suppress.filter loc.loc_start then (
     let open Format in
-    let isFirst = !first in
     first := false;
     if count then Stats.count name;
-    if !Common.Cli.json then
-      let kind = match kind with Warning -> "warning" | Error -> "error" in
+    if !Common.Cli.json then (
       let file = Json.escape loc.loc_start.pos_fname in
       let startLine = loc.loc_start.pos_lnum - 1 in
       let startCharacter = loc.loc_start.pos_cnum - loc.loc_start.pos_bol in
       let endLine = loc.loc_end.pos_lnum - 1 in
       let endCharacter = loc.loc_end.pos_cnum - loc.loc_start.pos_bol in
       let message = Json.escape (asprintf "%a" body ()) in
-      EmitJson.emitItem ~isFirst ~isClosing:(notFinished = false) ~name ~kind
+      EmitJson.emitItem ~name
+        ~kind:(match kind with Warning -> "warning" | Error -> "error")
         ~file
         ~range:(startLine, startCharacter, endLine, endCharacter)
-        ~message
+        ~message;
+      if notFinished = false then EmitJson.emitClose ())
     else
       let color =
         match kind with Warning -> Color.info | Error -> Color.error