Make sure we always get both original and formatted files
commit78e8dd830ab4ef93ca10e4f6f1fe966c0b41ba3d
authormrkkrp <mark.karpov@tweag.io>
dateSun 14 Jul 2019, 12:24 (7 years ago)
parent7a9aab7
README.md+3−1
@@ -74,7 +74,9 @@ $ nix-build -A hackage.<package>
7474```
7575
7676Then inspect `result/log.txt` for possible problems. The derivation will
77−also contain formatted files for inspection.
77+also contain formatted `.hs` files for inspection and original inputs with
78+`.hs-original` extension (those are with CPP dropped, exactly what is fed
79+into Ormolu).
7880
7981## Contributing
8082
nix/ormolize/default.nix+1
@@ -13,6 +13,7 @@
1313 '';
1414 installPhase = ''
1515 mkdir "$out"
16+ find . -name '*.hs-original' -exec cp --parents {} $out \;
1617 find . -name '*.hs' -exec cp --parents {} $out \;
1718 cp log.txt $out/log.txt
1819 '';
nix/ormolize/ormolize.sh+4−1
@@ -14,5 +14,8 @@ cpphs "$1" --noline > "$1-nocpp" 2> /dev/null
1414# annoyingly, cpphs cannot modify files in place
1515mv "$1-nocpp" "$1"
1616
17+# preserve the original
18+cp "$1" "$1-original"
19+
1720# run ormolu
18−ormolu -m inplace "$1"
21+ormolu -m inplace "$1" || ormolu -u -m inplace "$1"