aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaëtan Gilbert2020-03-30 19:02:21 +0200
committerGaëtan Gilbert2020-03-30 19:02:55 +0200
commit2b78aa38c2c75f99eaff3e3b1575eab3d5c76677 (patch)
tree4ee762a9cbe99e4c6216a41593db011f1aeb6a3e
parentd2f21a119fea99d8621fb227b82fa8a1bf17d9fb (diff)
ocamlformat: use whitelist instead of blacklist
Using disable=true in .ocamlformat and disable=false in sub .ocamlformat works fine. Note that disable=true must be after the `profile` setting otherwise it gets reset
-rw-r--r--.ocamlformat5
-rw-r--r--.ocamlformat-ignore53
-rw-r--r--plugins/micromega/.ocamlformat1
-rw-r--r--plugins/micromega/.ocamlformat-ignore1
4 files changed, 7 insertions, 53 deletions
diff --git a/.ocamlformat b/.ocamlformat
index 6d73a5297f..4480935e3b 100644
--- a/.ocamlformat
+++ b/.ocamlformat
@@ -1,5 +1,10 @@
version=0.13.0
profile=ocamlformat
+
+# to enable a whole directory, put "disable=false" in dir/.ocamlformat
+# to enable specific files put them in .ocamlformat-enable
+disable=true
+
module-item-spacing=compact
sequence-style=terminator
cases-exp-indent=2
diff --git a/.ocamlformat-ignore b/.ocamlformat-ignore
deleted file mode 100644
index b1f6597140..0000000000
--- a/.ocamlformat-ignore
+++ /dev/null
@@ -1,53 +0,0 @@
-configure.ml
-dev/*
-coqpp/*
-lib/*
-clib/*
-config/*
-checker/*
-kernel/*
-library/*
-engine/*
-gramlib/*
-parsing/*
-interp/*
-pretyping/*
-printing/*
-proofs/*
-stm/*
-tactics/*
-theories/*
-user-contrib/*/*
-vernac/*
-toplevel/*
-topbin/*
-ide/*
-ide/*/*
-doc/plugin_tutorial/*/*/*
-doc/tools/docgram/*
-test-suite/*
-test-suite/*/*/*
-test-suite/*/*/*/*
-test-suite/*/*/*/*/*
-tools/*
-tools/*/*
-plugins/btauto/*
-plugins/cc/*
-plugins/derive/*
-plugins/extraction/*
-plugins/firstorder/*
-plugins/fourier/*
-plugins/funind/*
-plugins/ltac/*
-plugins/nsatz/*
-plugins/omega/*
-plugins/rtauto/*
-plugins/setoid/*
-plugins/ing/*
-plugins/setoid_ring/*
-plugins/ssr/*
-plugins/ssrmatching/*
-plugins/syntax/*
-# Enabled: micromega
-# plugins/micromega/*
-plugins/micromega/micromega.ml
diff --git a/plugins/micromega/.ocamlformat b/plugins/micromega/.ocamlformat
new file mode 100644
index 0000000000..a22a2ff88c
--- /dev/null
+++ b/plugins/micromega/.ocamlformat
@@ -0,0 +1 @@
+disable=false
diff --git a/plugins/micromega/.ocamlformat-ignore b/plugins/micromega/.ocamlformat-ignore
new file mode 100644
index 0000000000..157a987754
--- /dev/null
+++ b/plugins/micromega/.ocamlformat-ignore
@@ -0,0 +1 @@
+micromega.ml