2 newlines at the end of terminal report for now (rescript-lang#93)

2 newlines turn into 1 inside bsb. Not sure why. Format is temporary, so
this'll do until we remove it completely.

Author: chenglou

syntax/src/napkin_diagnostics.ml

@@ -136,14 +136,12 @@ let explain t =
     end
 
 let toString t src =
-  let ppf = Format.err_formatter in
   Napkin_diagnostics_printing_utils.Super_location.super_error_reporter
-    ppf
+    Format.err_formatter
     ~src
     ~startPos:t.startPos
     ~endPos:t.endPos
-    ~msg:(explain t);
-  Format.pp_print_flush ppf ()
+    ~msg:(explain t)
 
 let make ~startPos ~endPos category = {
   startPos;
@@ -152,7 +150,9 @@ let make ~startPos ~endPos category = {
 }
 
 let printReport diagnostics src =
-  List.rev diagnostics |> List.iter (fun d -> toString d src)
+  Format.fprintf Format.err_formatter "@[<v>";
+  List.rev diagnostics |> List.iter (fun d -> toString d src);
+  Format.fprintf Format.err_formatter "@]@."
 
 let unexpected token context =
   Unexpected {token; context}

syntax/src/napkin_diagnostics_printing_utils.ml

@@ -229,6 +229,6 @@ let print src startPos endPos ppf () =
 let super_error_reporter ppf ~src ~startPos ~endPos ~msg =
   setup_colors ();
   (* open a vertical box. Everything in our message is indented 2 spaces *)
-  Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]" (print src startPos endPos) () msg;
+  Format.fprintf ppf "@[<v 2>@,%a@,%s@]@," (print src startPos endPos) () msg;
 
 end

syntax/tests/parsing/errors/expressions/__snapshots__/parse.spec.js.snap

@@ -17,7 +17,7 @@ let x = ((let a = 1 in let b = 2 in fun pattern -> (\\"test\\" : int))
   1) (b): int => \\"hi\\"
   2) (b: int) => \\"hi\\"
 
-  
+
   Syntax error!
   parsing/errors/expressions/ambiguousArrow.js 6:3-23  
   4 │   let a = 1
@@ -30,7 +30,8 @@ let x = ((let a = 1 in let b = 2 in fun pattern -> (\\"test\\" : int))
   1) (pattern): int => \\"test\\"
   2) (pattern: int) => \\"test\\"
 
-  
+
+
 ========================================================"
 `;
 
@@ -46,7 +47,8 @@ let xs = x.map (fun key -> [|key;(predicates.(key))|])
   3 │ 
   
   Did you forget a \`]\` here? 
-  
+
+
 ========================================================"
 `;
 
@@ -64,7 +66,8 @@ exports[`arrow.js 1`] = `
   3 │   let b = 2
   
   Did you forget a \`,\` here? 
-  
+
+
 ========================================================"
 `;
 
