ocaml · emillon · Nov 15, 2022 · Nov 14, 2022 · Nov 15, 2022
diff --git a/test/blackbox-tests/test-cases/formatting/disable-dune-file.t b/test/blackbox-tests/test-cases/formatting/disable-dune-file.t
@@ -0,0 +1,27 @@
+This tests how it is possible to disable formatting for a particular dialect in
+a given subdirectory. This can be used to disable formatting of a particular
+dune file.
+
+  $ cat > dune-project << EOF
+  > (lang dune 2.8)
+  > EOF
+
+  $ cat > dune << EOF
+  > ; this file should be formatted
+  > (rule (write-file a b))
+  > EOF
+
+  $ mkdir sub
+  $ cat > sub/dune << EOF
+  > ; this file should not
+  > (env
+  >  (_
+  >   (formatting (enabled_for ocaml))))
+  > 
+  > (rule (write-file a b))
+  > EOF
+
+  $ dune build @fmt
+  File "dune", line 1, characters 0-0:
+  Error: Files _build/default/dune and _build/default/.formatted/dune differ.
+  [1]
diff --git a/...sts/test-cases/formatting.t/disabled/dune → ...-cases/formatting/feature.t/disabled/dune b/...sts/test-cases/formatting.t/disabled/dune → ...-cases/formatting/feature.t/disabled/dune
diff --git a/...-cases/formatting.t/disabled/dune-project → ...ormatting/feature.t/disabled/dune-project b/...-cases/formatting.t/disabled/dune-project → ...ormatting/feature.t/disabled/dune-project
diff --git a/...s/test-cases/formatting.t/disabled/lib.ml → ...ases/formatting/feature.t/disabled/lib.ml b/...s/test-cases/formatting.t/disabled/lib.ml → ...ases/formatting/feature.t/disabled/lib.ml
diff --git a/.../test-cases/formatting.t/disabled/lib.mli → ...ses/formatting/feature.t/disabled/lib.mli b/.../test-cases/formatting.t/disabled/lib.mli → ...ses/formatting/feature.t/disabled/lib.mli
diff --git a/...rmatting.t/enabled/dune-ocaml-syntax/dune → .../feature.t/enabled/dune-ocaml-syntax/dune b/...rmatting.t/enabled/dune-ocaml-syntax/dune → .../feature.t/enabled/dune-ocaml-syntax/dune
diff --git a/...t-cases/formatting.t/enabled/dune-project → ...formatting/feature.t/enabled/dune-project b/...t-cases/formatting.t/enabled/dune-project → ...formatting/feature.t/enabled/dune-project
diff --git a/...atting.t/enabled/no-source-code/README.md → ...eature.t/enabled/no-source-code/README.md b/...atting.t/enabled/no-source-code/README.md → ...eature.t/enabled/no-source-code/README.md
diff --git a/...s/formatting.t/enabled/ocaml_file.ml.orig → ...ting/feature.t/enabled/ocaml_file.ml.orig b/...s/formatting.t/enabled/ocaml_file.ml.orig → ...ting/feature.t/enabled/ocaml_file.ml.orig
diff --git a/...cases/formatting.t/enabled/ocaml_file.mli → ...rmatting/feature.t/enabled/ocaml_file.mli b/...cases/formatting.t/enabled/ocaml_file.mli → ...rmatting/feature.t/enabled/ocaml_file.mli
diff --git a/...s/formatting.t/enabled/other-project/a.ml → ...ting/feature.t/enabled/other-project/a.ml b/...s/formatting.t/enabled/other-project/a.ml → ...ting/feature.t/enabled/other-project/a.ml
diff --git a/...s/formatting.t/enabled/other-project/dune → ...ting/feature.t/enabled/other-project/dune b/...s/formatting.t/enabled/other-project/dune → ...ting/feature.t/enabled/other-project/dune
diff --git a/...ting.t/enabled/other-project/dune-project → ...ture.t/enabled/other-project/dune-project b/...ting.t/enabled/other-project/dune-project → ...ture.t/enabled/other-project/dune-project
diff --git a/...ases/formatting.t/enabled/reason_file.rei → ...matting/feature.t/enabled/reason_file.rei b/...ases/formatting.t/enabled/reason_file.rei → ...matting/feature.t/enabled/reason_file.rei
diff --git a/...st-cases/formatting.t/enabled/subdir/dune → .../formatting/feature.t/enabled/subdir/dune b/...st-cases/formatting.t/enabled/subdir/dune → .../formatting/feature.t/enabled/subdir/dune
diff --git a/...-cases/formatting.t/enabled/subdir/lib.ml → ...ormatting/feature.t/enabled/subdir/lib.ml b/...-cases/formatting.t/enabled/subdir/lib.ml → ...ormatting/feature.t/enabled/subdir/lib.ml
diff --git a/...s/test-cases/formatting.t/fake-tools/dune → ...ases/formatting/feature.t/fake-tools/dune b/...s/test-cases/formatting.t/fake-tools/dune → ...ases/formatting/feature.t/fake-tools/dune
diff --git a/...ases/formatting.t/fake-tools/dune-project → ...matting/feature.t/fake-tools/dune-project b/...ases/formatting.t/fake-tools/dune-project → ...matting/feature.t/fake-tools/dune-project
diff --git a/...es/formatting.t/fake-tools/faketools.opam → ...tting/feature.t/fake-tools/faketools.opam b/...es/formatting.t/fake-tools/faketools.opam → ...tting/feature.t/fake-tools/faketools.opam
diff --git a/...es/formatting.t/fake-tools/ocamlformat.ml → ...tting/feature.t/fake-tools/ocamlformat.ml b/...es/formatting.t/fake-tools/ocamlformat.ml → ...tting/feature.t/fake-tools/ocamlformat.ml
diff --git a/...st-cases/formatting.t/fake-tools/refmt.ml → .../formatting/feature.t/fake-tools/refmt.ml b/...st-cases/formatting.t/fake-tools/refmt.ml → .../formatting/feature.t/fake-tools/refmt.ml
diff --git a/...t-cases/formatting.t/fmt-cmd/dune-project → ...formatting/feature.t/fmt-cmd/dune-project b/...t-cases/formatting.t/fmt-cmd/dune-project → ...formatting/feature.t/fmt-cmd/dune-project
diff --git a/...est-cases/formatting.t/lang2/default/dune → ...s/formatting/feature.t/lang2/default/dune b/...est-cases/formatting.t/lang2/default/dune → ...s/formatting/feature.t/lang2/default/dune
diff --git a/...est-cases/formatting.t/lang2/default/e.ml → ...s/formatting/feature.t/lang2/default/e.ml b/...est-cases/formatting.t/lang2/default/e.ml → ...s/formatting/feature.t/lang2/default/e.ml
diff --git a/...st-cases/formatting.t/lang2/disabled/dune → .../formatting/feature.t/lang2/disabled/dune b/...st-cases/formatting.t/lang2/disabled/dune → .../formatting/feature.t/lang2/disabled/dune
diff --git a/.../formatting.t/lang2/disabled/dune-project → ...ing/feature.t/lang2/disabled/dune-project b/.../formatting.t/lang2/disabled/dune-project → ...ing/feature.t/lang2/disabled/dune-project
diff --git a/...st-cases/formatting.t/lang2/disabled/e.ml → .../formatting/feature.t/lang2/disabled/e.ml b/...st-cases/formatting.t/lang2/disabled/e.ml → .../formatting/feature.t/lang2/disabled/e.ml
diff --git a/...est-cases/formatting.t/lang2/partial/a.ml → ...s/formatting/feature.t/lang2/partial/a.ml b/...est-cases/formatting.t/lang2/partial/a.ml → ...s/formatting/feature.t/lang2/partial/a.ml
diff --git a/...est-cases/formatting.t/lang2/partial/b.re → ...s/formatting/feature.t/lang2/partial/b.re b/...est-cases/formatting.t/lang2/partial/b.re → ...s/formatting/feature.t/lang2/partial/b.re
diff --git a/...est-cases/formatting.t/lang2/partial/dune → ...s/formatting/feature.t/lang2/partial/dune b/...est-cases/formatting.t/lang2/partial/dune → ...s/formatting/feature.t/lang2/partial/dune
diff --git a/...ests/test-cases/formatting.t/partial/a.ml → ...t-cases/formatting/feature.t/partial/a.ml b/...ests/test-cases/formatting.t/partial/a.ml → ...t-cases/formatting/feature.t/partial/a.ml
diff --git a/...ests/test-cases/formatting.t/partial/b.re → ...t-cases/formatting/feature.t/partial/b.re b/...ests/test-cases/formatting.t/partial/b.re → ...t-cases/formatting/feature.t/partial/b.re
diff --git a/...ests/test-cases/formatting.t/partial/dune → ...t-cases/formatting/feature.t/partial/dune b/...ests/test-cases/formatting.t/partial/dune → ...t-cases/formatting/feature.t/partial/dune
diff --git a/...t-cases/formatting.t/partial/dune-project → ...formatting/feature.t/partial/dune-project b/...t-cases/formatting.t/partial/dune-project → ...formatting/feature.t/partial/dune-project
diff --git a/...ckbox-tests/test-cases/formatting.t/run.t → ...sts/test-cases/formatting/feature.t/run.t b/...ckbox-tests/test-cases/formatting.t/run.t → ...sts/test-cases/formatting/feature.t/run.t