ocaml version is set to 5.4.0 by default to allow effects (#2750)

EmileTrotignon · Julow · web-flow · commit 86f8112ded10 · 2025-12-08T18:19:23.000+01:00
Co-authored-by: Jules Aguillon &lt;jules@j3s.fr&gt;
diff --git a/CHANGES.md b/CHANGES.md
@@ -100,6 +100,12 @@ profile. This started with version 0.26.0.
   end
   ```
 
+- \* Set the `ocaml-version` to `5.4` by default (#2750, @EmileTrotignon)
+  The main difference is that the `effect` keyword is recognized without having
+  to add `ocaml-version=5.3` to the configuration.
+  In exchange, code that use `effect` as an identifier must use
+  `ocaml-version=5.2`.
+
 ## 0.28.1
 
 ### Highlight
diff --git a/doc/manpage_ocamlformat.mld b/doc/manpage_ocamlformat.mld
@@ -626,8 +626,7 @@ OPTIONS
            omitted.
 
        --ocaml-version=V
-           Version of OCaml syntax of the output. The default value is
-           4.04.0.
+           Version of OCaml syntax of the output. The default value is 5.4.0.
 
        --ocp-indent-config
            Read .ocp-indent configuration files. base is an alias for
diff --git a/lib/Conf.ml b/lib/Conf.ml
@@ -266,7 +266,7 @@ let default =
       ; disable= elt false
       ; margin_check= elt false
       ; max_iters= elt 10
-      ; ocaml_version= elt Ocaml_version.Releases.v4_04_0
+      ; ocaml_version= elt (Ocaml_version.v ~patch:0 5 4)
       ; quiet= elt false
       ; disable_conf_attrs= elt false
       ; version_check= elt true } }
diff --git a/test/cli/print_config.t b/test/cli/print_config.t
@@ -18,7 +18,7 @@ No redundant values:
   disable=false
   margin-check=false
   max-iters=10
-  ocaml-version=4.04.0
+  ocaml-version=5.4.0
   quiet=false
   disable-conf-attrs=false
   version-check=true
@@ -99,7 +99,7 @@ Redundant values from the conventional profile:
   disable=false
   margin-check=false
   max-iters=10
-  ocaml-version=4.04.0
+  ocaml-version=5.4.0
   quiet=false
   disable-conf-attrs=false
   version-check=true
@@ -180,7 +180,7 @@ Redundant values from the ocamlformat profile:
   disable=false
   margin-check=false
   max-iters=10
-  ocaml-version=4.04.0
+  ocaml-version=5.4.0
   quiet=false
   disable-conf-attrs=false
   version-check=true
diff --git a/test/passing/gen/dune.inc b/test/passing/gen/dune.inc
@@ -1732,19 +1732,22 @@
 
 (rule
  (deps .ocamlformat)
+ (enabled_if (>= %{ocaml_version} 5.3))
  (package ocamlformat)
  (action
   (with-stdout-to effects.ml.stdout
    (with-stderr-to effects.ml.stderr
-     (run %{bin:ocamlformat} --name effects.ml --margin-check --ocaml-version=5.3 %{dep:../tests/effects.ml})))))
+     (run %{bin:ocamlformat} --name effects.ml --margin-check %{dep:../tests/effects.ml})))))
 
 (rule
  (alias runtest)
+ (enabled_if (>= %{ocaml_version} 5.3))
  (package ocamlformat)
  (action (diff effects.ml.ref effects.ml.stdout)))
 
 (rule
  (alias runtest)
+ (enabled_if (>= %{ocaml_version} 5.3))
  (package ocamlformat)
  (action (diff effects.ml.err effects.ml.stderr)))
 
diff --git a/test/passing/refs.ahrefs/.ocamlformat b/test/passing/refs.ahrefs/.ocamlformat
@@ -1,5 +1,4 @@
 profile=default
-ocaml-version=4.14.0
 
 break-cases=toplevel
 break-infix-before-func=false
diff --git a/test/passing/refs.default/extensions-indent.ml.ref b/test/passing/refs.default/extensions-indent.ml.ref
@@ -323,9 +323,9 @@ let _ =
 
 let _ =
   f
-    (object%ext
-       method x = y
-    end)
+    object%ext
+      method x = y
+    end
 
 let _ =
   f
diff --git a/test/passing/refs.default/extensions.ml.ref b/test/passing/refs.default/extensions.ml.ref
@@ -323,9 +323,9 @@ let _ =
 
 let _ =
   f
-    (object%ext
-       method x = y
-    end)
+    object%ext
+      method x = y
+    end
 
 let _ =
   f
diff --git a/test/passing/refs.default/labelled_args.ml.ref b/test/passing/refs.default/labelled_args.ml.ref
@@ -1,6 +1,6 @@
 let _ =
   let f ~y = y + 1 in
-  f ~y:(y : int)
+  f ~(y : int)
 
 let () =
   very_long_function_name
diff --git a/test/passing/refs.default/let_punning.ml.ref b/test/passing/refs.default/let_punning.ml.ref
@@ -6,25 +6,23 @@ and y = 2
 and z = 3
 
 let p =
-  let* x = x and* y = y and* z = z in
+  let* x = x and* y and* z = z in
   (x, y, z)
 
 let q =
-  let%foo x = x and y = y and z = z in
+  let%foo x and y = y and z in
   (x, y, z)
 
 let r =
   let* (* 1 *) x (* 2 *) = (* 3 *) x (* 4 *)
-  and* (* 5 *) y =
-    y
+  and* (* 5 *) y
     (* 6 *)
   in
   (x, y)
 
 let s =
   let%foo (* 1 *) x (* 2 *) = (* 3 *) x (* 4 *)
-  and (* 5 *) y =
-    y
+  and (* 5 *) y
     (* 6 *)
   in
   (x, y)
diff --git a/test/passing/refs.default/object.ml.ref b/test/passing/refs.default/object.ml.ref
@@ -56,8 +56,8 @@ type t = (int, int) #q
 let _ = object%js end
 let _ = object%js (super) end
 let _ = object%js (super : 'a) end
-let _ = f (object end)
-let _ = f (object%js end)
+let _ = f object end
+let _ = f object%js end
 
 class t ~a =
   object
diff --git a/test/passing/refs.default/object_expr.ml.ref b/test/passing/refs.default/object_expr.ml.ref
@@ -1,19 +1,19 @@
-(object
-   method one = 1
-end)
+object
+  method one = 1
+end
   #one
 ;;
 
 Some
-  (object
-     method one = 1
-  end)
+  object
+    method one = 1
+  end
 ;;
 
 ignore
-  (object
-     method one = 1
-  end)
+  object
+    method one = 1
+  end
 ;;
 
 let () =
diff --git a/test/passing/refs.janestreet/extensions-indent.ml.ref b/test/passing/refs.janestreet/extensions-indent.ml.ref
@@ -417,9 +417,9 @@ let _ =
 
 let _ =
   f
-    (object%ext
-       method x = y
-    end)
+    object%ext
+      method x = y
+    end
 ;;
 
 let _ =
diff --git a/test/passing/refs.janestreet/extensions.ml.ref b/test/passing/refs.janestreet/extensions.ml.ref
@@ -417,9 +417,9 @@ let _ =
 
 let _ =
   f
-    (object%ext
-       method x = y
-    end)
+    object%ext
+      method x = y
+    end
 ;;
 
 let _ =
diff --git a/test/passing/refs.janestreet/labelled_args.ml.ref b/test/passing/refs.janestreet/labelled_args.ml.ref
@@ -1,6 +1,6 @@
 let _ =
   let f ~y = y + 1 in
-  f ~y:(y : int)
+  f ~(y : int)
 ;;
 
 let () =
diff --git a/test/passing/refs.janestreet/let_punning.ml.ref b/test/passing/refs.janestreet/let_punning.ml.ref
@@ -7,31 +7,29 @@ and z = 3
 
 let p =
   let* x = x
-  and* y = y
+  and* y
   and* z = z in
   x, y, z
 ;;
 
 let q =
-  let%foo x = x
+  let%foo x
   and y = y
-  and z = z in
+  and z in
   x, y, z
 ;;
 
 let r =
   let* (* 1 *) x (* 2 *) = (* 3 *) x (* 4 *)
-  and* (* 5 *) y =
-    y
+  and* (* 5 *) y
     (* 6 *)
   in
   x, y
 ;;
 
 let s =
   let%foo (* 1 *) x (* 2 *) = (* 3 *) x (* 4 *)
-  and (* 5 *) y =
-    y
+  and (* 5 *) y
     (* 6 *)
   in
   x, y
diff --git a/test/passing/refs.janestreet/object.ml.ref b/test/passing/refs.janestreet/object.ml.ref
@@ -56,8 +56,8 @@ type t = (int, int) #q
 let _ = object%js end
 let _ = object%js (super) end
 let _ = object%js (super : 'a) end
-let _ = f (object end)
-let _ = f (object%js end)
+let _ = f object end
+let _ = f object%js end
 
 class t ~a =
   object
diff --git a/test/passing/refs.janestreet/object_expr.ml.ref b/test/passing/refs.janestreet/object_expr.ml.ref
@@ -1,19 +1,19 @@
-(object
-   method one = 1
-end)
+object
+  method one = 1
+end
   #one
 ;;
 
 Some
-  (object
-     method one = 1
-  end)
+  object
+    method one = 1
+  end
 ;;
 
 ignore
-  (object
-     method one = 1
-  end)
+  object
+    method one = 1
+  end
 ;;
 
 let () =
diff --git a/test/passing/refs.ocamlformat/extensions-indent.ml.ref b/test/passing/refs.ocamlformat/extensions-indent.ml.ref
@@ -348,9 +348,9 @@ let _ =
 
 let _ =
   f
-    (object%ext
-       method x = y
-    end )
+    object%ext
+      method x = y
+    end
 
 let _ =
   f
diff --git a/test/passing/refs.ocamlformat/extensions.ml.ref b/test/passing/refs.ocamlformat/extensions.ml.ref
@@ -348,9 +348,9 @@ let _ =
 
 let _ =
   f
-    (object%ext
-       method x = y
-    end )
+    object%ext
+      method x = y
+    end
 
 let _ =
   f
diff --git a/test/passing/refs.ocamlformat/labelled_args.ml.ref b/test/passing/refs.ocamlformat/labelled_args.ml.ref
@@ -1,6 +1,6 @@
 let _ =
   let f ~y = y + 1 in
-  f ~y:(y : int)
+  f ~(y : int)
 
 let () =
   very_long_function_name
diff --git a/test/passing/refs.ocamlformat/let_punning.ml.ref b/test/passing/refs.ocamlformat/let_punning.ml.ref
@@ -9,25 +9,23 @@ and y = 2
 and z = 3
 
 let p =
-  let* x = x and* y = y and* z = z in
+  let* x = x and* y and* z = z in
   (x, y, z)
 
 let q =
-  let%foo x = x and y = y and z = z in
+  let%foo x and y = y and z in
   (x, y, z)
 
 let r =
   let* (* 1 *) x (* 2 *) = (* 3 *) x (* 4 *)
-  and* (* 5 *) y =
-    y
+  and* (* 5 *) y
     (* 6 *)
   in
   (x, y)
 
 let s =
   let%foo (* 1 *) x (* 2 *) = (* 3 *) x (* 4 *)
-  and (* 5 *) y =
-    y
+  and (* 5 *) y
     (* 6 *)
   in
   (x, y)
diff --git a/test/passing/refs.ocamlformat/object.ml.ref b/test/passing/refs.ocamlformat/object.ml.ref
@@ -73,9 +73,9 @@ let _ = object%js (super) end
 
 let _ = object%js (super : 'a) end
 
-let _ = f (object end)
+let _ = f object end
 
-let _ = f (object%js end)
+let _ = f object%js end
 
 class t ~a =
   object
diff --git a/test/passing/refs.ocamlformat/object_expr.ml.ref b/test/passing/refs.ocamlformat/object_expr.ml.ref
diff --git a/test/passing/tests/effects.ml.enabled-if b/test/passing/tests/effects.ml.enabled-if
diff --git a/test/passing/tests/effects.ml.opts b/test/passing/tests/effects.ml.opts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`profile=default`
`2`		`-ocaml-version=4.14.0`
`3`	`2`
`4`	`3`	`break-cases=toplevel`
`5`	`4`	`break-infix-before-func=false`
Original file line number	Diff line number	Diff line change
`@@ -323,9 +323,9 @@ let _ =`
`323`	`323`
`324`	`324`	`let _ =`
`325`	`325`	`f`
`326`		`- (object%ext`
`327`		`- method x = y`
`328`		`- end)`
	`326`	`+ object%ext`
	`327`	`+ method x = y`
	`328`	`+ end`
`329`	`329`
`330`	`330`	`let _ =`
`331`	`331`	`f`