@@ -104,7 +107,7 @@ let pipeline =
   17 │ let x = {
   
   Did you forget a \`)\` here? 
-  
+
   Syntax error!
   parsing/errors/expressions/block.js 18:25-19:1  
   16 │ 
@@ -115,7 +118,7 @@ let pipeline =
   21 │ switch stack {
   
   Did you forget a \`)\` here? 
-  
+
   Syntax error!
   parsing/errors/expressions/block.js 22:11-23:1  
   20 │ 
@@ -126,7 +129,7 @@ let pipeline =
   25 │ 	buffer->Buffer.add_string(indentation)
   
   Looks like there might be an expression missing here
-  
+
   Syntax error!
   parsing/errors/expressions/block.js 26:7-27:1  
   24 │ | Join(doc1, doc2) =>
@@ -137,7 +140,7 @@ let pipeline =
   29 │ let pipeline = switch scheduler {
   
   Did you forget a \`)\` here? 
-  
+
   Syntax error!
   parsing/errors/expressions/block.js 30:10-31:1  
   28 │ 
@@ -148,7 +151,8 @@ let pipeline =
   33 │ 
   
   Looks like there might be an expression missing here
-  
+
+
 ========================================================"
 `;
 
@@ -168,7 +172,7 @@ let () = ((let open Foo in let exception End  in x ())[@ns.braces ])
   3 │ let f = (g, h) => {
   
   consecutive statements on a line must be separated by ';' or a newline
-  
+
   Syntax error!
   parsing/errors/expressions/consecutive.res 4:7  
   2 │ 
@@ -178,7 +182,7 @@ let () = ((let open Foo in let exception End  in x ())[@ns.braces ])
   6 │ 
   
   consecutive expressions on a line must be separated by ';' or a newline
-  
+
   Syntax error!
   parsing/errors/expressions/consecutive.res 8:16-27  
    6 │ 
@@ -188,7 +192,7 @@ let () = ((let open Foo in let exception End  in x ())[@ns.braces ])
   10 │ 
   
   consecutive expressions on a line must be separated by ';' or a newline
-  
+
   Syntax error!
   parsing/errors/expressions/consecutive.res 12:11-20  
   10 │ 
@@ -198,7 +202,8 @@ let () = ((let open Foo in let exception End  in x ())[@ns.braces ])
   14 │ }
   
   consecutive expressions on a line must be separated by ';' or a newline
-  
+
+
 ========================================================"
 `;
 
@@ -215,7 +220,7 @@ let f a b = ((())[@ns.braces ])
   3 │ let f = (a, b) => {}
   
   This let-binding misses an expression
-  
+
   Syntax error!
   parsing/errors/expressions/emptyBlock.js 3:20  
   1 │ let x = {}
@@ -224,7 +229,8 @@ let f a b = ((())[@ns.braces ])
   4 │ 
   
   Missing expression
-  
+
+
 ========================================================"
 `;
 
@@ -242,7 +248,8 @@ exports[`if.js 1`] = `
   5 │ }
   
   Did you forget a \`{\` here? 
-  
+
+
 ========================================================"
 `;
 
@@ -272,7 +279,7 @@ switch result {
 | _ => ()
 }
 
-  
+
   Syntax error!
   parsing/errors/expressions/ifLet.res 7:8-11:1  
    5 │ if let Error(x) = result {
@@ -291,7 +298,8 @@ switch result {
 | _ => ()
 }
 
-  
+
+
 ========================================================"
 `;
 
@@ -306,7 +314,8 @@ let x = ([%napkinscript.exprhole ]) + 1
   2 │ 
   
   \`_\` isn't a valid name.
-  
+
+
 ========================================================"
 `;
 
@@ -326,7 +335,7 @@ let record = { field = ([%napkinscript.exprhole ]) }
   5 │ 
   
   Did you forget a \`,\` here? 
-  
+
   Syntax error!
   parsing/errors/expressions/record.js 8:10-18  
    6 │ 
@@ -336,7 +345,7 @@ let record = { field = ([%napkinscript.exprhole ]) }
   10 │ }
   
   Did you forget a \`:\` here? 
-  
+
   Syntax error!
   parsing/errors/expressions/record.js 13:9-17:0  
   11 │ 
@@ -348,7 +357,8 @@ let record = { field = ([%napkinscript.exprhole ]) }
   17 │ 
   
   Missing expression
-  
+
+
 ========================================================"
 `;
 
@@ -370,7 +380,8 @@ exports[`setField.js 1`] = `
   7 │ }
   
   It seems that this record field mutation misses an expression
-  
+
+
 ========================================================"
 `;
 
@@ -385,7 +396,8 @@ exports[`taggedTemplateLiterals.js 1`] = `
   2 │ 
   
   Tagged template literals are currently restricted to identifiers like: json\`null\`.
-  
+
+
 ========================================================"
 `;
 
@@ -402,7 +414,8 @@ let parsedPayload = try Js.Json.parseExn response with | _ -> Js.Json.null
   4 ┆   }
   
   Did you forget a \`catch\` here? 
-  
+
+
 ========================================================"
 `;
 
@@ -423,7 +436,7 @@ let x = (\\"hi\\" : string)
   Expressions with type constraints need to be wrapped in parens:
   (a + b: int)
 
-  
+
   Syntax error!
   parsing/errors/expressions/unexpectedConstraint.js 7:9-20  
   5 │ }
