Ocamlformat 0.27.0

Author: nojaf

.github/workflows/ci.yml

@@ -90,7 +90,7 @@ jobs:
         run: echo "DUNE_PROFILE=${{ matrix.dune-profile }}" >> $GITHUB_ENV
 
       - name: Install ocamlformat
-        run: opam install ocamlformat
+        run: opam install ocamlformat.0.27.0
 
       - name: Format check
         run: opam exec -- make checkformat

.ocamlformat

@@ -1,5 +1,5 @@
 profile = default
-version = 0.26.2
+version = 0.27.0
 
 field-space = tight-decl
 break-cases = toplevel

analysis/reanalyze/src/DeadCommon.ml

@@ -555,7 +555,8 @@ module Decl = struct
         let refIsBelow (pos : Lexing.position) =
           decl.pos.pos_fname <> pos.pos_fname
           || decl.pos.pos_cnum < pos.pos_cnum
-             && (* not a function defined inside a function, e.g. not a callback *)
+             &&
+             (* not a function defined inside a function, e.g. not a callback *)
              decl.posEnd.pos_cnum < pos.pos_cnum
         in
         refs |> PosSet.exists refIsBelow

analysis/reanalyze/src/Paths.ml

@@ -110,10 +110,8 @@ module Config = struct
       | None -> ())
 end
 
-(**
-  * Handle namespaces in cmt files.
-  * E.g. src/Module-Project.cmt becomes src/Module
-  *)
+(** * Handle namespaces in cmt files. * E.g. src/Module-Project.cmt becomes
+    src/Module *)
 let handleNamespace cmt =
   let cutAfterDash s =
     match String.index s '-' with

analysis/src/CreateInterface.ml

@@ -219,7 +219,9 @@ let printSignature ~extractor ~signature =
       :: rest
       when Ident.name makePropsId = Ident.name makeId ^ "Props"
            && ((* from implementation *) makePropsLoc.loc_ghost
-              || (* from interface *) makePropsLoc = makeValueDesc.val_loc)
+              ||
+              (* from interface *)
+              makePropsLoc = makeValueDesc.val_loc)
            && getComponentTypeV3 makeValueDesc.val_type <> None ->
       (*
         {"name": string} => retType  ~~>  (~name:string) => retType

analysis/src/Loc.ml

@@ -9,8 +9,9 @@ let toString (loc : t) =
 
 let hasPos ~pos loc = start loc <= pos && pos < end_ loc
 
-(** Allows the character after the end to be included. Ie when the cursor is at the 
-    end of the word, like `someIdentifier<cursor>`. Useful in some scenarios. *)
+(** Allows the character after the end to be included. Ie when the cursor is at
+    the end of the word, like `someIdentifier<cursor>`. Useful in some
+    scenarios. *)
 let hasPosInclusiveEnd ~pos loc = start loc <= pos && pos <= end_ loc
 
 let mkPosition (pos : Pos.t) =

analysis/src/References.ml

@@ -209,7 +209,8 @@ let definedForLoc ~file ~package locKind =
           maybeLog "Yes!! got it";
           Some res)))
 
-(** Find alternative declaration: from res in case of interface, or from resi in case of implementation  *)
+(** Find alternative declaration: from res in case of interface, or from resi in
+    case of implementation *)
 let alternateDeclared ~(file : File.t) ~package (declared : _ Declared.t) tip =
   match Hashtbl.find_opt package.pathsForModule file.moduleName with
   | None -> None

analysis/src/SharedTypes.ml

@@ -356,7 +356,8 @@ and completionType =
       fields: field list;
       definition:
         [ `NameOnly of string
-          (** When we only have the name, like when pulling the record from a declared type. *)
+          (** When we only have the name, like when pulling the record from a
+              declared type. *)
         | `TypeExpr of Types.type_expr
           (** When we have the full type expr from the compiler. *) ];
     }
@@ -573,7 +574,8 @@ module Completable = struct
   (** Additional context for nested completion where needed. *)
   type nestedContext =
     | RecordField of {seenFields: string list}
-        (** Completing for a record field, and we already saw the following fields... *)
+        (** Completing for a record field, and we already saw the following
+            fields... *)
     | CameFromRecordField of string
         (** We just came from this field (we leverage use this for better
             completion names etc) *)
@@ -656,11 +658,13 @@ module Completable = struct
     | CdecoratorPayload of decoratorPayload
     | CextensionNode of string  (** e.g. %todo *)
     | CnamedArg of contextPath * string * string list
