format

Author: cristianoc

Makefile

@@ -9,6 +9,12 @@ clean:
 test:
 	make -C analysis test
 
+format:
+	make -C analysis format
+
+checkformat:
+	make -C analysis checkformat
+
 .DEFAULT_GOAL := build
 
 .PHONY: build clean test

analysis/Makefile

@@ -33,6 +33,12 @@ clean:
 	make -C tests clean
 	make -C reanalyze clean
 
+format:
+	dune build @fmt --auto-promote
+
+checkformat:
+	dune build @fmt
+
 .DEFAULT_GOAL := build
 
 .PHONY: build-analysis-binary build-reanalyze build-tests dce clean format test

analysis/reanalyze/src/EmitJson.ml

@@ -1,6 +1,6 @@
 let items = ref 0
 let start () = Printf.printf "["
-let finish ()= Printf.printf "\n]\n"
+let finish () = Printf.printf "\n]\n"
 let emitClose () = "\n}"
 
 let emitItem ~ppf ~name ~kind ~file ~range ~message =

analysis/reanalyze/src/Exception.ml

@@ -249,10 +249,7 @@ let traverseAst () =
            case.c_guard |> iterExprOpt self;
            case.c_rhs |> iterExpr self)
   in
-  let isRaise s =
-    s = "Pervasives.raise"
-    || s = "Pervasives.raise_notrace"
-  in
+  let isRaise s = s = "Pervasives.raise" || s = "Pervasives.raise_notrace" in
   let raiseArgs args =
     match args with
     | [(_, Some {Typedtree.exp_desc = Texp_construct ({txt}, _, _)})] ->

analysis/src/Cli.ml

@@ -93,8 +93,7 @@ let main () =
     Commands.codeAction ~path
       ~pos:(int_of_string line, int_of_string col)
       ~currentFile ~debug:false
-  | [_; "diagnosticSyntax"; path;] -> 
-    Commands.diagnosticSyntax ~path
+  | [_; "diagnosticSyntax"; path] -> Commands.diagnosticSyntax ~path
   | _ :: "reanalyze" :: _ ->
     let len = Array.length Sys.argv in
     for i = 1 to len - 2 do

analysis/src/Commands.ml

@@ -258,8 +258,7 @@ let format ~path =
   else ""
 
 let diagnosticSyntax ~path =
-  print_endline
-    (Diagnostics.document_syntax ~path |> Protocol.array)
+  print_endline (Diagnostics.document_syntax ~path |> Protocol.array)
 
 let test ~path =
   Uri.stripPath := true;

analysis/src/Diagnostics.ml

@@ -30,4 +30,4 @@ let document_syntax ~path =
       Res_driver.parsingEngine.parseInterface ~forPrinter:false ~filename:path
     in
     get_diagnostics parseInterface.diagnostics
-  else []
+  else []

analysis/src/Protocol.ml

@@ -10,16 +10,12 @@ type completionItem = {
   documentation: markupContent option;
 }
 
-type location = {uri : string; range : range}
-type documentSymbolItem = {name : string; kind : int; location : location}
-type renameFile = {oldUri : string; newUri : string}
-type textEdit = {range : range; newText : string}
-
-type diagnostic = {
-  range : range;
-  message : string;
-  severity : int;
-}
+type location = {uri: string; range: range}
+type documentSymbolItem = {name: string; kind: int; location: location}
+type renameFile = {oldUri: string; newUri: string}
+type textEdit = {range: range; newText: string}
+
+type diagnostic = {range: range; message: string; severity: int}
 
 type optionalVersionedTextDocumentIdentifier = {
   version: int option;
@@ -134,11 +130,11 @@ let stringifyCodeAction ca =
 
 (* https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnostic *)
 let stringifyDiagnostic d =
-  Printf.sprintf {|{
+  Printf.sprintf
+    {|{
   "range": %s,
   "message": "%s",
   "severity": %d,
   "source": "ReScript"
 }|}
-    (stringifyRange d.range) (Json.escape d.message)
-    d.severity
+    (stringifyRange d.range) (Json.escape d.message) d.severity