@@ -434,6 +447,7 @@ let x = (\\"hi\\" : string)
   Expressions with type constraints need to be wrapped in parens:
   (\\"hi\\": string)
 
-  
+
+
 ========================================================"
 `;

syntax/tests/parsing/errors/other/__snapshots__/parse.spec.js.snap

@@ -12,7 +12,8 @@ exports[`patternMatching.js 1`] = `
   3 │ 
   
   Pattern matching needs at least one case
-  
+
+
 ========================================================"
 `;
 
@@ -33,7 +34,7 @@ let x::y = myList
   3 │ 
   
   Arrays can't use the \`...\` spread currently. Please use \`concat\` or other Array helpers.
-  
+
   Syntax error!
   parsing/errors/other/spread.js 2:6-8  
   1 │ let arr = [...x, ...y]
@@ -44,7 +45,7 @@ let x::y = myList
   Array's \`...\` spread is not supported in pattern matches.
 Explanation: such spread would create a subarray; out of performance concern, our pattern matching currently guarantees to never create new intermediate data.
 Solution: if it's to validate the first few elements, use a \`when\` clause + Array size check + \`get\` checks on the current pattern. If it's to obtain a subarray, use \`Array.sub\` or \`Belt.Array.slice\`.
-  
+
   Syntax error!
   parsing/errors/other/spread.js 4:21-23  
   2 │ let [...arr, _] = [1, 2, 3]
@@ -55,7 +56,7 @@ Solution: if it's to validate the first few elements, use a \`when\` clause + Ar
   
   Records can only have one \`...\` spread, at the beginning.
 Explanation: since records have a known, fixed shape, a spread like \`{a, ...b}\` wouldn't make sense, as \`b\` would override every field of \`a\` anyway.
-  
+
   Syntax error!
   parsing/errors/other/spread.js 5:15-18  
   3 │ 
@@ -67,7 +68,7 @@ Explanation: since records have a known, fixed shape, a spread like \`{a, ...b}\
   Record's \`...\` spread is not supported in pattern matches.
 Explanation: you can't collect a subset of a record's field into its own record, since a record needs an explicit declaration and that subset wouldn't have one.
 Solution: you need to pull out each field you want explicitly.
-  
+
   Syntax error!
   parsing/errors/other/spread.js 8:13-22  
   6 │ 
@@ -77,6 +78,7 @@ Solution: you need to pull out each field you want explicitly.
   
   List pattern matches only supports one \`...\` spread, at the end.
 Explanation: a list spread at the tail is efficient, but a spread in the middle would create new list[s]; out of performance concern, our pattern matching currently guarantees to never create new intermediate data.
-  
+
+
 ========================================================"
 `;

syntax/tests/parsing/errors/pattern/__snapshots__/parse.spec.js.snap

@@ -14,7 +14,7 @@ let 4 = for [%napkinscript.patternhole ] = 0 to 10 do Js.log \\"for\\" done
   3 │ 
   
   I was expecting a name for this let-binding. Example: \`let message = \\"hello\\"\`
-  
+
   Syntax error!
   parsing/errors/pattern/missing.res 2:5  
   1 │ let = 2
@@ -23,7 +23,7 @@ let 4 = for [%napkinscript.patternhole ] = 0 to 10 do Js.log \\"for\\" done
   4 │ for in 0 to 10 {
   
   I was expecting a name for this let-binding. Example: \`let message = \\"hello\\"\`
-  
+
   Syntax error!
   parsing/errors/pattern/missing.res 4:5-6  
   2 │ let = 4
@@ -33,7 +33,7 @@ let 4 = for [%napkinscript.patternhole ] = 0 to 10 do Js.log \\"for\\" done
   6 │ }
   
   A for-loop has the following form: \`for i in 0 to 10\`. Did you forget to supply a name before \`in\`?
-  
+
   Syntax error!
   parsing/errors/pattern/missing.res 9:3-4  
    7 │ 
@@ -43,6 +43,7 @@ let 4 = for [%napkinscript.patternhole ] = 0 to 10 do Js.log \\"for\\" done
   11 │ 
   
   I was expecting a pattern to match on before the \`=>\`
-  
+
+
 ========================================================"
 `;