-        (** e.g. (..., "label", ["l1", "l2"]) for ...(...~l1...~l2...~label...) *)
+        (** e.g. (..., "label", ["l1", "l2"]) for ...(...~l1...~l2...~label...)
+        *)
     | Cnone  (** e.g. don't complete inside strings *)
     | Cpath of contextPath
     | Cjsx of string list * string * string list
-        (** E.g. (["M", "Comp"], "id", ["id1", "id2"]) for <M.Comp id1=... id2=... ... id *)
+        (** E.g. (["M", "Comp"], "id", ["id1", "id2"]) for <M.Comp id1=...
+            id2=... ... id *)
     | Cexpression of {
         contextPath: contextPath;
         nested: nestedPath list;

analysis/src/SignatureHelp.ml

@@ -561,44 +561,44 @@ let signatureHelp ~path ~pos ~currentFile ~debug ~allowForConstructorPayloads =
                 let offset = ref 0 in
                 Some
                   (`InlineRecord
-                    (fields
-                    |> List.map (fun (field : field) ->
-                           let startOffset = !offset in
-                           let argText =
-                             Printf.sprintf "%s%s: %s" field.fname.txt
-                               (if field.optional then "?" else "")
-                               (Shared.typeToString
-                                  (if field.optional then
-                                     Utils.unwrapIfOption field.typ
-                                   else field.typ))
-                           in
-                           let endOffset =
-                             startOffset + String.length argText
-                           in
-                           offset := endOffset + String.length ", ";
-                           (argText, field, (startOffset, endOffset)))))
+                     (fields
+                     |> List.map (fun (field : field) ->
+                            let startOffset = !offset in
+                            let argText =
+                              Printf.sprintf "%s%s: %s" field.fname.txt
+                                (if field.optional then "?" else "")
+                                (Shared.typeToString
+                                   (if field.optional then
+                                      Utils.unwrapIfOption field.typ
+                                    else field.typ))
+                            in
+                            let endOffset =
+                              startOffset + String.length argText
+                            in
+                            offset := endOffset + String.length ", ";
+                            (argText, field, (startOffset, endOffset)))))
               | Args [(typ, _)] ->
                 Some
                   (`SingleArg
-                    ( typ |> Shared.typeToString,
-                      docsForLabel ~file:full.file ~package:full.package
-                        ~supportsMarkdownLinks typ ))
+                     ( typ |> Shared.typeToString,
+                       docsForLabel ~file:full.file ~package:full.package
+                         ~supportsMarkdownLinks typ ))
               | Args args ->
                 let offset = ref 0 in
                 Some
                   (`TupleArg
-                    (args
-                    |> List.map (fun (typ, _) ->
-                           let startOffset = !offset in
-                           let argText = typ |> Shared.typeToString in
-                           let endOffset =
-                             startOffset + String.length argText
-                           in
-                           offset := endOffset + String.length ", ";
-                           ( argText,
-                             docsForLabel ~file:full.file ~package:full.package
-                               ~supportsMarkdownLinks typ,
-                             (startOffset, endOffset) ))))
+                     (args
+                     |> List.map (fun (typ, _) ->
+                            let startOffset = !offset in
+                            let argText = typ |> Shared.typeToString in
+                            let endOffset =
+                              startOffset + String.length argText
+                            in
+                            offset := endOffset + String.length ", ";
+                            ( argText,
+                              docsForLabel ~file:full.file ~package:full.package
+                                ~supportsMarkdownLinks typ,
+                              (startOffset, endOffset) ))))
             in
             let label =
               constructor.name ^ "("

analysis/src/TypeUtils.ml

@@ -1183,10 +1183,11 @@ let transformCompletionToPipeCompletion ?(synthetic = false) ~env ?posOfDot
         | Some posOfDot -> Some (makeAdditionalTextEditsForRemovingDot posOfDot));
     }
 
-(** This takes a type expr and the env that type expr was found in, and produces a globally unique 
-    id for that specific type. The globally unique id is the full path to the type as seen from the root
-    of the project. Example: type x in module SomeModule in file SomeFile would get the globally 
-    unique id `SomeFile.SomeModule.x`.*)
+(** This takes a type expr and the env that type expr was found in, and produces
+    a globally unique id for that specific type. The globally unique id is the
+    full path to the type as seen from the root of the project. Example: type x
+    in module SomeModule in file SomeFile would get the globally unique id
+    `SomeFile.SomeModule.x`.*)
 let rec findRootTypeId ~full ~env (t : Types.type_expr) =
   let debug = false in
   match t.desc with