Merge branch 'main' into 3.7.0-alpha

ocaml · Feb 9, 2023 · d4b76f8 · d4b76f8
2 parents c0c31ce + 50eda63
commit d4b76f8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/dune_engine/format_config.ml b/src/dune_engine/format_config.ml
@@ -111,9 +111,10 @@ let dune2_record_syntax =
 let dune2_dec =
   let+ loc = loc
   and+ enabled_for =
-    peek_exn >>= function
-    | List _ -> fields dune2_record_syntax
-    | _ -> keyword "disabled" >>> return (Enabled_for.Only Language.Set.empty)
+    peek >>= function
+    | None | Some (List _) -> fields dune2_record_syntax
+    | Some _ ->
+      keyword "disabled" >>> return (Enabled_for.Only Language.Set.empty)
   in
   { loc; enabled_for }
 

diff --git a/test/blackbox-tests/test-cases/formatting/empty-field.t b/test/blackbox-tests/test-cases/formatting/empty-field.t
@@ -0,0 +1,6 @@
+  $ cat > dune-project << EOF
+  > (lang dune 3.5)
+  > (formatting)
+  > EOF
+
+  $ dune build @fmt