Compare commits

...

684 Commits

Author SHA1 Message Date
Taylor Fausak e03ab8425b
Merge pull request #377 from lspitzner/tfausak-patch-1
Announce end of maintenance
2022-11-11 12:13:28 -06:00
Taylor Fausak 420eac889e
Announce end of maintenance 2022-11-11 09:52:57 -06:00
Taylor Fausak 0aa04af4eb
Version 0.14.0.2 2022-01-13 09:28:26 -05:00
Taylor Fausak 93a43bf28d Revert "Remove `Language.Haskell.` from module names"
This reverts commit 2fe1432631.
2022-01-13 14:16:14 +00:00
Taylor Fausak 29814f919e
Version 0.14.0.1 2022-01-11 08:49:47 -05:00
Taylor Fausak 97da38fab7 Merge remote-tracking branch 'upstream/master' into main 2022-01-11 13:48:58 +00:00
Taylor Fausak b59f885987
Merge pull request #363 from sergv/master
Fix warnings when building with GHC 9.0.2
2022-01-11 07:46:42 -06:00
Sergey Vinokurov 3996efd5eb
Use defaultDynFlags to obtain ghc’s DynFlags
This way brittany can avoid dealing with incompatibilities in DynFlags
structure between ghc versions (e.g. different versions having
different fields).
2022-01-09 20:11:23 +00:00
Taylor Fausak ad88ba3f57
Update Stack resolver
Fixes #361.
2022-01-05 07:48:36 -05:00
Taylor Fausak 46bf450530
Merge pull request #360 from fendor/patch-1
Update README to mention HLS instead of HIE
2021-12-01 15:19:56 -05:00
fendor 6b1e6fa73a
Update README to mention HLS instead of HIE 2021-12-01 20:51:51 +01:00
Taylor Fausak 2fe1432631 Remove `Language.Haskell.` from module names 2021-11-29 12:25:00 +00:00
Taylor Fausak 6151ba5825 Upgrade to ghcup 0.1.17.4 2021-11-29 12:21:18 +00:00
Taylor Fausak 9e12a36a4f Also build on `master` branch 2021-11-29 12:20:51 +00:00
Taylor Fausak ccabed9d7b Use new czipwith from Hackage 2021-11-29 12:18:38 +00:00
Taylor Fausak 7399b75388
Merge pull request #359 from tfausak/gh-238-format-self
Format Brittany with Brittany
2021-11-29 07:14:35 -05:00
Taylor Fausak 7fa2a85b30 Format Brittany with Brittany
Fixes #238.
2021-11-29 02:31:50 +00:00
Taylor Fausak a15eed5f36
Merge pull request #357 from tfausak/main
Support only GHC 9.0
2021-11-28 09:42:35 -05:00
Taylor Fausak 339d2ebf23 Version 0.14.0.0 2021-11-28 14:08:58 +00:00
Taylor Fausak 8f2625dc87 Simplify test suite 2021-11-28 13:24:11 +00:00
Taylor Fausak cddb98b124 Run tests in serial 2021-11-25 14:16:22 +00:00
Taylor Fausak 21e86adf6e Split tests into individual files 2021-11-23 22:41:01 +00:00
Taylor Fausak 89a9f47b72 Ignore warnings when parsing modules 2021-11-21 23:40:15 +00:00
Taylor Fausak ab59e9acc3 Parse modules "purely", without ghc-paths 2021-11-21 22:58:07 +00:00
Taylor Fausak b8532ca631 Fix release job dependency 2021-11-21 14:05:37 +00:00
Taylor Fausak cdc8405b10 Remove mentions of GHC 8.x 2021-11-21 13:59:35 +00:00
Taylor Fausak fa8365a7fa Set up release job 2021-11-21 13:53:46 +00:00
Taylor Fausak 8fadac8b2e Format imports 2021-11-21 13:44:06 +00:00
Taylor Fausak ccd09ba40a Remove obsolete Stack configuration 2021-11-21 13:28:15 +00:00
Taylor Fausak 8d7b46b9e9 Fix handling of comments 2021-11-07 13:01:54 +00:00
Taylor Fausak 4079981b1d Revert "Format Brittany with Brittany"
This reverts commit 4398b5880d.
2021-11-07 12:37:49 +00:00
Taylor Fausak 4398b5880d Format Brittany with Brittany 2021-11-06 22:29:34 +00:00
Taylor Fausak ac81c5ce90 Update Stack config 2021-11-06 21:44:30 +00:00
Taylor Fausak 208240b62f Remvoe old Stack configs 2021-11-06 21:36:35 +00:00
Taylor Fausak fdbbe9803d Try to spend less time compressing binaries 2021-11-06 21:33:44 +00:00
Taylor Fausak 4ee386a323 Remove unnecessary setup script 2021-11-06 21:32:54 +00:00
Taylor Fausak a1cd4c5ed5 Remove Make configuration 2021-11-06 21:32:31 +00:00
Taylor Fausak 51ca8fd5d7 Remove Nix configuration 2021-11-06 21:31:55 +00:00
Taylor Fausak 694ce973f4 Remove Travis CI config 2021-11-06 21:31:23 +00:00
Taylor Fausak 93172bfd21 Add flag for turning warnings into errors 2021-11-06 21:30:05 +00:00
Taylor Fausak e22a647baa Move literate test files 2021-11-06 21:28:23 +00:00
Taylor Fausak 79be0ed200 Move test suite 2021-11-06 21:25:04 +00:00
Taylor Fausak 93ba90e646 Rename test suite 2021-11-06 21:23:49 +00:00
Taylor Fausak 5631e2500f Merge interface tests into literate tests 2021-11-06 21:23:24 +00:00
Taylor Fausak 9a9b67d410 Merge unit tests into literate tests 2021-11-06 21:21:11 +00:00
Taylor Fausak d879125264 Combine unit test modules 2021-11-06 21:17:57 +00:00
Taylor Fausak c2248cb99c Ignore missed specializations 2021-11-06 21:15:03 +00:00
Taylor Fausak 0c720ee032 Remove unnecessary flags 2021-11-06 21:12:57 +00:00
Taylor Fausak 75aed1cb8a Remove unnecessary GHC version parsing 2021-11-06 21:11:27 +00:00
Taylor Fausak 2ab406471b Move library 2021-11-06 21:07:34 +00:00
Taylor Fausak 95017640a8 Move executable 2021-11-06 21:06:23 +00:00
Taylor Fausak 392e5b7569 Fix many HLint warnings 2021-11-06 21:05:10 +00:00
Taylor Fausak 75cf5b83a3 Remove unused tests 2021-11-06 20:40:31 +00:00
Taylor Fausak d03deccba8 Remove unnecessary export lists 2021-11-06 20:38:28 +00:00
Taylor Fausak 69e0f9fedf Expose all modules 2021-11-06 20:34:25 +00:00
Taylor Fausak 33d2aa8790 Use common stanzas in package description 2021-11-06 20:33:43 +00:00
Taylor Fausak 8a4bfe083e Use layout for package description 2021-11-06 20:33:06 +00:00
Taylor Fausak d1968b5de3 Remove redundant language extensions 2021-11-06 18:17:01 +00:00
Taylor Fausak 09f7e1726b Configure HLint 2021-11-06 17:59:26 +00:00
Taylor Fausak 09fabe8d16 Compress executable artifacts 2021-11-06 17:47:27 +00:00
Taylor Fausak 72fd6959f7 Don't enable any language extensions by default 2021-11-06 17:45:56 +00:00
Taylor Fausak 2dced782b1 Make sure record updates are complete 2021-11-06 17:40:55 +00:00
Taylor Fausak c02edecd1e Remove redundant constraints 2021-11-06 17:39:57 +00:00
Taylor Fausak ce0aa4feec Use canonical `Monoid` instances 2021-11-06 17:37:47 +00:00
Taylor Fausak 7ce87381ae Use canonical `Monad` instance 2021-11-06 17:37:19 +00:00
Taylor Fausak bb3a7d0a5b Remove unnecessary `Typeable` instances 2021-11-06 17:36:35 +00:00
Taylor Fausak 325798a02b Remove unused dependencies 2021-11-06 17:35:34 +00:00
Taylor Fausak e3deff448a Switch from `-Wall` to `-Weverything` 2021-11-06 17:35:09 +00:00
Taylor Fausak 32da5defb5 Remove unused imports 2021-11-06 17:27:19 +00:00
Taylor Fausak 1e7a94e72e Inline `prelude.inc` 2021-11-06 17:12:55 +00:00
Taylor Fausak 19a092b862 Remove CPP instances 2021-11-06 17:09:43 +00:00
Taylor Fausak 56ccbc91a8 Add `Paths_brittany` as an automatically generated module 2021-11-06 17:04:46 +00:00
Taylor Fausak d89cf0ad30 Remove CPP 2021-11-06 17:03:42 +00:00
Taylor Fausak 0c33d9a6fa Remove redundant pattern matches 2021-11-06 17:01:11 +00:00
Taylor Fausak c361ba545d Avoid relying on `StarIsType` 2021-11-06 16:57:02 +00:00
Taylor Fausak acdc30c227 Comment out unused definitions 2021-11-06 16:56:22 +00:00
Taylor Fausak eccd2debb0 Replace `Option` with `Maybe` 2021-11-06 16:55:46 +00:00
Taylor Fausak b517eef71e Fix handling of type families 2021-11-06 16:46:24 +00:00
Taylor Fausak 85359163cc Add back EOF handling 2021-11-06 15:22:13 +00:00
Taylor Fausak 8290109e7f Fix handling of EOF 2021-11-06 15:19:38 +00:00
Taylor Fausak 1ad34aedcc Remove unused HLS 2021-11-06 14:50:31 +00:00
Taylor Fausak 42cf56b106 Switch to Purple Yolk 2021-11-04 23:14:13 +00:00
Taylor Fausak bfdb28010a Restore custom `Show` instance for `PPTextWrapper` 2021-11-04 23:05:43 +00:00
Taylor Fausak bd860f9983
Fix type variable name 2021-11-02 08:10:44 -04:00
Taylor Fausak 22361c4ecd Fix getting binders from `HsForAllTy` 2021-11-02 02:17:05 +00:00
Taylor Fausak 0f035faf3c Fix matching of `LastStmt` 2021-11-02 02:16:49 +00:00
Taylor Fausak 515595b432 Append final newline 2021-10-30 16:28:34 +00:00
Taylor Fausak 116930ac2b Get everything building with (only) GHC 9.0 2021-10-30 16:20:13 +00:00
Taylor Fausak 7bd98ffb1c Upgrade dependencies and tighten bounds 2021-10-30 15:02:35 +00:00
Taylor Fausak abba8668f7 Sort dependencies 2021-10-30 14:49:03 +00:00
Taylor Fausak 9940aa4ae5 Get a working build plan 2021-10-30 14:48:37 +00:00
Taylor Fausak ee5be0735b Set up development container 2021-10-30 10:00:46 -04:00
Taylor Fausak 434f9f8e49
Version 0.13.1.2 2021-05-18 08:34:18 -04:00
Taylor Fausak 50f053cc2c
Update ChangeLog.md 2021-05-18 08:33:51 -04:00
Taylor Fausak de6776b08c
Merge pull request #347 from felixonmars/patch-1
Allow hspec 2.8
2021-05-15 07:32:33 -04:00
Felix Yan 7a7ea6c40d
Allow hspec 2.8
All tests are passing.
2021-05-15 06:07:49 +08:00
Taylor Fausak 4d064db674
Version 0.13.1.1 2021-02-26 08:53:28 -05:00
Taylor Fausak 1a9863160b
Update ChangeLog.md 2021-02-26 08:52:58 -05:00
Taylor Fausak 3175a7c2b3
Merge pull request #343 from maralorn/patch-1
Update ghc-exactprint upper bound
2021-02-26 08:50:41 -05:00
maralorn 256a30cdf8
Update ghc-exactprint upper bound 2021-02-26 14:29:00 +01:00
Taylor Fausak 6b4e534840
Merge pull request #334 from ahstro/patch-1
Update ArchLinux installation instructions
2021-01-02 07:58:02 -05:00
Anton Strömkvist 9658653ab9
Update ArchLinux installation instructions
Brittany is in the community repo now, and no longer requires AUR
2021-01-02 09:16:57 +01:00
Taylor Fausak b1bfef5b8a
Merge pull request #333 from felixonmars/patch-1
Allow random 1.2
2020-12-15 13:21:00 -05:00
Felix Yan e8c4855cd3
Allow random 1.2
Builds fine and all tests pass here.
2020-12-16 01:51:33 +08:00
Taylor Fausak a13ad1b9da Version 0.13.1.0 2020-12-11 11:40:48 -05:00
Taylor Fausak cf48251c76
Merge pull request #331 from lspitzner/remove-travis-ci
Remove Travis CI
2020-12-11 11:35:03 -05:00
Taylor Fausak 8d4e03c53e
Remove Travis CI 2020-12-11 10:47:25 -05:00
Taylor Fausak 9e53988b1d
Merge pull request #330 from expipiplus1/imports-sorted
Sorted imports 2
2020-12-11 10:44:32 -05:00
Taylor Fausak d7083e78bd
Merge pull request #329 from expipiplus1/joe-nix
Simplify Nix expressions
2020-12-11 08:08:16 -05:00
Joe Hermaszewski 8a88e10625 Drop CPP for no-longer-supported GHC versions 2020-12-11 17:08:57 +08:00
Joe Hermaszewski 0b0c6d65ca Simplify Nix expressions
This uses `developPackage` from `nixpkgs` to generate the derivation

Also add CI for nix build
2020-12-11 17:03:10 +08:00
Taylor Fausak 1b74b4274c Version 0.13.0.0 2020-12-09 21:56:28 -05:00
Taylor Fausak 6346e2026a
Merge pull request #324 from lspitzner/gh-269-ghc-8.10
Support GHC 8.10
2020-12-09 21:50:24 -05:00
Taylor Fausak 6453e218ed Publish from GHC 8.10.2 2020-12-09 21:30:58 -05:00
Taylor Fausak b34210b739 Update Stack configurations 2020-12-09 21:30:27 -05:00
Taylor Fausak 0a710ab271
Test against 8.10 by default 2020-11-23 08:08:08 -05:00
Taylor Fausak c4b6a81b31
List 8.10 support 2020-11-23 08:07:21 -05:00
Joe Hermaszewski 9efed95d50 Add tests for import sorting 2020-11-20 23:03:59 +08:00
Joe Hermaszewski f67e72e82c Merge remote-tracking branch 'origin/gh-269-ghc-8.10' into imports-sorted 2020-11-20 22:20:52 +08:00
Joe Hermaszewski fc5b1429f4 Merge branch 'gh-269-ghc-8.10' into imports-sorted 2020-11-20 22:18:46 +08:00
Taylor Fausak d00387d156
Remove broken test case 2020-11-20 08:53:08 -05:00
Taylor Fausak 71e7f52014
Remove broken test case 2020-11-20 08:52:28 -05:00
Lennart Spitzner 1e5b8ada4e Fix ghc version compat 2020-11-19 09:00:45 +08:00
Lennart Spitzner 93ea6542cc Fix existing tests for new import layouter behaviour 2020-11-19 09:00:45 +08:00
Lennart Spitzner eb7a4811fd Implement sorting of import statements 2020-11-19 09:00:45 +08:00
Lennart Spitzner 5a65ed2356 Comment out / Explain TODO on unused code 2020-11-19 09:00:45 +08:00
Lennart Spitzner 614bf3424d Minor refactoring 2020-11-19 09:00:45 +08:00
Lennart Spitzner 63de13b0b4 Fix misworded comment 2020-11-19 09:00:45 +08:00
Lennart Spitzner c6ad57e330 Start implementing sort/uniq on imports/exports 2020-11-19 09:00:45 +08:00
Taylor Fausak 7dedb0c17d Test against GHC 8.10 2020-11-15 12:55:50 -05:00
Taylor Fausak e36d9bc465 Drop support for GHC 8.4 2020-11-15 12:55:50 -05:00
Taylor Fausak 259c949211 Drop support for GHC 8.2 2020-11-15 12:55:50 -05:00
Taylor Fausak 096c438b23 Drop support for GHC 8.0 2020-11-15 12:55:50 -05:00
Taylor Fausak 23dace16ed Don't fail fast 2020-11-15 12:55:50 -05:00
Taylor Fausak 045c387ff4 Remove unnecessary configuration
The latest revision of data-tree-print allows base 4.14.
2020-11-15 12:55:50 -05:00
Taylor Fausak cf3bc5daf4 Allow strict 0.4 2020-11-15 12:55:50 -05:00
Luke Lau 1e118a44ca Fix build on GHC 8.8 and below 2020-11-15 12:55:50 -05:00
Ximin Luo adb642353d more GHC 8.10.1 fixes 2020-11-15 12:55:50 -05:00
Javier Neira 9913b45086 Update cabal.project
Only data-tree-print is needed now

Co-authored-by: Luke Lau <luke_lau@icloud.com>
2020-11-15 12:55:50 -05:00
jneira b69a8f983c Adapt to new GHC modules organization 2020-11-15 12:55:50 -05:00
jneira 17d07edb0a Relax upper bounds to include updated packages 2020-11-15 12:55:50 -05:00
jneira 10aec17005 Use allow-newer to build not updated pkgs 2020-11-15 12:55:50 -05:00
Taylor Fausak b960a3f4ac Version 0.12.2.0 2020-11-15 12:44:05 -05:00
Taylor Fausak 2da92c403a
Merge pull request #323 from lspitzner/set-up-github-actions
Set up GitHub actions
2020-11-15 10:06:43 -05:00
Taylor Fausak 47865b708c Remove unnecessary call to sdist
For some reason `cabal install` does sdist.
2020-11-15 09:50:41 -05:00
Taylor Fausak 751ec8848a Also test with GHC 8.0.2 2020-11-15 09:30:12 -05:00
Taylor Fausak f333302406 Also test with GHC 8.2.2 2020-11-15 09:29:43 -05:00
Taylor Fausak fb8e3825aa Also test with GHC 8.4.4 2020-11-15 09:29:28 -05:00
Taylor Fausak 5f8d70e5f0 Revert "Also test with GHC 8.10.2"
This reverts commit 2d8d1f4d86.
2020-11-15 09:24:19 -05:00
Taylor Fausak 2d8d1f4d86 Also test with GHC 8.10.2 2020-11-15 09:22:02 -05:00
Taylor Fausak 213de6a16c Strip executables 2020-11-15 09:21:35 -05:00
Taylor Fausak 52603fa8cb Upload binaries 2020-11-15 09:01:51 -05:00
Taylor Fausak 05dd912283 Also test with GHC 8.6.5 2020-11-15 08:58:21 -05:00
Taylor Fausak 0a48b0f106 Also test on Windows 2020-11-15 08:52:02 -05:00
Taylor Fausak 01de8ea9b1 Only upload artifacts from Ubuntu 2020-11-15 08:43:37 -05:00
Taylor Fausak e88872994b Also test on macOS 2020-11-15 08:41:43 -05:00
Taylor Fausak d5a5bec729 Start setting up GitHub Actions 2020-11-15 08:28:00 -05:00
Taylor Fausak 8e168f1578 Update stack.yaml.lock 2020-11-15 08:23:03 -05:00
Taylor Fausak 682f08c562
Merge pull request #313 from expipiplus1/joe-exportlist
nondecreasing export list formatting
2020-10-20 16:35:21 -04:00
Joe Hermaszewski 64417c59f4 nondecreasing export list formatting 2020-08-29 13:26:36 +08:00
Taylor Fausak 7d68b1cc38
Merge pull request #311 from jkachmar/patch-2
Allows aeson-1.5.*
2020-07-21 07:58:20 -04:00
Joe Kachmar 9b8ed90a8f
Allows aeson-1.5.* 2020-07-20 22:44:02 -04:00
Lennart Spitzner 55f84c3294
Merge pull request #293 from scrive/main-module
Expose main function as a module
2020-05-07 00:38:48 +02:00
Soares Chen 2da8bd5e74 Revert change to cabal version 2020-05-06 13:38:48 +02:00
Lennart Spitzner dab4f0d557
Merge pull request #303 from andys8/patch-1
Readme: Supports 8.8
2020-05-06 00:31:38 +02:00
Andy 8c57372bde
Readme: Supports 8.8 2020-05-05 10:46:59 +02:00
Lennart Spitzner 5c64928972 Fix problem of do notation as left argument of an operator 2020-04-21 01:34:46 +02:00
Soares Chen 8778dcf2f4 Create Main module for Brittany 2020-04-06 12:03:46 +00:00
Lennart Spitzner 86c25ff315
Merge pull request #286 from lspitzner/fix-instance-comment
Fix comments in instance/type instances (#282)
2020-03-24 20:38:28 +01:00
Lennart Spitzner 061c39b4e9 Fix a semi-hidden missing indentation bug 2020-03-23 16:52:18 +01:00
Lennart Spitzner df2ee177b2 Fix comments in instance/type instances (#282) 2020-03-23 16:51:30 +01:00
Lennart Spitzner 7b5c0dc4e3
Merge pull request #287 from RaoulHC/pattern-synonyms
Add support for pattern synonyms
2020-03-23 16:50:50 +01:00
Lennart Spitzner ae0e397fac Disable one test-case for ghc-8.0 (unsupported syntax) 2020-03-22 22:44:13 +01:00
Lennart Spitzner 2ce3fb178c Share some more bridoc nodes, clean up code 2020-03-21 22:07:54 +01:00
Lennart Spitzner 3631f6aec3 Add another testcase for bidirectional pattern synonyms 2020-03-21 22:05:21 +01:00
Lennart Spitzner eec946830b Fix failing testcase on bidirectional pattern synonyms 2020-03-21 22:05:21 +01:00
Lennart Spitzner b546b514b0 Add a testcase for PatternSynonym decls (needs fixing) 2020-03-21 22:05:21 +01:00
Lennart Spitzner 2d07900005 Rewrite non-recommended usage of docLines 2020-03-21 22:05:21 +01:00
Lennart Spitzner 9aad31809f Merge branch 'release' 2020-03-15 22:55:29 +01:00
Neil Mitchell 231c2f5e94 Permit extra-1.7 2020-03-15 22:52:36 +01:00
Lennart Spitzner 9236673d66 Fix newtype indent in associated type family (#207) 2020-03-13 01:23:17 +01:00
Raoul Hidalgo Charman dfa3fef56c Add support for pattern synonyms 2020-03-08 19:30:23 +00:00
Lennart Spitzner 4b673d1d9d Fix bug in record layouting causing overflows 2020-02-25 17:55:20 +01:00
Lennart Spitzner a3b501051a Add proper multiline layout for type-level-lists 2020-02-23 23:33:03 +01:00
Lennart Spitzner 38cdd15221 Fix moving comment in export list (haddock header) (#281) 2020-02-13 19:05:05 +01:00
Lennart Spitzner 825ec425d4 Improve comments-affecting-layout behaviour for tuples (#231) 2020-02-13 19:04:49 +01:00
Lennart Spitzner 85d55c3768 Print paths of files that would change with --check-mode 2020-02-07 20:03:56 +01:00
Lennart Spitzner 0fdbd51de0 Revert embarrassing debugging leftover that breaks things badly 2020-02-06 20:28:53 +01:00
Lennart Spitzner 5895f954bd Remove dependency on neat-interpolation 2020-02-04 16:14:38 +01:00
Lennart Spitzner f4cff441e2 Merge branch 'release' 2020-02-04 14:12:44 +01:00
Lennart Spitzner f80e777163 Allow neat-interpolation-0.4.* 2020-02-04 14:11:45 +01:00
Lennart Spitzner fad9db8fd8 Autoformat Config.hs 2020-01-23 13:56:25 +01:00
Lennart Spitzner 03e2b62c24 Introduce flag to disable formatting per-module
New inline config `-- brittany-disable` that parses but
ignores the current module. Useful if both brittany
and ghc-exactprint bug out for some syntax.
2020-01-23 13:56:25 +01:00
Lennart Spitzner 7fd2bef440
Merge pull request #273 from lspitzner/error-handling
Error handling
2020-01-23 01:17:07 +01:00
Lennart Spitzner 95686c20cd Merge branch 'master' into error-handling 2020-01-22 22:58:40 +01:00
Lennart Spitzner 128dd828c2 Fix newline issue on comments before where 2020-01-11 23:19:04 +01:00
Lennart Spitzner 2b303b2a20 Fix additional indentation bug for let-in 2020-01-10 16:32:18 +01:00
Lennart Spitzner d0256bb0db Make unknown syntax errors non-fatal/Fall back on exactprint 2020-01-03 11:58:53 +01:00
Lennart Spitzner 342cf16c56 Improve error message printing
- Omit unnecessary show-invocation
- Use showOutputable for the error span (location)

before/after:

  "RealSrcSpan SrcSpanPoint \"stdin\" 2 1: parse error (possibly incorrect indentation or mismatched brackets)"
  stdin:2:1: parse error (possibly incorrect indentation or mismatched brackets)
2020-01-03 11:58:53 +01:00
Lennart Spitzner af227a797d Add a few code comments 2019-12-20 01:20:07 +01:00
Lennart Spitzner 6724760f40 Fix non-idempotent newlines with comment + where (#263) 2019-12-20 01:12:25 +01:00
Lennart Spitzner 434854f8f3
Merge pull request #259 from eborden/datadecl
Data declaration for newtype and records
2019-12-09 22:46:03 +01:00
Lennart Spitzner 00c6854887 Fix two minor data-decl layouting issues 2019-12-09 22:35:26 +01:00
Lennart Spitzner a1282c3ac6 Add a testcase for the last commit 2019-12-09 11:22:43 -07:00
Lennart Spitzner 3fbbf3d661 Fix one misplaced comment bug on data decls 2019-12-09 11:22:43 -07:00
Lennart Spitzner 6c3d9c57c5 Comment the single-line record decl config flag out 2019-12-09 11:22:43 -07:00
Lennart Spitzner 5a49277eba Improve data decl layouting
- Fix bug in BackendUtil/lowest level of brittany about
  alignment being ignored after a comment,
- Properly layout large (more than single-line) types in
  record fields and in data decl rhs arguments,
- Properly layout data decl constructors with large "heads"
  (forall, constraints),
- Add a config flag to control single-line layout of record
  definition,
2019-12-09 11:20:28 -07:00
Evan Rutledge Borden 80f370a8e1 Support nullary data types
Add tests for nullary prefix data types and nullary record data types.
2019-12-09 11:17:32 -07:00
Lennart Spitzner 0381b9fe24 Fix record field comment indentation 2019-12-09 11:17:32 -07:00
Lennart Spitzner c367b1017b Fixup src-literatetests/Main formatting 2019-12-09 11:17:32 -07:00
Evan Rutledge Borden 9494d6203a Allow multi line formatting of normal records
Only single line formatting of normal records was being supported. For
records with long names we need multi line formatting. This also needs
to support both multi and left indentation policies.
2019-12-09 11:17:32 -07:00
Lennart Spitzner a23ef696e8 Fix test failure: DerivingStrategies exists since ghc-8.2 2019-12-09 11:17:32 -07:00
Lennart Spitzner 54f34344b3 Implement #min-ghc keyword for test script 2019-12-09 11:17:32 -07:00
Lennart Spitzner 48490a7110 Fix handling of comment before data-decl
`docWrapNodePrior` caused duplication of offset of `data` keyword
and of comments connected to it.
2019-12-09 11:17:31 -07:00
Evan Rutledge Borden ea9d3bb5b3 Add stack lock file for 8.0.2 2019-12-09 11:17:31 -07:00
Evan Rutledge Borden b2f4262749 Isolate deriving via test 2019-12-09 11:17:31 -07:00
Evan Rutledge Borden aeaa043e99 Support building DataDecl with 8.0.2 2019-12-09 11:17:31 -07:00
Evan Rutledge Borden 9971e3905d Support building DataDecl with 8.2.2 2019-12-09 11:17:31 -07:00
Evan Rutledge Borden dee63517ba Include stack lock files 2019-12-09 11:17:31 -07:00
Evan Rutledge Borden 868b8c61e3 Add a Makefile for easy testing many version
The `Makefile` includes `stack test` configurations to support building
versions of `brittany` with supported versions of `ghc`. Each version
uses a separate `.stack-work` directory to allow minimal compilation on
each change.
2019-12-09 11:17:31 -07:00
Lennart Spitzner 2f6967b7b8 Support comments in record data decls 2019-12-09 11:17:31 -07:00
Lennart Spitzner d21ecf89e6 Fix a comment bug in tuple-type layouting 2019-12-09 11:17:31 -07:00
Lennart Spitzner 208a1ceadb Start making datadecls work with ghc-8.4 2019-12-09 11:17:31 -07:00
Evan Rutledge Borden 57ba88a73c Work-in-progress add record declaration layout
Simple records are supports. The tests cover:

- single records
- multi-field types
- columnized alignment
- basic deriving
- deriving strategies
- existential quanitification

A few items block merger

- retaining comments

A few items can be deferred:

- normal types
- sum types
2019-12-09 11:17:31 -07:00
Lennart Spitzner 4f827491da Work-in-progress commit (deriving clause..) 2019-12-09 11:17:31 -07:00
Lennart Spitzner 172866755c Start impl. layouting for datatypes (#12)
Only newtypes work for now; the "interesting" data records
are not touched yet.

Comment insertion not really considered yet; probably needs work.
2019-12-09 11:17:31 -07:00
Lennart Spitzner f8892d41d4 Bump to 0.12.1.1; Update changelog 2019-12-09 13:38:26 +01:00
Lennart Spitzner e24271318d Improve record-expression layouting
- Finish consolidation, clearing a TODO
- Fix two comment placement issues around record wildcards
- Fix regression in brittany-0.12 about layouting large
  (multiline) record field updates
2019-12-05 14:30:50 +01:00
Lennart Spitzner f87c0c64b8 Implement experimental semicolon-into-newlines feature 2019-12-04 13:55:41 +01:00
Lennart Spitzner 77d6d5b553 Fix roundtripping of (~) constraint/type 2019-11-27 22:21:16 +01:00
Lennart Spitzner 41750dc8a8 Add doc chapter on exactprinting, plus minor doc fixups 2019-11-18 11:26:18 +01:00
Lennart Spitzner 974826f98f Fix whitespace regression on forall+constraint type sig 2019-11-08 12:11:35 +01:00
Lennart Spitzner 9d0669d6a6 Fix typo in ChangeLog.md 2019-11-08 12:07:41 +01:00
Lennart Spitzner 38f77f6c5e Update stack.yaml to allow compilation with ghc-8.8 2019-09-29 23:24:29 +02:00
Lennart Spitzner 17055479d3 Try fixing CI, ghc-8.8 seems to use more heap 2019-09-29 23:24:05 +02:00
Lennart Spitzner 89b7655bac Fix support for ghc-8.8 2019-09-29 21:45:46 +02:00
Lennart Spitzner 3482f6a36d Bump semigroups dependency bound 2019-09-29 18:24:13 +02:00
Lennart Spitzner b656b8cc27 Bump to 0.12.1.0; Update changelog 2019-09-29 18:19:48 +02:00
Lennart Spitzner a98d643a62 Disable perf test by default via new cabal flag 2019-09-29 14:08:27 +02:00
Lennart Spitzner 0795a39806 Fix infix matches with more than 2 args, fixes #219 2019-09-19 00:48:59 +02:00
Lennart Spitzner 6879436e67 Fix lambdas with lazy/bang pattern as first argument 2019-09-03 01:10:38 +02:00
Lennart Spitzner 702b993dab Fix prefix operator pattern-match invalid result 2019-09-03 00:23:58 +02:00
Lennart Spitzner 8861f16624 Fix comment handling with let-in 2019-09-02 17:04:44 +02:00
Lennart Spitzner 670b796edb Add ghc-8.8.1 to travis script 2019-09-02 17:04:44 +02:00
Lennart Spitzner 91d6e18aba Adapt to ghc-8.8 (deps are not ready though) 2019-09-02 17:04:44 +02:00
Lennart Spitzner c97f6dd559 Update cabal instructions 2019-09-02 13:58:35 +02:00
Lennart Spitzner f289389879 Fix comment wandering left inside instance decls 2019-08-28 14:48:11 +02:00
Lennart Spitzner 698356a880 Increase the timeout of one of the perf-tests 2019-08-28 14:23:33 +02:00
Lennart Spitzner 4de2862a04 Add commandline flag --no-user-config
Stops brittany from trying to read a user-global config
flag. Together with --config-file, this can be used to pass
one single config to brittany, thereby controlling exactly
and explicit what the inputs of brittany are.
Should be useful for testing stuff that might depend on
config.
2019-08-28 14:23:33 +02:00
Lennart Spitzner 033fdc6517 Apply brittany to Main.hs 2019-08-28 14:23:33 +02:00
Lennart Spitzner bd10c3c4ef Update copyright in commandline notices 2019-08-28 14:23:33 +02:00
Taylor Fausak b769d4aed3
Merge pull request #252 from MazeChaZer/patch-1
README: Fix typo
2019-08-22 08:02:02 -04:00
Jonas Schürmann c36ecd4718
README: Fix typo 2019-08-22 12:53:17 +02:00
Lennart Spitzner 5bf295d082
Merge pull request #247 from pepeiborra/master
Add support for Implicit Params
2019-07-24 00:09:35 +02:00
Lennart Spitzner 6c69388d73
Make errors more descriptive
This is defensive against GHC API guarantees.
2019-07-19 00:12:04 +02:00
pepe iborra a79b5e1a4b Add support for Implicit Params
I don't know what I'm doing, but it type checks

Closes #246
2019-07-14 23:31:11 +01:00
Evan Borden 988d5b4353
Add support for OverloadedLabels
`OverloadedLabels` is a simple enough extension to parse and format. It
is becoming more common with use of `generic-lens`. Since it can be
treated as a `HsVar` its implementation only requires using `docLit`,
along with some marshalling for dealing with `FastString`.
2019-06-23 19:31:05 -05:00
Lennart Spitzner 56f93ba3bb readme: Update paragraph on maintenance/contribution 2019-06-18 15:38:19 +02:00
Lennart Spitzner c818cdae52 Update copyright notice in readme also 2019-06-17 22:39:02 +02:00
Lennart Spitzner b2d8a1ed51 Bump to 0.12.0.0, Update copyright, readme, changelog 2019-06-17 10:54:33 +02:00
Lennart Spitzner 3288ef3bd4 For funs with multiple matches, use the match id as id (fixes #234) 2019-06-16 22:51:18 +02:00
Lennart Spitzner b95bc09a9d Bump upper bound to hspec<2.8 2019-06-12 12:58:08 +02:00
Lennart Spitzner 2b95e747cd Update stack.yaml to allow testing nightly again 2019-06-12 10:44:09 +02:00
Lennart Spitzner 42f566b94a Support QuasiQuotation-splices 2019-06-12 09:17:21 +02:00
Lennart Spitzner 305f98fad7 Update .travis.yml for current ghc versions 2019-06-06 00:34:17 +02:00
Lennart Spitzner 42b9ddaf0f Merge pull request #222 from tchajed/stack-13.14-compat 2019-06-06 00:25:13 +02:00
Lennart Spitzner 3e1938aa7f Merge branch 'master' into stack-13.14-compat
# Conflicts:
#	brittany.cabal
2019-06-05 22:54:18 +02:00
Lennart Spitzner e9a37242ae
Merge pull request #230 from alanz/master
Allow ghc-exactprint-0.6.1
2019-06-05 22:48:29 +02:00
Lennart Spitzner 078f666fd6
Merge pull request #221 from hackeryarn/patch-1
Added Emacs to Editor Integration
2019-06-05 22:46:10 +02:00
Lennart Spitzner 517eda8526 Merge pull request #216 from matt-noonan/master 2019-06-05 22:41:22 +02:00
Lennart Spitzner 4f2673a2eb
Merge pull request #215 from matt-noonan/multiline-app-with-comments
Disable single-line HsApp with argument comments.
2019-06-05 21:06:02 +02:00
Lennart Spitzner f9d70cf546 Refactor CPP slightly, Add test-cases 2019-06-05 21:05:27 +02:00
Lennart Spitzner 09a227fcce Add quick regression-test for fixed issue 2019-06-05 20:12:28 +02:00
Lennart Spitzner 77032326ae
Merge pull request #213 from bsima/nix-build
Add build instructions for nix
2019-06-05 20:07:38 +02:00
Lennart Spitzner 059bb9402e Merge pull request #198 from ruhatch/type-synonyms 2019-06-05 15:56:50 +02:00
Lennart Spitzner ca3c8b6f9e Add one source doc 2019-06-05 15:56:32 +02:00
Lennart Spitzner bd8b743e36 Document terminology "regular comments" 2019-06-05 15:42:47 +02:00
Alan Zimmerman d161648f24 Allow ghc-exactprint-0.6.1 2019-06-02 22:53:00 +02:00
Tej Chajed ffc1e6918c
Add stack configuration for GHC 8.6 2019-05-31 17:00:38 -04:00
Artem Chernyak ff7dca9bb5
Added Emacs to Editor Integration 2019-03-12 21:29:12 -05:00
Matt Noonan 8551600377 Explicitly handle empty HsCase and HsLamCase. 2019-02-04 22:56:46 -05:00
Matt Noonan 6aa537089d Disable single-line HsApp with argument comments. 2019-02-04 15:10:55 -05:00
Ben Sima e67a46f264 Refactor nix expressions
This way, the default.nix file can be imported to other projects. In order to
build brittany, we now need to do `nix build -f release.nix`, which will
pull in the version overrides from shell.nix.
2019-01-29 14:07:08 -08:00
Ben Sima f68fbb3118 Add build instructions for nix 2019-01-26 10:55:29 -08:00
Lennart Spitzner 6c187da8f8 Fix cabal file for doc project 2018-11-30 22:13:02 +01:00
Lennart Spitzner 784e4d0aed Fix prelude.inc handling in .cabal to make new-install work
Hopefully fixes both #162 and #200.
2018-11-30 00:18:54 +01:00
Lennart Spitzner 621e00bf3f Fix indentation (comments) after "if" (Fixes #167) 2018-11-14 14:53:08 +01:00
Rupert Horlick 01e31b4256
Add type fam instance formatting 2018-11-13 17:07:27 -04:00
Lennart Spitzner 1290e8cd27 Bump CI ghc versions (8.4.3->8.4.4, 8.6.1->8.6.2) 2018-11-12 19:00:21 +01:00
Lennart Spitzner 2fb8871d70 Merge branch 'ghc-8.6' 2018-11-12 18:58:16 +01:00
Lennart Spitzner e7d8f59e93 travis-ci: Add ghc-8.6, Clean up a bit 2018-11-04 22:14:02 +01:00
Lennart Spitzner 34735e27ef Add compat with GHC-8.6 API 2018-11-04 22:14:00 +01:00
Lennart Spitzner 9d915232c0 Merge branch 'where-newlines' 2018-11-04 19:23:50 +01:00
Lennart Spitzner 2eb22e730f Add tests for empty lines around where 2018-11-04 18:13:37 +01:00
Lennart Spitzner 522e40c8ed Retain empty lines before "where"
only applies to local "where"s (not module..where)
2018-11-04 18:13:37 +01:00
Lennart Spitzner 268cd333f3
Merge pull request #189 from ruhatch/type-synonyms
Add type synonym formatting
2018-11-04 18:05:29 +01:00
Lennart Spitzner ad5868eb76 Fix spacing bugs, Clean up implemenation
- Normalize spaces on type alias lhs. unnecessary spaces were
  retained previously, e.g.
  "type   (   (   a  :%:   b   ) c   ) = (a , c)"
  had non-optimal output
- Clean up separator usage
- Remove backend hacks (to some degree)
- Minor reformatting and premature optimization
2018-10-27 16:15:28 +02:00
Rupert Horlick e7d8b5f1ab
Fix type synonym comments 2018-10-19 15:55:29 -04:00
Rupert Horlick b249c10054
Deal with parens inside comments on 8.4.3 2018-10-17 17:01:31 -04:00
Rupert Horlick e1b43531a8
Add type synonym formatting 2018-10-16 19:28:30 -04:00
Lennart Spitzner d769f30c15 travis: Prevent duplicate compilation 2018-10-14 18:25:39 +02:00
Lennart Spitzner 9de3564e00 travis: Apply fix to stack and new-build too 2018-10-14 00:56:35 +02:00
Lennart Spitzner 818768cd4b
Merge pull request #187 from ruhatch/master
Add instance formatting, defaulting to ExactPrint in places
2018-10-14 00:46:53 +02:00
Lennart Spitzner 11dc30fbe1 Fix travis setup once more 2018-10-13 23:57:37 +02:00
Lennart Spitzner 38216cdc02 Add longer doc/Refactor stripWhitespace' 2018-10-11 20:14:29 +02:00
Rupert Horlick 66fd44058d
Add instance formatting for simple case 2018-10-10 14:32:58 -04:00
Lennart Spitzner 6dc5561d08
Merge pull request #186 from sergv/unboxed-tuples
Unboxed tuples
2018-09-30 21:19:15 +02:00
Lennart Spitzner 04f441205d Try fix travis new-build test failure with a -j1 2018-09-24 00:09:01 +02:00
Lennart Spitzner 71efa54954 Move tests, minor Refactoring, Add comments 2018-09-23 23:32:05 +02:00
Lennart Spitzner 460bd4dd2b
Merge pull request #185 from 5outh/benjamin/file-name-errors
Append input path name to UnknownNode errors
2018-09-23 22:29:42 +02:00
Sergey Vinokurov 9755db1d05
Unify "(#", "#)" under single name, docParenHashL and docParenHashR 2018-09-18 09:14:20 +01:00
Sergey Vinokurov 6898d3ef44
Lay out unboxed tuples in types 2018-09-18 09:07:15 +01:00
Sergey Vinokurov 281d7a2f81
Lay out unboxed tuples with spaces
This avoids clashes with names like foo#
2018-09-18 09:07:13 +01:00
Sergey Vinokurov 9d7cecaa92
Run tests in prallel 2018-09-17 23:54:56 +01:00
Lennart Spitzner 37e4225c49 Include exact location when printing ErrorUnknownNode 2018-09-18 00:23:23 +02:00
Lennart Spitzner 48482c59a6
Merge pull request #184 from eborden/consolidate-record-expression-layouter
Consolidate record expression layouter
2018-09-17 23:40:47 +02:00
5outh b2795482fa Append input path name to UnknownNode errors 2018-09-17 14:32:20 -04:00
Evan Rutledge Borden 92a1d89983 Consolidate record expression layouter
Both record construction and record layouting have very similar
constructions. These each had their own layouter with slightly different
variations. Variations here lead to subtley different bugs in layout for
nearly identicle syntactic forms.

The record update logic is more advanced and respects `IndentPolicyLeft`.
Instead of keeping these layouters distinct we can consolidate
construction logic into the update logic. This results in a smaller
volume of code and more uniform layouting of syntax for these simlilar
forms.

Record constructors with fields and wildcards are not included in this
consolidation. A TODO has been left to handle this consolidation later.
2018-09-16 15:47:04 -04:00
Lennart Spitzner 932cf70f9b Fix stack yamls for ghc-exactprint bounds 2018-09-13 22:47:25 +02:00
Lennart Spitzner 393258036f Bump bounds to ghc-exactprint-0.5.8 to include pkg-env innoculation 2018-09-13 22:09:12 +02:00
Lennart Spitzner 34e303ae43
Merge pull request #179 from alanz/master
Allow ghc-exactprint 0.5.7.1
2018-09-12 23:25:59 +02:00
Lennart Spitzner 9ae790ede1 Fix .travis script: Prevent duplicated build 2018-09-12 23:22:16 +02:00
Alan Zimmerman 989364093c Allow ghc-exactprint 0.5.7.1 2018-09-12 22:01:43 +02:00
Lennart Spitzner 5e96ae8776
Merge pull request #178 from mightybyte/check-mode
Add check mode for use by test suites
2018-09-11 20:26:49 +02:00
Doug Beardsley 3729a57196 Add check mode for use by test suites
This mode makes no changes to files, but returns 0 (success) when no
changes would be made and 1 (failure) when changes would be made.
2018-09-11 01:25:35 -04:00
Lennart Spitzner 8c5cce5070 Prevent package environment file GHC API stupidities
This fixes the code-path for the commandline interface
(unfortunately not covered by our testsuite).
The other code-path should be covered by the changes in
https://github.com/alanz/ghc-exactprint/pull/68.
2018-08-20 21:19:10 +02:00
Lennart Spitzner 33a4039751
Merge pull request #171 from ChickenProp/fix-type-operator-imports
Fix imports of type operators.
2018-08-19 15:20:06 +02:00
Phil Hazelden a5a24b4220 Fix imports of type operators.
Previously, we could only import a type operator with no subsequent
list, i.e.

    import Foo ( (:.) )

was fine, but

    import Foo ( (:.)(..) )
    import Foo ( (:.)((:.) )
    import Foo ( (:.)(A, b) )

would all break. Brittany would attempt to output them as

    import Foo ( :.(..) )
    import Foo ( :.((:.) )
    import Foo ( :.(A, b) )

I believe the problem was that although `ieName <$> lie` was returning
an `IEWrappedName` with the same contents as used in `layoutWrapped`,
it had different location annotations; and the parentheses are
apparently saved in the location annotations.
2018-08-10 10:01:11 +01:00
Lennart Spitzner 8c5e0ef3b6
Merge pull request #168 from robx/patch-1
Fix a brittany misspelling
2018-08-08 14:12:53 +02:00
Robert c303e45f16
Fix a brittany misspelling 2018-08-06 14:05:10 +02:00
Lennart Spitzner 0aaedb7601
Merge pull request #160 from Tehnix/patch-1
Add note about Atom editor integration in README, fixes #62
2018-07-16 00:31:24 +02:00
Christian Kjær 0c324b19ec
Add note about Atom editor integration in README, fixes #62 2018-07-09 14:29:49 +02:00
Lennart Spitzner 4497fa927f Add a comment about one superfluous docSetParSpacing 2018-07-06 22:57:33 +02:00
Lennart Spitzner ab27825b7b Core layouting algo improvement (non-bottom more effective)
During alt-transform, when gather spacings, previously
we tracked different non-bottom spacings separately even
though they would be treated in the same way during any
future transformations (apart from certain exceptions that
don't practically give better results). Instead we now
merge such spacings into one, giving more space for other
spacings when pruning to the spacings limit.
2018-07-06 22:41:31 +02:00
Lennart Spitzner 3c5670d5cd Fix layouting for OpApps with comments (fixes 159) 2018-07-05 21:31:28 +02:00
Lennart Spitzner 95f42061d2 Fixup for the fix of ExplicitNames/PatternSynonyms for ghc-8.0 2018-07-04 22:42:20 +02:00
Lennart Spitzner d01572ecf4 Switch CI to use ghc-8.4.3 instead of 8.4.1 2018-07-04 22:04:45 +02:00
Lennart Spitzner ab389fe66f Support for -XExplicitNamespaces and -XPatternSynonyms
Properly round-trip export items of the forms "type OPERATOR"
or "pattern SYNONYM"

fixes #158
2018-07-04 21:42:46 +02:00
Lennart Spitzner 0b40dd7c32 Fix deprecation warnings with latest versions of yaml 2018-07-04 21:14:06 +02:00
Lennart Spitzner 4cb3b96f07 Merge branch 'release' 2018-06-20 23:18:21 +02:00
Adam Bergmark 0bcab7c7b3 Allow aeson 1.4.* 2018-06-20 23:14:24 +02:00
Lennart Spitzner b37732d658
Fix README.md installation command 2018-06-20 22:33:46 +02:00
Lennart Spitzner d398fbe7be
Merge pull request #153 from bergmark/aeson
Allow aeson 1.4.*
2018-06-20 22:31:34 +02:00
Adam Bergmark 5ed4612107 Allow aeson 1.4.* 2018-06-18 03:14:39 +02:00
Lennart Spitzner cc0718e964 Add indentation to import-hiding-paragraph 2018-06-04 18:18:44 +02:00
Lennart Spitzner 5816704658 Fix import-hiding-paragraph with policy/=free (fixes #150) 2018-06-04 17:30:50 +02:00
Lennart Spitzner 6725d0e119 Refactor/Auto-format Main, Brittany.Internal 2018-06-04 17:10:10 +02:00
Lennart Spitzner 57c48f64c1 Apply inline config to module header (fixes #151) 2018-06-04 16:57:07 +02:00
Lennart Spitzner bdee27cb59 Add spaces around record braces (single-line) (fixes #126) 2018-05-25 17:57:54 +02:00
Lennart Spitzner ef7b0fcc70 Add test for #144 2018-05-16 21:25:40 +02:00
Lennart Spitzner f75127b3a5 Make non-bottom-spacing affect sameline, too (fixes #144) 2018-05-16 21:19:36 +02:00
Lennart Spitzner 1cab9be7ed Merge branch 'release' 2018-05-10 17:55:03 +02:00
Lennart Spitzner f5b5fe9f74 Bump aeson upper bound 2018-05-10 17:52:15 +02:00
Lennart Spitzner ac0a5bd7c7
Merge pull request #141 from leonschoorl/fix-readme-link
Fix link to README.md
2018-05-07 13:53:26 +02:00
Leon Schoorl 82b59299cb Fix link to README.md 2018-05-07 11:59:40 +02:00
Lennart Spitzner 8bda9827b8 Amend changelog
[ci skip]
2018-05-01 23:31:07 +02:00
Lennart Spitzner a42bf2e03f Merge branch 'IndentPolicyMultiple' 2018-05-01 23:26:05 +02:00
Lennart Spitzner 4973298f30 Support same-line let decl when indentAmount>=4 2018-05-01 23:21:31 +02:00
Lennart Spitzner dd53948a23 Fix IndentPolicyMultiple for indentAmount>4 2018-05-01 23:21:09 +02:00
Lennart Spitzner e91bb6aec9 Clean up IndentPolicyMultiple 2018-05-01 23:19:44 +02:00
Bryan Richter 9ab17cc899 Implement IndentPolicyMultiple 2018-05-01 22:07:05 +02:00
Bryan Richter 004dee73e0 Add test for IndentPolicyMultiple 2018-05-01 22:07:03 +02:00
Lennart Spitzner 601dd05be6 Change test file name 2018-05-01 21:45:31 +02:00
Lennart Spitzner d40b840980 Amend changelog (issue 89 fix)
[ci skip]
2018-05-01 17:20:37 +02:00
Lennart Spitzner 03fd81f851 Update Readme and copyright dates
[ci skip]
2018-05-01 17:13:45 +02:00
Lennart Spitzner 031df539b3 Prepare release (bump to 0.11.0.0, changelog) 2018-05-01 17:09:31 +02:00
Lennart Spitzner 929e465fd4 Refactor a bit (Internal.ppDecl -> Decl.layoutDecl) 2018-04-25 20:17:36 +02:00
Lennart Spitzner e9aacb27ff Implement hacky workaround for issue 89 2018-04-25 19:54:35 +02:00
Lennart Spitzner a237e591b2 Implement `--obfuscate`
Support replacing all (non-keyword) identifiers with
randomly generated characters
2018-04-24 00:47:50 +02:00
Lennart Spitzner 696f72d336 Fixup last two commits (tests were effectively disabled
- re-enable tests
- un-break tests by fixing the alignment code behaviour
2018-04-24 00:38:40 +02:00
Lennart Spitzner 315a7e1ee1 Fix overflowing due to alignment; Add docs (alignment algorithm) 2018-04-23 19:33:04 +02:00
Lennart Spitzner caeb42c020
Merge pull request #136 from lspitzner/inlineconfig
Inlineconfig
2018-04-22 15:18:28 +02:00
Lennart Spitzner 280b70f6bd Undo adding -j ghc-option in brittany.cabal 2018-04-19 18:08:07 +02:00
Lennart Spitzner 18704e403f Fix inline disabling of brittany 2018-04-19 17:09:10 +02:00
Lennart Spitzner 17fb271694 Fix inlineconfig additions for ghc-8.4 + compat
The semigroup changes are a bit confusing when aiming
for backwards-compat.
2018-04-17 21:45:38 +02:00
Lennart Spitzner 1fc007591c Merge branch 'master' into inlineconfig
# Conflicts:
#	src/Language/Haskell/Brittany/Internal.hs
2018-04-17 20:05:33 +02:00
Lennart Spitzner 2a8a752a59 Fix stack.yamls 2018-04-17 20:04:40 +02:00
Lennart Spitzner e559a2cbf7 Implement inline configuration
e.g. "-- brittany --indent=4"

respects the following comment forms as input:

  source comment                       affected target
  ======================================================
  "-- brittany CONFIG"                 whole module
  "-- brittany-next-binding CONFIG"    next binding
  "-- brittany-disable-next-binding"   next binding
  "-- brittany @ myExampleFunc CONFIG" `myExampleFunc`

multiline-comments are supported too, although
the specification must still be a single line. E.g.

  "{- brittany --columns 50 -}"

CONFIG is either:

  1) one or more flags in the form of what brittany accepts
     on the commandline, e.g. "-- columns 50", or
  2) one or more specifications in the form of what brittany
     accepts in its config files for the layouting config
     (a one-line yaml document), e.g. "{ lconfig_cols: 50 }"

see #30
2018-04-17 20:04:40 +02:00
Lennart Spitzner 10e1c19788 Add support for ghc-8.4 2018-04-17 17:50:41 +02:00
Lennart Spitzner ac76b69127 Permit stack.yaml failure in travis 2018-04-17 17:08:21 +02:00
Lennart Spitzner 3785d15c2a Bump some upper bounds, Remove unneeded dep 2018-04-17 16:53:33 +02:00
Lennart Spitzner ad744b0247 Fix stack.yaml 2018-04-17 16:24:58 +02:00
Lennart Spitzner 213e82b476 Fix if-then-else paragraph layouting 2018-04-17 06:19:13 +02:00
Lennart Spitzner ae162403ae Support multistate-0.9 (ghc-8.4 preparation) 2018-04-13 22:13:15 +02:00
Lennart Spitzner e79af18fb6 Omit file write if file is unchanged (fixes #93) 2018-04-09 00:29:58 +02:00
Lennart Spitzner 8b67a028ea Do not put `where` on newline when no export list
(even when lconfig_allowSingleLineExportList False)
2018-04-09 00:09:07 +02:00
Lennart Spitzner 21ef8b296c Adapt for czipwith-1.0.1.0 2018-04-05 21:06:44 +02:00
Lennart Spitzner e0e1e5038e Add some stuff to .gitignore 2018-04-05 21:06:02 +02:00
Lennart Spitzner 62d066d496 Un-ignore coreIO error-numbers when processing one file only 2018-04-05 21:05:19 +02:00
Lennart Spitzner 24886e818a
Merge pull request #132 from sergv/master
Fix some hlint suggestions and Replace docAltFilter
2018-04-04 06:50:48 +02:00
Sergey Vinokurov 7ffa58976f
Clean up duplicate ghc-options from cabal file 2018-04-03 22:55:57 +01:00
Sergey Vinokurov 9bd3bfbe4c
Review suggestions 2018-04-03 22:49:06 +01:00
Sergey Vinokurov 049f286e6f
Add .hlint.yaml 2018-04-02 22:47:07 +01:00
Sergey Vinokurov 7a60229673
Fix some hlint hints 2018-04-02 22:44:49 +01:00
Sergey Vinokurov 631d9e181d
Replace 'fmap f $' with 'f <$>' 2018-04-02 22:44:49 +01:00
Sergey Vinokurov 545eff9e4f
Remove redundant parens 2018-04-02 22:42:06 +01:00
Sergey Vinokurov 226da07815
Improve vertical alignment 2018-04-02 22:41:15 +01:00
Sergey Vinokurov 0dad5051df
Remove redundant '$'s 2018-04-02 22:41:14 +01:00
Sergey Vinokurov 2ed9a13fdb
Replace 'docAltFilter' with 'runFilteredAlternative' 2018-04-02 21:25:44 +01:00
Sergey Vinokurov 8410fbff8e
Trailing whitespace 2018-04-02 21:25:44 +01:00
Sergey Vinokurov e9689394b1
Add Semigroup instance for 'Max' monoid
Otherwise ghc 8.4 will complain since Semigroup became a superclass
of Monoid.
2018-04-02 21:25:43 +01:00
Lennart Spitzner b43ee43220 Fix/Implement empty type constraint handling (fixes #133) 2018-04-02 17:11:53 +02:00
Lennart Spitzner b219a23684 Fix warning about brittany.cabal (cabal-version-specification) 2018-04-02 16:35:28 +02:00
Lennart Spitzner e9f764e0e7 Add showcase for IndentPolicyLeft 2018-03-25 18:07:19 +02:00
Lennart Spitzner f8c93e06f4 Add showcase for module layouting
[ci skip]
2018-03-25 17:48:59 +02:00
Lennart Spitzner b142837f1a Remove old bug notice from README.md
[ci skip]
2018-03-25 16:58:17 +02:00
Lennart Spitzner 8cabd08477 Update README.md and commandline description 2018-03-25 16:06:36 +02:00
Lennart Spitzner 3b20d0275e Bump to 0.10.0.0, Add Changelog 2018-03-23 19:32:30 +01:00
Lennart Spitzner 0845142727 Fix let-in comment placement bug (fixes #110) 2018-03-23 17:34:36 +01:00
Lennart Spitzner bdd3b155f3 Fix HsPar comment placement bug (see #111) 2018-03-23 17:11:39 +01:00
Lennart Spitzner 3847325fd5 Omit single-line layout for OpApp with comments (fixes #111) 2018-03-23 17:02:58 +01:00
Lennart Spitzner a003b932a9 Fix comments in tuples being dropped (fixes #37) 2018-03-23 16:55:28 +01:00
Lennart Spitzner d634d34ff1 Fix module-import-hiding-items layout 2018-03-23 15:41:41 +01:00
Lennart Spitzner 90a2f65ba7 Align applications on for same function, plus minor fixup
Arguments of two function applications will only be aligned
if the same function is called in both cases.

The column transform was altered slightly to fix #65
properly as well.

fixes #65, #128
2018-03-22 01:19:56 +01:00
Lennart Spitzner 46de13256b Add one more testcase 2018-03-21 16:03:38 +01:00
Lennart Spitzner 487c32175a Refactor Alt.hs and Add out-commented alternative 2018-03-21 16:03:38 +01:00
Lennart Spitzner f1536b8966 Merge pull request #83/#124 from sniperrifle2004/import 2018-03-21 01:06:26 +01:00
Lennart Spitzner 8de56ba11d Support import column vs import-as column 2018-03-21 01:02:44 +01:00
Lennart Spitzner 1330aeb6b4 Fix ticked type operator losing tick (fixes #125) 2018-03-13 23:51:22 +01:00
Lennart Spitzner 60775bbc62 Switch stack.yaml resolver to lts-11.0 2018-03-13 23:24:05 +01:00
Lennart Spitzner a1c832e85c Merge pull request #121 from AlexeyRaga/PR-expose-read-configs
# Conflicts:
#	stack.yaml
2018-03-13 22:45:18 +01:00
Lennart Spitzner c0ea20455c Fixup haddock typos 2018-03-13 22:38:27 +01:00
Lennart Spitzner 4b12115712 Merge branch 'master' into import 2018-03-12 19:47:20 +01:00
Lennart Spitzner 2128f7b3fb Fixup stack.yaml 2018-03-12 18:28:10 +01:00
Lennart Spitzner 15d2250c0b Change _lconfig_importColumn default: 60 -> 50 2018-03-12 17:21:28 +01:00
Lennart Spitzner 833ac95fd7 Add two config options to control preamble layouting 2018-03-12 17:11:25 +01:00
Lennart Spitzner 9531edb2a7 Improve module layouting in two aspects
- IEThingWith in export list can now be single-line
- Now respect offset of the "module" keyword
  (retain empty lines after pragmas, for example)
2018-03-12 16:29:47 +01:00
Lennart Spitzner 20f9c009ee Stop hanging indent for IEThingWith
plus minor refactors/cleanups

this is more in line with IndentPolicyLeft and imo also looks
nicer in general
2018-03-11 22:49:20 +01:00
Lennart Spitzner af7f9017b8 Fix Alt-transformation bug with BDFEnsureIndents
multiple BDFEnsureIndent nodes were mistreated previously
2018-03-11 22:07:12 +01:00
Lennart Spitzner 41a60ce60f Merge branch 'master' into import 2018-03-11 17:43:16 +01:00
alexeyraga 83b39de3d4 Expose readConfigs 2018-03-07 21:56:52 +11:00
Lennart Spitzner e4dea87839 Switch to using branches master/release instead of dev/master 2018-03-04 19:11:10 +01:00
Lennart Spitzner 44af042436 Merge branch 'release' 2018-03-04 19:03:11 +01:00
Lennart Spitzner 19e31fdaf2 Improve layouting of RecordUpd, Fix minor issue for HsLet 2018-02-19 21:33:43 +01:00
Lennart Spitzner c124336738 Fix NOINLINE pragma layouting 2018-02-19 17:17:39 +01:00
Lennart Spitzner 4dd28e5052
Merge pull request #120 from MaxGabriel/patch-1
Fix spelling of my name
2018-02-14 18:24:46 +01:00
Lennart Spitzner 34036cbb74 Merge branch 'dev' 2018-02-14 17:30:25 +01:00
Lennart Spitzner bac69ba54f Bump to 0.9.0.1, Add changelog 2018-02-14 17:18:22 +01:00
Lennart Spitzner 4b53072ccd Correct some commandline help output 2018-02-14 17:18:15 +01:00
Maximilian Tagher f17d9f8bf6
Fix spelling of my name 2018-02-14 06:54:39 -08:00
Lennart Spitzner c28636adca Add ghc-exactprint-0.5.6.0 to extra-deps in stack.yaml 2018-02-14 15:20:22 +01:00
Lennart Spitzner c28ec4cfdf Bump butcher version in stack-8.0.2.yaml 2018-02-14 14:42:26 +01:00
Lennart Spitzner 81928ea597 Switch to ghc-exactprint-0.5.6.0, Remove code duplication 2018-02-14 01:14:24 +01:00
Lennart Spitzner 55b1c71bf3 Fix a layouting mistake that went unnoticed so far 2018-02-14 01:00:01 +01:00
Lennart Spitzner 91de1ca08c Fix bang deletion on ghc-8.2, Add testcase (fixes #116) 2018-02-13 23:48:00 +01:00
Lennart Spitzner 779a23c380
Update README.md: Conf file discovery description 2018-02-13 20:32:19 +01:00
Lennart Spitzner d749c0da27 Prevent crash if ~/.config does not exist (fixes #115) 2018-02-13 20:06:31 +01:00
Lennart Spitzner 8430b74b1a Switch to butcher-1.3, Improve help layout, fixes #103 2018-02-13 20:05:48 +01:00
Lennart Spitzner 70404a81f3 Merge branch 'master' into dev 2018-02-13 17:29:12 +01:00
Lennart Spitzner 43e79bb174 Merge pull request #107 from eborden/infix-constructor-pattern-match
Fix infix constructor pattern matching for normal constructors
2018-02-13 17:28:26 +01:00
Lennart Spitzner 077b93db01 Minor refactor 2018-02-09 16:50:57 +01:00
Evan Rutledge Borden eb8f0de6c3 Remove redundant import. 2018-02-09 16:43:59 +01:00
Evan Rutledge Borden 019d47bf7e Change infix patterns to include spaces
This commit changes infix patterns to utilize `lrdrNameToTextAnn`. This
function allows the logic to avoid introspecting on the constructor
name.

Additionally this adds spaces to all infix operator pattern matches.
Previously infix symbols did not include spaces:

```
foo (x:xs) = _
```

Now they include a space

```
foo (x : xs) = _
```
2018-02-09 16:43:44 +01:00
Evan Rutledge Borden 18b3cfaf88 Fix infix constructor pattern matching for normal constructors
Brittany was previously only support symbol based infix constructors. It
is common in some libraries (for example Esqueleto) to pattern match on
normal constructors as infix. Brittany was failing in this case by not
wrapping the constructor name in back ticks/spaces. Backticks and spaces
have been added in the case where the constructor contains any alpha
characters.
2018-02-09 16:43:29 +01:00
Lennart Spitzner 7255ecdbd2
Merge pull request #117 from jez/patch-1
Readme: Add Vim / Neovim plugin
2018-02-03 22:16:16 +01:00
Jake Zimmerman d086140120
Add Vim / Neovim plugin
I saw that you started an editor integration section, and
thought that it might benefit from a Vim / Neovim section \o/

Thanks for this program by the way!
2018-01-24 15:19:04 -08:00
Lennart Spitzner 3d1b104dce
Merge pull request #108 from eschnett/patch-3
Correct wording of warning message
2018-01-16 00:37:26 +01:00
Erik Schnetter b46f9dd23b
Correct wording of warning message
"certain" -> "some"
2018-01-15 18:11:50 -05:00
Lennart Spitzner 25ff576dc3
Merge pull request #97 from eborden/let-in-on-single-lines
Format let and in on a single line if they fit
2018-01-13 21:39:11 +01:00
Lennart Spitzner 399e2f4f43 Minor cleanups 2018-01-13 18:41:51 +01:00
Lennart Spitzner e788ac9afd Minor fixup in Main.hs for next butcher release 2018-01-13 18:31:39 +01:00
Lennart Spitzner 37bc36f10a
Update README.md 2018-01-13 18:05:21 +01:00
Lennart Spitzner 8fe9ba1f43
Update readme: Add editor integration paragraph 2018-01-13 18:02:00 +01:00
Evan Rutledge Borden cab1297585 Change function name to if/else 2017-12-31 00:11:10 -05:00
Evan Rutledge Borden f1b49b082f Format let and in on a single line if they fit
The following is wasteful of vertical space:

```
_ =
  let
    longIdentifierForShortValue = 1
  in
    longIdentifierForShortValue + longIdentifierForShortValue
```

We should format it on two lines if possible.

```
_ =
  let longIdentifierForShortValue = 1
  in longIdentifierForShortValue + longIdentifierForShortValue
```

This commit also allows for a mix of variations:

```
_ =
  let
    longIdentifierForShortValue = 1
  in longIdentifierForShortValue + longIdentifierForShortValue

_ =
  let longIdentifierForShortValue = 1
  in
    longIdentifierForShortValue + longIdentifierForShortValue
```
2017-12-31 00:04:53 -05:00
Lennart Spitzner 37e355fea5 Support hanging type signature config option 2017-12-28 21:38:31 +01:00
Lennart Spitzner 43abab2dd2 Remove space after opening parenthesis (fixes #87) 2017-12-28 20:46:03 +01:00
Lennart Spitzner 96b3a3ab93 Merge pull request #91 from tuncer/stack-lts-10.0
stack.yaml: update to lts-10.0
2017-12-28 20:17:28 +01:00
Lennart Spitzner ac9d505334 Rename the ghc-8.0.2 stack yaml 2017-12-28 17:30:58 +01:00
Tuncer Ayaz 8137035ac2 Resurrect old stack.yaml for lts-9.0 ci job 2017-12-28 17:30:58 +01:00
Tuncer Ayaz 292bd3d216 stack.yaml: update to lts-10.0 2017-12-28 17:30:58 +01:00
Lennart Spitzner 0f3ee76944 Fix shebang handling with stdin input
Fixes #92
probably should update upstream (ghc-exactprint)
2017-12-27 23:26:18 +01:00
sniperrifle2004 98c93f0d63 Move expanded binding list to standard indent level for compact layout 2017-12-22 16:35:39 +01:00
sniperrifle2004 ad34a8b9b9 Only expand empty binding list with comments 2017-12-22 10:18:09 +01:00
sniperrifle2004 3708838b6a Also handle comments inside ThingWith 2017-12-22 06:58:39 +01:00
sniperrifle2004 21c080572b Add compact version of import layout
Also let layoutLLIEs deal with comments
2017-12-21 23:51:27 +01:00
Lennart Spitzner f920f4714d Fix maximum on empty list, fixes #88 2017-12-21 21:45:29 +01:00
Lennart Spitzner 82a5ffb3b3 Refactor a bit more
- remove unnecessary docWrapNodeRest
- make sure that sharing is correct and non-redundant
2017-12-21 17:56:54 +01:00
Lennart Spitzner 33f23a65ec Refactor and Add missing docSharedWrapper 2017-12-21 15:44:58 +01:00
Lennart Spitzner f651d02898 Merge branch 'dev' into import 2017-12-19 22:27:37 +01:00
Lennart Spitzner ac10b903af travis.yml: Set jobs to 1, Pass to stack 2017-12-19 20:05:55 +01:00
Lennart Spitzner 5dac6dd7f2 Add ghc-option -Werror to all builds in .travis.yml 2017-12-19 19:53:26 +01:00
Lennart Spitzner ce7ec0b467 Fix warning 2017-12-19 17:55:31 +01:00
sniperrifle2004 162b6e6bfd Also fix export comments
Also refactored a little to improve reuse of the docWrapNode logic
2017-12-19 16:33:13 +01:00
Lennart Spitzner bcdd058485
Update README.md for stackage lts release 2017-12-19 15:28:52 +01:00
sniperrifle2004 a59df1f391 Fix comments!! 🎉 2017-12-19 14:28:22 +01:00
sniperrifle2004 7c51a181c8 Fix operators for ThingWith 2017-12-19 01:17:19 +01:00
sniperrifle2004 eac17b1bf2 Also render comments on the binding list 2017-12-19 01:11:25 +01:00
Lennart Spitzner 8c3a9bec25 Fix operators in import list 2017-12-18 18:56:50 +01:00
sniperrifle2004 c3b6e17261 Improve layout for imports 2017-12-18 13:17:24 +01:00
Lennart Spitzner 204f0aff08 import+module: Refactor and Simplify slightly 2017-12-17 21:14:46 +01:00
Lennart Spitzner d8097f2862 Add mask_ to prevent "ghc panic" when using timeout on brittany 2017-12-17 15:45:08 +01:00
sniperrifle2004 e140cd01e0 Add directives for ghc > 8.2 2017-12-17 14:06:41 +01:00
sniperrifle2004 a72465ebef Add context-free tests 2017-12-17 13:13:19 +01:00
sniperrifle2004 ee9abff9e8 Add import and module support 2017-12-17 12:51:04 +01:00
Lennart Spitzner 39dc6d5d2d Merge branch 'master' into dev 2017-12-15 20:56:56 +01:00
Lennart Spitzner a24f092aac Update doc-svg-gen.cabal to prevent new-configure annoyance 2017-12-15 20:55:31 +01:00
Lennart Spitzner f7e5287f1d
Update README.md (0.9.0.0 changes, widget) 2017-12-15 15:13:11 +01:00
Lennart Spitzner 9700fb2a50
Merge pull request #82 from matthew-piziak/tuple-section-support
Tuple section support (fixes #41)
2017-12-15 00:49:57 +01:00
Matthew Piziak 9704fc3490
add tuple section tests 2017-12-14 18:15:07 -05:00
Matthew Piziak b731cd15e7
capture starting layout 2017-12-14 16:17:39 -05:00
Lennart Spitzner 0036dbf410 Add some documentation for `layoutPat` 2017-12-11 17:13:33 +01:00
Lennart Spitzner 95e4346742 one fixup addition to the 0.9.0.0 changelog 2017-12-11 17:10:58 +01:00
Lennart Spitzner 442f32aef9
Update README.md: stack with recent resolver 2017-12-11 17:10:27 +01:00
Lennart Spitzner be4d0f8333
Merge pull request #78 from damienflament/archlinux-installation
Readme: Add ArchLinux installation
2017-12-11 16:48:05 +01:00
Damien Flament b79a0908c8 Added link to the AUR package 2017-12-11 16:44:39 +01:00
Damien Flament 07b928b00c Added ArchLinux installation instructions 2017-12-11 13:10:57 +01:00
Lennart Spitzner 63c04e0b66
Merge pull request #75 from lpil/patch-1
Add missing code blocks to layout docs
2017-12-09 16:12:09 +01:00
Louis Pilfold 3130fecf07
Add missing code blocks to layout docs 2017-12-09 15:09:22 +00:00
Lennart Spitzner 4ded834a97 Clean-up cabal file: Remove development flag 2017-12-08 21:14:35 +01:00
Lennart Spitzner 16d5116193 Bump to 0.9.0.0 2017-12-08 21:11:39 +01:00
Lennart Spitzner eba7fc0d37 Add ChangeLog for 0.9.0.0 2017-12-08 19:59:06 +01:00
Lennart Spitzner 39c48b33f1 Fix error in Annotation filtering (fixes #70) 2017-12-08 19:57:16 +01:00
Lennart Spitzner 5bba918705
Merge pull request #66 from eborden/indentpolicyleft
Support IndentPolicyLeft
2017-12-01 00:30:27 +01:00
Lennart Spitzner 072b1cf091 Make macOS the first travis build job (it is slowest) 2017-12-01 00:12:09 +01:00
Lennart Spitzner 127299b442 Merge branch 'dev' into indentpolicyleft 2017-11-30 23:47:18 +01:00
Lennart Spitzner 882a3b1a7a Allow single-line after let with IndentPolicyLeft 2017-11-30 23:20:35 +01:00
Lennart Spitzner 8a401d291e Workaround for #68: trim exactprinted text for unknown nodes 2017-11-28 18:23:05 +01:00
Lennart Spitzner 6a97379b33 Add whitespace around operator in section, Fixes #67 2017-11-28 17:56:28 +01:00
Lennart Spitzner d9155e240d RecursiveDo: Add second layout, Respect IndentPolicyLeft 2017-11-27 23:13:13 +01:00
Lennart Spitzner 466ff237ff Add some comments/examples in layoutStmt 2017-11-27 23:05:47 +01:00
Lennart Spitzner 9e8571b848 Remove an unnecessary node in BriDoc construction; Add TODO 2017-11-27 23:01:32 +01:00
Evan Rutledge Borden f6859d184f Fix tests after rebase. 2017-11-27 13:05:04 -05:00
Evan Rutledge Borden e9a2de7a85 Filter binders with docSetBaseAndIndent. 2017-11-27 18:12:19 +01:00
Evan Rutledge Borden de0851f975 Use docAltFilter for consistency. 2017-11-27 18:12:19 +01:00
Evan Rutledge Borden 35f33c131c Remove duplication in 'let' expression layout. 2017-11-27 18:12:19 +01:00
Evan Rutledge Borden ba3d9ad739 Add tests for record construction. 2017-11-27 18:12:19 +01:00
Evan Rutledge Borden d7ac478fc6 Update type operator pending tests to remove context. 2017-11-27 18:12:19 +01:00
Evan Rutledge Borden 44e95940c0 Change record update syntax for left indent policy 2017-11-27 18:12:19 +01:00
Evan Rutledge Borden a6bea7542b Update pending long operator use for left indent. 2017-11-27 18:12:19 +01:00
Evan Rutledge Borden d1e1984206 Update guard formatting for IndentPolicyLeft 2017-11-27 18:12:19 +01:00
Evan Rutledge Borden f3c37a6abf Update pending long argument test to context free. 2017-11-27 18:12:19 +01:00
Evan Rutledge Borden cd9f7de566 Update pending type operator test for context free. 2017-11-27 18:12:19 +01:00
Evan Rutledge Borden a13a137f68 Add left indent support for statements
This aligns left indent style `let` statements with their expression
form.
2017-11-27 18:12:19 +01:00
Evan Rutledge Borden de5f0401f3 Add consistency between contsrained and unconstrained forall format
Constrained forall formats aligned the `.` to the left. Constrained
formats aligned the `.` to the right. This change adds consistency
between both formats.
2017-11-27 18:12:19 +01:00
Evan Rutledge Borden 3bbf81baab Add literate tests for context free formatting
Left indent combined with no columnized alignment represents a context
free formatting style for brittany. These tests allow this format to be
tested until inline formatting tools are available to make these files
less redundant.
2017-11-27 18:12:19 +01:00
Evan Rutledge Borden ce41178df5 Remove context sensitive let indentation when IndentPolicyLeft
Let expressions with multiple bindings automattically indent and pull
left

```
let
  a = b
  c = d
in foo bar baz
```

```
let
  a = b
  c = d
in
  foo bar baz
```

```
let
  a = b
  c = d
in foo
  bar
  baz
```

```
let
  a = b
  c = d
in
  foo
    bar
    baz
```
2017-11-27 18:12:19 +01:00
Evan Rutledge Borden bdf8769913 Remove 3 space special case from HsIf when IndentPolicyLeft
```
if foo
   bar
then
  baz
```

becomes

```
if foo
  bar
then
  baz
```
2017-11-27 18:12:19 +01:00
Lennart Spitzner 88cbaf813a Implement `IndentPolicyLeft` for one HsApp case 2017-11-27 18:12:19 +01:00
Lennart Spitzner 4568bd3553 Prepare implementation for `IndentPolicyLeft` 2017-11-27 18:12:19 +01:00
Lennart Spitzner fdd2f5f6dc Try fix shitty travis CI script again 2017-11-27 18:11:49 +01:00
Lennart Spitzner c709513209 Remove dependency on either package
Following the deprecation and removal of the EitherT transformer
2017-11-27 18:11:49 +01:00
Lennart Spitzner ea1720f95e Merge branch 'master' into dev 2017-11-25 19:09:13 +01:00
Lennart Spitzner 37436e675a
Update README.md: Mention stackage nightly, contribution, dev branch 2017-11-25 00:58:33 +01:00
Lennart Spitzner f46fcc135d Update doc/HCAR entry 2017-11-19 22:20:39 +01:00
Lennart Spitzner 26f8cdfb65 Support RecursiveDo/`rec` keyword 2017-10-24 00:25:59 +02:00
Lennart Spitzner 338beb8eea Move testcases for extensions in separate testfile 2017-10-24 00:15:53 +02:00
Lennart Spitzner ddd7c6b439 Fix some rare issue and add some comments
(it is so rare i cannot reproduce anymore right now,
because the code that caused it has changed since..)
2017-10-24 00:00:34 +02:00
Lennart Spitzner 585c345c35 Fix silently broken travis setup (rahhh) 2017-10-23 23:43:59 +02:00
Lennart Spitzner b1c6be7acd Fix parentheses around kind signatures, fixes #64 2017-10-15 00:23:14 +02:00
Lennart Spitzner f86665a251 Fix promoted HsTyVars on ghc-8.2.1
This fix does not work on ghc-8.0, because I do not understand
the 8.0 API in this instance. Could be resolved by looking
at annotations, but that really should not be necessary.
2017-10-14 23:21:13 +02:00
Lennart Spitzner 7d7ec3e8b4 Update commandline help output 2017-10-04 23:43:30 +02:00
Lennart Spitzner 45d5235724 Merge pull request #60 from d-dorazio/dev
Rework the cli interface (fixes #40)

- Remove `--inplace` flag and replace with `--write-mode=(display|inplace)`;
  default is "display".
- Remove `-i/--input` and `-o/--output` flags
2017-10-04 22:57:57 +02:00
d-dorazio 752048882e move inputParams into the reordered block 2017-10-04 20:56:37 +02:00
d-dorazio f21c6b6eac rework the cli interface 2017-10-03 23:32:36 +02:00
Lennart Spitzner a0112524aa Split up littests input into multiple files
*.blt instead of just tests.blt

yay for unix-style for ordering the inputs "15-regression.blt"
2017-10-02 20:53:56 +02:00
Lennart Spitzner bb40870f81 Merge pull request #59 from d-dorazio/master 2017-10-02 14:13:27 +02:00
d-dorazio 95c40f2b1e address review comments 2017-10-02 13:55:52 +02:00
Lennart Spitzner ccf2eb092f Support RecordWildCards, Add one-liner layouting for records
fixes #52
2017-10-01 17:24:13 +02:00
d-dorazio 36af16f881 add inplace flag 2017-10-01 17:04:20 +02:00
d-dorazio 308da71afb support multiple inputs and outputs 2017-10-01 17:04:20 +02:00
Lennart Spitzner 5a12b63035 Adapt travis script to improve build times 2017-09-29 21:42:39 +02:00
Lennart Spitzner a348ae7fbc Switch to XDG path for config; Search conf in parents
- switch to XDG path should be backwards-compatible:
  - new config will be written to XDG path
  - but existing config in ~/.brittany will be respected
- looks for "brittany.yaml" not only in cwd, but in parents too.
  uses the first file found.

fixes #45, fixes #55
2017-09-29 21:42:39 +02:00
Lennart Spitzner 8c6eb4d1e2 Update stack.yaml (butcher-1.1.0.2) 2017-09-26 23:45:56 +02:00
Lennart Spitzner 8438d4a03d Update README.md (ghc versions) 2017-09-26 23:45:56 +02:00
Lennart Spitzner 8ef7daece8 Add changelog entry for 0.8.0.3 2017-09-26 23:24:00 +02:00
Lennart Spitzner d1606932f8 Minor cleanup / performance improvement 2017-09-20 23:35:45 +02:00
Lennart Spitzner 867016c198 Fix quadratic behaviour (fixes #34)
Split up annotations by top-level elements in one
go, instead of doing the filtering per top-level
element (which necessarily makes things quadratic,
or rather O(n*m) with n top-level elements and m
size of annotation map). The fixed version should
be O(log n * m), and log n is negligible.
2017-09-20 23:35:45 +02:00
Lennart Spitzner 9703ebead5 Fix #53
Previously, if the input did not end with a newline
character and config had 'ppconf_hackAroundIncludes = True'
then due to using unlines/lines the output contained an
additional newline.
2017-09-10 16:37:35 +02:00
Lennart Spitzner 0e7adeef5f Merge pull request #51 from alanz/patch-1
Allow extra-1.6
2017-09-04 21:23:08 +02:00
Alan Zimmerman 32a193f0ce Allow extra-1.6 2017-09-04 00:42:49 +02:00
Lennart Spitzner 8171836774 Update README.md: Add hackage/stackage/travis badges 2017-08-20 15:18:53 +02:00
Lennart Spitzner ca13a1897f Fix type application layouting (fixes #48)
- one-line externals are not detected as multiline in backend
- layouting of EAsPat (when TypeApplications is disabled)
- layouting of HsTyLit (TypeApplications with literals)
2017-08-20 14:09:03 +02:00
Lennart Spitzner fba8ad1a99 Fix negative literals in patterns (fixes #49) 2017-08-20 00:34:13 +02:00
Lennart Spitzner baac0a6a7e Add travis-CI script (cabal, new-cabal, stack) 2017-08-19 14:56:46 +02:00
Lennart Spitzner 1288c37204 Disable specific optim. in Config/Types/Instances 2017-08-19 14:56:46 +02:00
Lennart Spitzner 3751e83f8d Make README pandoc-markdown-compatible 2017-08-19 14:40:38 +02:00
Lennart Spitzner aba7d13f67 Fix stupid haddock needs 2017-08-16 00:14:56 +02:00
Lennart Spitzner 6f4eec245e Split up Config/Types.hs
for the compilation of that module, GHC max residency
was an astounding 600MB for Config/Types.hs;
for Config/Types/Instances.hs it now "only" is 480MB.
(numbers according to "+RTS -s", the real usage
accoding to `time` is about 20% higher even.)
2017-08-15 20:37:46 +02:00
Lennart Spitzner 722f03aa11 Clean up prelude.inc 2017-08-13 00:42:10 +02:00
Lennart Spitzner 3ac8cccb0f Refactor prelude.inc/Prelude to reduce imports 2017-08-12 23:51:07 +02:00
Lennart Spitzner ebf84a03e9 Merge remote-tracking branch 'origin/master' 2017-08-12 15:29:06 +02:00
Lennart Spitzner 06c0a14b0e Merge pull request #46 from eschnett/patch-1
Correct typographical errors in comments
2017-08-12 15:24:19 +02:00
Erik Schnetter 0774d0e413 Correct typographical errors in comments 2017-08-11 21:37:29 -04:00
Lennart Spitzner b0f211fbfc Add/Use flag `-h` for `--help`, fixes #44 2017-08-10 17:46:21 +02:00
Lennart Spitzner 655074d1c0 Fix comment insertion error introduced in 91b9a240 2017-08-10 13:09:39 +02:00
Lennart Spitzner 08e94f0e74 Differentiate ErrNos 2017-08-08 00:47:04 +02:00
Lennart Spitzner 69c50bebd3 Refactor Main.hs in preparation of --inplace (see #40) 2017-08-08 00:46:09 +02:00
Lennart Spitzner 91b9a240f1 Fix comment-before-BDCols issue; Relax alignmentBreakOnMultiline 2017-08-07 00:35:09 +02:00
Lennart Spitzner 41beeb9723 Remove/Cleanup unused/deprecated MTEL stuff 2017-08-06 16:28:41 +02:00
Lennart Spitzner b39997fcfa Adapt for ghc-8.2
Could it be so simple?
2017-08-05 18:17:49 +02:00
Lennart Spitzner ccb59ef803 Fix wherespecial with indent/=2 (fixes #39) 2017-08-05 16:09:46 +02:00
Lennart Spitzner 6da000f872 Fix package description formatting 2017-08-04 15:02:43 +02:00
Lennart Spitzner f3787be410 Add tests.blt in source dist (extra-source-files) 2017-08-04 12:27:20 +02:00
Lennart Spitzner 5ff38c1eca Update stack resolver to lts-9.0; Bump syb dep bound 2017-08-04 12:15:49 +02:00
Lennart Spitzner 052e943221 Update install instructions for cabal/new 2017-08-04 11:05:29 +02:00
Lennart Spitzner 03e10b2cc9 Update install instructions for cabal/old 2017-08-04 11:03:48 +02:00
Lennart Spitzner 67e99d3034 Add README.md and doc/implementation/*.md to sdist 2017-08-04 10:58:32 +02:00
Lennart Spitzner 7962e196d5 Fix cabal/package/building warnings 2017-08-03 22:24:06 +02:00
Lennart Spitzner 494a06e2a8 Update maintainer email address 2017-08-03 22:15:35 +02:00
Lennart Spitzner 2f52bcdca9 Bump to 0.8.0.2; Update changelog 2017-08-03 21:26:34 +02:00
Lennart Spitzner 339c61d520 Update README.md: Add another link to showcases 2017-08-03 21:19:58 +02:00
Lennart Spitzner c6e040b4bf Update README.md: Rephrase notes/issues 2017-08-03 21:17:16 +02:00
Lennart Spitzner f33d7f4813 Update README.md 2017-08-03 20:54:32 +02:00
Lennart Spitzner 706bacd344 Add another showcase/example 2017-08-03 20:36:46 +02:00
Lennart Spitzner da692a4341 Update showcases / Add more example layouts 2017-08-03 14:23:41 +02:00
Lennart Spitzner 00ad6c71b9 Impl. layouting of TypeApplication, fixes #38 2017-07-28 18:03:21 +02:00
Lennart Spitzner aa74ec11ba Add dist-newstyle .gitignore 2017-07-28 18:03:21 +02:00
Lennart Spitzner f43b96d920 Merge pull request #35 from alanz/dev
Fix haddock generation.
2017-07-07 13:52:17 +02:00
Alan Zimmerman 33eed86851 Fix haddock generation.
Otherwise the haddock process complains about malformed haddock comments
2017-07-07 10:40:55 +02:00
Lennart Spitzner 134f31e4d1 Add Semigroup instances for C*Config Identity 2017-07-05 00:08:21 +02:00
Lennart Spitzner 6268b8075a Fix layouting bug for RecordUpd 2017-07-04 23:57:54 +02:00
Lennart Spitzner 5a82968a7b Add sub-config-alternative default to lib interface
i.e. `forwardOptionsSyntaxExtsEnabled`
2017-07-04 23:26:13 +02:00
Lennart Spitzner 0251062100 Support mdo layouting (RecursiveDo) 2017-06-29 18:13:28 +02:00
Lennart Spitzner cece70380c Fix/Implement proper layouting of MultiWayIf 2017-06-28 23:35:02 +02:00
Lennart Spitzner 6d472315e3 Fix layouting special-case (getSpacing(s) internals) 2017-06-04 18:15:22 +02:00
Lennart Spitzner 5e3cc0a7c3 Fix OpApp layouting/indentation annoyance 2017-06-04 16:28:01 +02:00
Lennart Spitzner 16f5aa118d Add flag to omit reformatting (ghc-exactprint only) 2017-06-03 21:01:24 +02:00
Lennart Spitzner 8443988af3 Change help text 2017-06-03 18:23:03 +02:00
Lennart Spitzner 9f4cda9130 Add license (AGPLv3) 2017-06-03 18:23:03 +02:00
Lennart Spitzner 91429ccacc Remove unordered-containers direct dependency 2017-06-03 18:23:03 +02:00
Lennart Spitzner bdc85eb744 Expose module Paths_brittany 2017-06-03 18:23:03 +02:00
Lennart Spitzner 3784a0123b Refactor exposed function (now parsePrintModule)
- Rename parsePrintModule -> parsePrintModuleTests
- Rename pureModuleTransform -> parsePrintModule
- Change argument type from (CConfig Option) to Config
- Expose CConfig type fully
2017-06-03 18:23:03 +02:00
Lennart Spitzner dfec26e55b Refactor/Rename LayoutError -> BrittanyError 2017-06-03 18:23:03 +02:00
Lennart Spitzner 72b8817f32 Add testsuite for the library interface 2017-06-03 18:23:03 +02:00
Lennart Spitzner 1adf02dabe Add instance Monoid (CConfig Option) 2017-06-03 18:23:03 +02:00
Lennart Spitzner 135460622f Bump to 0.8.0.1; Add changelog 2017-06-03 18:22:59 +02:00
Lennart Spitzner f350113f7f Refactor all modules: +Internal; Add public Brittany module 2017-05-22 21:25:08 +02:00
Lennart Spitzner 5dbe0f2c9c Add function pureModuleTransform 2017-05-22 21:06:02 +02:00
Lennart Spitzner 2dfa691f9e Rename /docs -> /doc 2017-05-22 16:51:49 +02:00
Lennart Spitzner 72c87b7b4e Auto-reformat Main.hs 2017-05-22 15:58:04 +02:00
Lennart Spitzner fd9427754e Add "hackAroundIncludes" option (default false)
- Makes brittany work in stdin/stdout mode when
  CPP usage is limited to #includes.
2017-05-22 15:49:18 +02:00
Lennart Spitzner 3957272c10 Improve backwards-compat for config (manual FromJson) 2017-05-22 15:45:14 +02:00
Lennart Spitzner 8f1e366f9c Change config file structure; Add config version tag 2017-05-21 16:48:05 +02:00
Lennart Spitzner 647fa94ef3 Reword docs: Mention that BriDoc trees are DAGs 2017-05-21 13:56:20 +02:00
Lennart Spitzner 4ee44388f7 Improve layouting for OpApp (special-case for dollar/HsVar) 2017-05-21 13:43:39 +02:00
Lennart Spitzner b8396da1d6 Refactor Backend.hs (Move stuff to top-level) 2017-05-21 13:17:46 +02:00
Lennart Spitzner 8b7b1334e2 Fix forall type signature layouting 2017-05-18 14:18:10 +02:00
Lennart Spitzner 296629b96c Update README.md (installation); Fix copyright notice 2017-05-17 23:31:20 +02:00
Lennart Spitzner 83ba7803e6 Fix layouting issues in lists/listcomprehension 2017-05-17 23:31:20 +02:00
Lennart Spitzner 56e53a9cbb Apply brittany to `layoutBriDocM` 2017-05-17 21:41:07 +02:00
Lennart Spitzner 6448ee780a Restrict aggressive horizontal alignment (fixes #21)
- Add config values:
  _lconfig_alignmentLimit for roughly "max spaces inserted"
  _lconfig_alignmentBreakOnMultiline for stopping
  alignment after non-singleline-items
2017-05-17 21:34:49 +02:00
Lennart Spitzner 07164b39dc Clean up .cabal file and stack.yaml
(all deps are now on hackage in appropriate form)
2017-05-17 21:28:20 +02:00
Lennart Spitzner 68e77c9337 Fixup for czipwith and Update stack.yaml 2017-05-14 19:32:31 +02:00
Lennart Spitzner 22300d9c62 Minor cleanups 2017-05-14 17:10:20 +02:00
Lennart Spitzner 41a86b2eab Use czipwith package (replacing CZip), Refactor slightly 2017-05-14 17:04:58 +02:00
Lennart Spitzner 4770dbdb7c Remove lens dependency (was not used) 2017-05-14 12:05:19 +02:00
Lennart Spitzner d56c4f5e6b Add more high-level documentation: index, dataflow 2017-05-11 21:48:32 +02:00
Lennart Spitzner eac73c9a7b Add more high-level documentation: theory.md 2017-05-11 17:36:28 +02:00
Lennart Spitzner 7775812cfd Add dataflow documentation graphs 2017-05-10 21:35:13 +02:00
Lennart Spitzner bb7a92bf2b Update README.md: mention alignment is optional 2017-05-02 20:14:59 +02:00
Lennart Spitzner c701e5d00b Fix #26: Fix comment glitch in patternbind layouting
Prevent single-line layout when it would not even be
a single line due to a comment.
This patch might be a bit over-eager in at least one
case (I think you'd get a two-line layout with a
multiway-if and a comment _after_ the where binding).
2017-05-02 17:10:04 +02:00
Lennart Spitzner c3dc3b6074 And one more touch to ExplicitList 2017-05-02 16:32:43 +02:00
Lennart Spitzner ca42178eff Improve tuple layouting (also fixes #18 for tuples) 2017-05-02 16:21:13 +02:00
Lennart Spitzner f6324da600 Fix ExplicitList comment insertion (fixes #18) 2017-05-02 14:20:58 +02:00
Lennart Spitzner 26ffb40fb4 Fixup for config file generation
- fixes a silent bug; behaviour seems not to be affected.
2017-04-16 13:55:49 +02:00
Lennart Spitzner cbeab39b2d Fix comment/eof space handling (fixes #22) 2017-04-15 14:50:55 +02:00
Lennart Spitzner 505ad99f35 Handle InlineSig construct (pragma), fixes #20 2017-04-12 21:47:59 +02:00
Lennart Spitzner acbaba0782 Omit output syntax test for fix-point tests 2017-04-12 14:53:47 +02:00
Lennart Spitzner 14884be8df Minor fixups in docs plus some minor Refactoring 2017-04-12 14:31:53 +02:00
Lennart Spitzner 2dd6fe83f5 Add documentation and examples; Add debugging flag; Minor refactors 2017-03-30 22:47:00 +02:00
Lennart Spitzner 2b30d83fe8 Fix CPP/macro usage for MacOS; Fix minor stuff in .cabal 2017-03-27 16:18:14 +02:00
Lennart Spitzner aa2a8af6e1 Complete basic documentation of BriDoc api 2017-03-17 13:11:12 +01:00
Lennart Spitzner a7e4bdc168 Fix #16; Improve layouting in two cases; Add comments
- the #16 fix is a one-liner:
  Throw `nub` at spacings before pruning.
- Expr/OpApp layouting: Force single-line for children in
  the params-in-multiple-lines-right-of-the-function case.
- Expr/HsIf layouting: Insert a SetBaseY to prevent
  "then"/"else" being placed left of "if".
2017-03-16 23:02:11 +01:00
Lennart Spitzner 19a05d01c4 Add more documentation to BriDoc api 2017-03-08 17:33:56 +01:00
Lennart Spitzner 109163fc4d Remove traceShow statement
fixes #15
2017-03-08 14:55:02 +01:00
Lennart Spitzner 7dc6c525eb Fix minor layouting issue with long guards
(see test multiple-clauses-4)
2017-03-07 21:44:28 +01:00
Lennart Spitzner 00c7384d20 Fix config printing (config file generation) 2017-03-07 21:14:41 +01:00
Lennart Spitzner ed10137174 Add documentation around the BriDoc type/api 2017-03-06 20:49:08 +01:00
Lennart Spitzner cea81d5369 Add indentation to the paragraphs inserted in patterns
Ugly, but fixes #6. Ugly still better than non-valid-haskell result.
2017-03-06 16:56:38 +01:00
Lennart Spitzner 8d163eb099 Improve layouting for equations with multiple clauses
e.g.
func x | x         = simple expression
       | otherwise = 0

This fixes part of #7
2017-03-06 16:03:47 +01:00
Lennart Spitzner df422ffa5f Refactor/Cleanup layoutPatternBindFinal 2017-03-06 15:55:12 +01:00
Lennart Spitzner af38c547e5 Merge pull request #13 from lspitzner/stackage-lts-8.4
Upgrade to Stackage LTS 8.4
2017-03-06 15:33:54 +01:00
Taylor Fausak 2af4b32ce2 Upgrade to Stackage LTS 8.4 2017-03-06 08:21:17 -06:00
Lennart Spitzner bae75182d7 README.md: Fix mentioned config keys 2017-03-06 13:20:26 +01:00
Lennart Spitzner 71d7abc007 Fix config for idemtests (fixup for config setup change) 2017-03-06 12:51:37 +01:00
Lennart Spitzner 575d530188 Use ExactPrintFallback for unknown constructs
fixes #11
2017-03-06 12:45:19 +01:00
Lennart Spitzner 0a907c5594 Add some pending issues testcases 2017-03-01 22:04:41 +01:00
Lennart Spitzner 9421587da9 Merge pull request #8 from tuncer/directory-bound
Fix build by bumping directory upper bound
2017-02-28 00:26:19 +01:00
Tuncer Ayaz 94e0ab1d5a Fix build by bumping directory upper bound 2017-02-11 22:45:39 +01:00
Lennart Spitzner 93611b9a1c Apply brittany 2017-01-31 18:44:39 +01:00
Lennart Spitzner bc70eb07e8 Change config setup(!), Refactor, Update deps
- config now uses foo_bar instead of _foo_bar;
- config now will accept missing keys;
- use latest butcher version;
- improve identity testing by moving into separate file.
2017-01-31 18:43:16 +01:00
Lennart Spitzner 508780466c Adapt for butcher-0.2.0.0 2016-10-01 19:06:55 +02:00
Lennart Spitzner 23936d7522 Write ChangeLog.md 2016-09-06 15:55:42 +02:00
641 changed files with 18258 additions and 9151 deletions

30
.devcontainer/Dockerfile Normal file
View File

@ -0,0 +1,30 @@
ARG UBUNTU_TAG=20.04
FROM ubuntu:"$UBUNTU_TAG"
ENV LANG=C.UTF-8
RUN \
apt-get update && \
apt-get install --assume-yes curl gcc git libgmp-dev libtinfo-dev make sudo
ARG GHCUP_VERSION=0.1.17.4
RUN \
curl --output /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/x86_64-linux-ghcup-$GHCUP_VERSION" && \
chmod +x /usr/local/bin/ghcup && \
ghcup --version
ARG USER_NAME=haskell
RUN \
useradd --create-home --shell "$( which bash )" "$USER_NAME" && \
echo "$USER_NAME ALL=(ALL) NOPASSWD: ALL" | tee "/etc/sudoers.d/$USER_NAME"
USER "$USER_NAME"
ENV PATH="/home/$USER_NAME/.cabal/bin:/home/$USER_NAME/.ghcup/bin:$PATH"
ARG GHC_VERSION=9.0.1
RUN \
ghcup install ghc "$GHC_VERSION" --set && \
ghc --version
ARG CABAL_VERSION=3.6.2.0
RUN \
ghcup install cabal "$CABAL_VERSION" --set && \
cabal --version

View File

@ -0,0 +1,6 @@
{
"build": {
"dockerfile": "Dockerfile"
},
"postCreateCommand": "cabal update"
}

105
.github/workflows/ci.yaml vendored Normal file
View File

@ -0,0 +1,105 @@
name: CI
on:
pull_request:
branches:
- main
- master
push:
branches:
- main
- master
release:
types:
- created
jobs:
build:
strategy:
fail-fast: false
matrix:
include:
- { os: macos-11, ghc: 9.0.1, cabal: 3.6.2.0 }
- { os: ubuntu-20.04, ghc: 9.0.1, cabal: 3.6.2.0 }
- { os: windows-2019, ghc: 9.0.1, cabal: 3.6.2.0, ext: .exe }
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- run: mkdir artifact
- run: mkdir artifact/${{ matrix.os }}
- id: setup-haskell
uses: haskell/actions/setup@v1
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}
- run: cabal configure --enable-tests --flags pedantic --jobs
- run: cabal freeze
- run: cat cabal.project.freeze
- uses: actions/cache@v2
with:
path: ${{ steps.setup-haskell.outputs.cabal-store }}
key: ${{ matrix.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-${{ hashFiles('cabal.project.freeze') }}
restore-keys: |
${{ matrix.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-
${{ matrix.os }}-${{ matrix.ghc }}-
- run: cabal build
- run: cabal install --installdir artifact/${{ matrix.os }} --install-method copy
- run: cabal test --test-show-details direct
- run: cabal check
- run: cabal sdist --output-dir artifact/${{ matrix.os }}
- uses: svenstaro/upx-action@v2
with:
file: artifact/${{ matrix.os }}/brittany${{ matrix.ext }}
- uses: actions/upload-artifact@v2
with:
path: artifact
name: brittany-${{ github.sha }}
release:
needs: build
if: github.event_name == 'release'
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/download-artifact@v2
with:
name: brittany-${{ github.sha }}
path: artifact
- uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
asset_content_type: application/octet-stream
asset_name: brittany-${{ github.event.release.tag_name }}-ubuntu
asset_path: artifact/ubuntu-20.04/brittany
upload_url: ${{ github.event.release.upload_url }}
- uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
asset_content_type: application/octet-stream
asset_name: brittany-${{ github.event.release.tag_name }}-macos
asset_path: artifact/macos-11/brittany
upload_url: ${{ github.event.release.upload_url }}
- uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
asset_content_type: application/octet-stream
asset_name: brittany-${{ github.event.release.tag_name }}-windows.exe
asset_path: artifact/windows-2019/brittany.exe
upload_url: ${{ github.event.release.upload_url }}
- uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
asset_content_type: application/gzip
asset_name: brittany-${{ github.event.release.tag_name }}.tar.gz
asset_path: artifact/ubuntu-20.04/brittany-${{ github.event.release.tag_name }}.tar.gz
upload_url: ${{ github.event.release.upload_url }}
- run: cabal upload --publish --username '${{ secrets.HACKAGE_USERNAME }}' --password '${{ secrets.HACKAGE_PASSWORD }}' artifact/ubuntu-20.04/brittany-${{ github.event.release.tag_name }}.tar.gz

6
.gitignore vendored
View File

@ -5,7 +5,11 @@
*.ps
/*.pdf
dist/
dist-newstyle/
local/
.cabal-sandbox/
.stack-work/
cabal.sandbox.config
cabal.project.local*
cabal.project.freeze
.ghc.environment.*
result

16
.hlint.yaml Normal file
View File

@ -0,0 +1,16 @@
# HLint configuration file
# https://github.com/ndmitchell/hlint
##########################
# This file contains a template configuration file, which is typically
# placed as .hlint.yaml in the root of your project
- ignore: { name: 'Use :' }
- ignore: { name: Eta reduce }
- ignore: { name: Move brackets to avoid $ }
- ignore: { name: Redundant $ }
- ignore: { name: Redundant bracket }
- ignore: { name: Use newtype instead of data }
- ignore: {name: "Redundant do"}
- ignore: {name: "Redundant return"}
- ignore: {name: "Use camelCase"}

5
.vscode/extensions.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"recommendations": [
"taylorfausak.purple-yolk"
]
}

6
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,6 @@
{
"purple-yolk.brittany.command": "cabal exec -- brittany --write-mode inplace",
"purple-yolk.ghci.command": "cabal repl --repl-options -ddump-json",
"purple-yolk.hlint.command": "false",
"purple-yolk.hlint.onSave": false
}

View File

@ -1,5 +1,317 @@
# Revision history for brittany
## 0.1.0.0 -- YYYY-mm-dd
## 0.14.0.0 -- November 2021
* First version. Released on an unsuspecting world.
* #357: Added support for GHC 9.0. Dropped support for all other versions of GHC.
* ab59e9acc3069551ac4132321b285d000f5f5691: Removed runtime dependency on `ghc-paths`.
* fa8365a7fa9372043d5a1018f2f7669ce3853edd: Started providing pre-built binaries for Linux, MacOS, and Windows.
* Many other changes to Brittany's internals and exposed Haskell interface, but (hopefully) no changes to its command-line interface.
## 0.13.1.2 -- May 2021
* #347: Allowed hspec 2.8. Thanks @felixonmars!
## 0.13.1.1 -- February 2021
* #333: Allowed random 1.2. Thanks @felixonmars!
* #334: Updated Arch install instructions. Thanks @ahstro!
* #343: Allowed ghc-exactprint 0.6.4. Thanks @maralorn!
## 0.13.1.0 -- December 2020
* #330: Started sorting imports. Thanks @expipiplus1!
## 0.13.0.0 -- December 2020
* #324: Added support for GHC 8.10.
* Dropped support for GHC 8.4, 8.2, and 8.0.
* Thanks @jneira, @bubba, @infinity0, and @expipiplus1!
## 0.12.2.0 -- November 2020
* #207: Fix newtype indent in associated type family.
* #231: Improve comments-affecting-layout behaviour for tuples.
* #259: Data declaration for newtype and records. Thanks @eborden!
* #263: Fix non-idempotent newlines with comment + where.
* #273: Error handling.
* #281: Fix moving comment in export list (haddock header).
* #286: Fix comments in instance/type instances.
* #287: Add support for pattern synonyms. Thanks @RaoulHC!
* #293: Expose main function as a module. Thanks @soareschen!
* #303: Readme: Supports 8.8. Thanks @andys8!
* #311: Allows aeson-1.5.*. Thanks @jkachmar!
* #313: Nondecreasing export list formatting. Thanks @expipiplus1!
## 0.12.1.1 -- December 2019
* Bugfixes:
- Fix layouting regression of record update for many/large fields
- Fix whitespace regression on ExplicitForall notation
(`foo :: forall a . Show a => a -> a`, note the double space)
introduced in 0.12. (#264)
- Fix roundtripping of type equality constraint
`f :: ((~) a b) => a -> b` (#267)
* One experimental feature addition: Turning brace notation semicolons into
newlines when formatting (see #270)
## 0.12.1.0 -- September 2019
* Support ghc-8.8
* Support for OverloadedLabels extension
(thanks to Evan Rutledge Borden @eborden)
* Support for Implicit Params extension (thanks to pepe iborra @pepeiborra)
* Add flag `--no-user-config` to enable only using manually passed config
* Disable the performance test suite by default to prevent spurious failures
on certain CI setups. The github/travis brittany CI still has all tests
enabled. See the `brittany-test-perf` flag in the cabal file.
* Bugfixes:
- Fix one wandering-comment bug for let-in expressions
- Fix invalid result for prefix operator pattern matches
- Fix lambda expression with laziness/strictness annotation
- Fix parenthesis handling for infix pattern matches with 3+ arguments
* Changes to layouting behaviour:
- For pattern matching and data/instance definitions, the usage of
parenthesis is now "normalized", i.e. superfluous parens are removed by
brittany.
## 0.12.0.0 -- June 2019
* Support for ghc-8.6 (basic support, not necessarily all new syntactic
extensions)
* Support -XExplicitNamespaces and -XPatternSynonyms
* Allow a --dry-run sort of operation via flag "-c/--check-mode"
(thanks to Doug Beardsley @mightybyte)
* Include file name in errors about unsupported syntax nodes (thanks to @5outh)
* Partially implement layouting class instances: Layouts children, but
falls back on ghc-exactprint for the instance head
(thanks to Rupert Horlick @ruhatch)
* Implement layouting for type synonyms (thanks to Rupert Horlick @ruhatch)
* Support -XMagicHash, -XUnboxedTuples (thanks to Sergey Vinokurov @sergv)
* Support -XQuasiQuotes (no formatting applied to the splices; they are simply
retained without causing the dreaded "Unknown construct: HsSpliceE{}")
- `lconfig_allowHangingQuasiQuotes` controls whether multi-line
QuasiQuotes are allowed to start at the end of the current line, or
whether they are always placed in new lines.
* Bugfixes:
- Fix rare-case alignment bug with IndentPolicyMultiple (#144)
- Make inline layout config apply to module header (#151)
- Fix unaligned import-hiding layout (#150)
- Fix idempotence violation for comments around if-then-else (#167)
- Fix comments having an effect on far-away parent node's layout (#159)
- Fix imports of type operators ("symbolic data types")
(thanks to Phil Hazelden @ChickenProp)
- Work around GHC and cabal-install misfeature ".ghc.environment files"
that could break brittany in unexpected and hard-to-understand ways
- Stop removing empty lines before `where` keyword in a couple of cases
- Fix functions with mixing prefix/infix style causing error (#234)
* Changes to layout:
- Align usage of spaces for record update vs record construction (#126)
- More indentation to import-hiding-paragraph (follow-up to #150 fix)
- Record construction and update now are layouted in the same way
(thanks to Evan Rutledge Borden @eborden)
- Stop allowing single-line layout when there are comments between
arguments (#214) (thanks to @matt-noonan)
* Various build-instructions and editor integrations
## 0.11.0.0 -- May 2018
* Support for ghc-8.4
* Implement inline-config
e.g. "-- brittany --indent=4"
respects the following comment forms as input:
~~~~
source comment affected target
======================================================
"-- brittany CONFIG" whole module
"-- brittany-next-binding CONFIG" next binding
"-- brittany-disable-next-binding" next binding
"-- brittany @ myExampleFunc CONFIG" `myExampleFunc`
~~~~
multiline-comments are supported too, although
the specification must still be a single line. E.g.
> "{- brittany --columns 50 -}"
CONFIG is either:
1) one or more flags in the form of what brittany accepts
on the commandline, e.g. "--columns 50", or
2) one or more specifications in the form of what brittany
accepts in its config files for the layouting config
(a one-line yaml document), e.g. "{ lconfig_cols: 50 }"
* Implement `IndentPolicyMultiple` (thanks to Bryan Richter @chreekat)
Restrict indentation amounts to `n * indentAmount`
* Implement `--obfuscate` that replaces non-keyword identifiers with random
names
* Do not write files unless there are changes (don't update modtime)
(`--write-mode=inplace`) (#93)
* Bugfixes:
- Fix empty function constraints (`() => IO ()`) (#133)
- Fix overflowing columns caused by aligning with surrounding lines
for certain complex cases
- Implement hacky workaround for `type instance`s (`-XTypeFamilies`) (#89)
* Layouting changes:
- On default settings, allow single-line module header
`module MyModule where` when no exports
- Fix one case of non-optimal layouting for if-then-else
- Allow same-line let binding inside do-notation with
`IndentPolicyLeft/Multiple` and `indentAmount>=4`
## 0.10.0.0 -- March 2018
* Implement module/exports/imports layouting (thanks to sniperrifle2004)
* Expose config paths/parsing functions (thanks to Alexey Raga)
* Bugfixes:
- Fix layouting of `NOINLINE` pragma
- Fix ticked type operator (e.g. `':-`) losing tick (#125)
- Fix alignment issue with cases involving operators (#65)
- Fix comments in tuples being dropped (#37)
- Fix comment placements with let-in (#110)
* Layouting changes:
- Align arguments only if it is the same function being called (#128)
- Do not use single-line layout when infix operator expression contains
comments (#111)
* New layouting config items:
- `lconfig_importColumn`/`--import-col`: column for import items
- `lconfig_importAsColumn`/`--import-as-col`: column for the "as" name of
a module
- `lconfig_reformatModulePreamble`: controls module/export/import layouting
(default True)
- `lconfig_allowSingleLineExportList`: permit one-line module header, e.g.
`module Main (main)` (default False)
## 0.9.0.1 -- February 2018
* Support `TupleSections` (thanks to Matthew Piziak)
* Bugfixes:
- Fix Shebang handling with stdin input (#92)
- Fix bug that effectively deleted strict/lazy matches (BangPatterns) (#116)
- Fix infix operator whitespace bug (#101, #114)
- Fix help command output and its layouting (#103)
- Fix crash when config dir does not exist yet (#115)
* Layouting changes:
- no space after opening non-tuple parenthesis even for multi-line case
- use spaces around infix operators (applies to sections and in pattern
matches)
- Let-in is layouted more flexibly in fewer lines, if possible
(thanks to Evan Borden)
## 0.9.0.0 -- December 2017
* Change default global config path (use XDG spec)
Existing config should still be respected, so this should not break
compatibility
* Support per-project config
* ! Slight rework of the commandline interface:
- Support multiple inputs and outputs
- Support inplace-transformation for multiple files via
`--write-mode=inplace`
* Implement `IndentPolicyLeft` - the indentation mode that never adds more
than the base indentation for nested parts (no hanging indentation)
(thanks to Evan Borden)
* Fix bug that manifested in bad output for (top-level) template haskell splices
* Extension support:
- RecordWildCards
- RecursiveDo (was only partially supported previously)
* Layouting Bugfixes:
- Properly reproduce parentheses around kind signatures
- Fix issue around promoted lists
(example good: `'[ 'True]` bad: `'['True]`)
- Trim text from exactprint used as workaround for unknown nodes
(unsupported extension workaround)
* Layouting changes
- Insert spaces around operator in sections
## 0.8.0.3 -- September 2017
* Support for ghc-8.2.1
* Bugfixes:
- Fix quadratic performance issue
- Fix special "where" indentation with indentAmount /= 2
- Fix negative literals in patterns
- Support type applications
* Accept `-h` for `--help` and improve help layouting (via butcher-1.1.0.2)
* Add continuous integration via travis (cabal, cabal-new, stack)
(brittle due compilation time limit)
* Reduce compilation memory usage a bit
## 0.8.0.2 -- August 2017
* Add library interface, to be used by `haskell-ide-engine`.
* Publish to hackage.
## 0.8.0.1 -- May 2017
* Document the high-level design of the program
* Improve layouting for many different cases, too many to list here. Brittany
still does only reformat top-level type signatures and bindings.
* Publish all dependencies on hackage; `ghc-exactprint ` adaptions got merged
upstream as well.
* Reduce the aggressiveness of horizontal alignment; this is configurable
via the `lconfig_alignmentLimit` and `lconfig_alignmentBreakOnMultiline`
values (config file only for now).
* (!) Breaking change to the config file format: The keys previously contained
underscore (e.g. `_econf_Werror`) but do not anymore (`econf_Werror`).
Add config version; also
* Move config value `conf_errorHandling.econf_CPPMode` to
`conf_preprocessor.ppconf_CPPMode`.
* Cope with unhandled syntactical constructs more gracefully by falling back
on the ghc-exactprint output; Brittany simply won't touch certain
subexpressions instead of aborting. This is further configurable via the
`econf_omit_output_valid_check` config value.
* Due to improvements to the `butcher` library: Accept `--key=value` on
commandline (only `--key value` was supported previously).
* Improve testsuite setup: The `tests.blt` file contains many different
testcases that allow quick addition - feel free to report bugs directly
by making PRs with additions to that file.
* Release under the terms of the AGPLv3
## 0.7.1.0 -- 2016-09-06
* Support stack
* Fix --ghc-options handling
* Add commandline param to allow shortcut `brittany Foo.hs`
meaning `brittany -i Foo.hs`
## 0.7.0.0 -- 2016-09-04
* First official alpha release
* Fix commandline flag parsing
* Implement/Improve horizontal aligning
* Various minor fixes and layouting improvements
## 0.6.0.0 -- 2016-08-12
* Add check that output is syntactically valid
* (!) Change config format, breaking previous configs
* Various layouting additions/imporements
* Various minor fixes
## 0.5.0.0 -- 2016-08-08
* Support --ghc-options
* Support user and local config files: Local config file is not mandatory
anymore.
## 0.4.0.0 -- 2016-08-06
* Make comment handling a bit more clever
* Various layouting additions/imporements
## 0.3.0.0 -- 2016-08-04
* Various layouting additions/imporements
## 0.2.0.0 -- 2016-07-30
* Basic and partial implementation for
expression/decl/statement/pattern layouting
* Prevent exponential behaviour using manual stablenames
## 0.1.0.0 -- 2016-06-05
* First working code for type signature layouting

661
LICENSE Normal file
View File

@ -0,0 +1,661 @@
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing under
this license.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU Affero General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU Affero General Public License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU Affero General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.

242
README.md
View File

@ -1,103 +1,197 @@
# brittany
# brittany [![Hackage version](https://img.shields.io/hackage/v/brittany.svg?label=Hackage)](https://hackage.haskell.org/package/brittany) [![Stackage version](https://www.stackage.org/package/brittany/badge/lts?label=Stackage)](https://www.stackage.org/package/brittany) [![Build Status](https://secure.travis-ci.org/lspitzner/brittany.svg?branch=master)](http://travis-ci.org/lspitzner/brittany)
:warning:
This project is effectively unmaintained!
I ([@tfausak](https://github.com/tfausak)) would recommend switching to another formatter.
At time of writing (2022-11-11), I would suggest [Ormolu](https://github.com/tweag/ormolu).
Or if you prefer some configuration, I would suggest [Fourmolu](https://github.com/fourmolu/fourmolu).
haskell source code formatter
![Output sample](https://github.com/lspitzner/brittany/raw/master/brittany-sample.gif)
(see another demonstration in [Showcase.md](Showcase.md))
(see [more examples and comparisons](/doc/showcases))
This project's goals roughly are to:
- Be idempotent (this also directly ensures that only valid haskell is
produced);
- Support the full ghc-haskell syntax including syntactic extensions;
- Always retain the semantics of the source being transformed;
- Be idempotent;
- Support the full GHC-haskell syntax including syntactic extensions
(but excluding `-XCPP` which is too hard);
- Retain newlines and comments unmodified;
- Be clever about using the available horizontal space while not overflowing
it if it cannot be avoided;
- Be clever about aligning things horizontally.
the column maximum unless it cannot be avoided;
- Be clever about aligning things horizontally (this can be turned off
completely however);
- Have linear complexity in the size of the input.
At this point, these goals are completed to different degrees.
Currently, only type-signatures and function/value bindings are processed;
other module elements (data-decls, classes, instances, imports/exports etc.) are not
transformed in any way; this extends to e.g. bindings inside class instance
definitions - they won't be touched (yet).
By using ghc-exactprint as the parser, brittany supports full ghc syntax including
extensions, but many of the less common syntactic elements (even of 2010 haskell) are
not handled.
There are cases where comments are not re-inserted properly (leading to an error or
to affected comments being placed at a different location than in the input).
In theory, the core algorithm inside brittany reaches these goals. It is rather
clever about making use of horizontal space while still being linear in the
size of the input (although the constant factor is not small). See
[these examples of clever layouting](/doc/showcases/Layout_Interactions.md).
The current algorithm is rather clever about horizontal space while still being
linear in the size of the input (although the constant factor is not small).
But brittany is not finished yet, and there are some open issues that yet
require fixing:
# Important notes
- Requires `ghc`>=8
- `-XCPP` is not officially supported (yet).
- ~~Some commandline flags mentioned in the help don't work yet (and won't even
be parsed correctly.)~~ (fixed in 0.4.0.0)
- some config values can not be configured via commandline yet.
- ~~Creates a `brittany.yaml` config file _in the current directory_.~~
(fixed in 0.5.0.0; now creates user config file in `~/.brittany`;
still reads `brittany.yaml` in current dir if present.)
- ~~Currently some unhandled syntactical constructs don't raise errors~~
(fixed in 0.6.0.0)
- There are cases where comments are not copied to the output (this will
- **only the module header (imports/exports), type-signatures and
function/value bindings** are processed;
other module elements (data-decls, classes, instances, etc.)
are not transformed in any way; this extends to e.g. **bindings inside class
instance definitions** - they **won't be touched** (yet).
- By using `ghc-exactprint` as the parser, brittany supports full GHC
including extensions, but **some of the less common syntactic elements
(even of 2010 haskell) are not handled**.
- **There are some known issues regarding handling of in-source comments.**
There are cases where comments are not copied to the output (this will
be detected and the user will get an error); there are other cases where
comments are moved slightly; there are also cases where comments result in
wonky newline insertion (although this should be a purely aesthetic issue.)
# Building
## Try without Installing
(This does not cover _installation_. TODO)
You can [paste haskell code over here](https://hexagoxel.de/brittany/)
to test how it gets formatted by brittany. (Rg. privacy: the server does
log the size of the input, but _not_ the full input/output of requests.)
via `cabal new-build`
# Other usage notes
~~~~.sh
mkdir brittany-project
cd brittany-project/
git clone https://github.com/lspitzner/butcher.git
git clone https://github.com/lspitzner/data-tree-print.git
git clone https://github.com/lspitzner/ghc-exactprint.git
git clone https://github.com/lspitzner/brittany.git
cat > cabal.project <<EOF
packages: data-tree-print butcher ghc-exactprint brittany
EOF
# cabal new-configure -w $PATH_TO_GHC_8
cabal new-build brittany/
~~~~
- Supports GHC version `9.0.x`.
- included in stackage with lts>=10.0 (or nightlies dating to >=2017-11-15)
- config (file) documentation is lacking.
- some config values can not be configured via commandline yet.
- uses/creates user config file in `~/.config/brittany/config.yaml`;
also reads (the first) `brittany.yaml` found in current or parent
directories.
or via `stack`
# Installation
~~~~.sh
git clone https://github.com/lspitzner/brittany.git
cd brittany
stack build
~~~~
- via `stack`
~~~~.sh
stack install brittany # --resolver lts-16.31
~~~~
If you use an lts that includes brittany this should just work; otherwise
you may want to clone the repo and try again.
- via `cabal`
Due to constant changes to the cabal UI, I have given up on making sure
these instructions work before releases. Please do not expect these
instructions to be up-to-date; they may produce incomprehensible error
messages, they may be broken otherwise, they may work now but break with
the next cabal release. Thanks for your understanding, and feel free to
open issues for any problems you encounter. -- lennart
If you are using cabal-3.0, using
`cabal install brittany --installdir=$HOME/.cabal/bin`
might work. Keep in mind that cabal merely puts a symlink to the "store"
into the installdir, so you have to re-install if you ever clean your
store. On cabal-2.4, try `cabal v2-install brittany`. On cabal-2.2 or
earlier you might be succesful using
```cabal new-build exe:brittany; cp `find dist-newstyle/ -name brittany -type f | xargs -x ls -t | head -n1` $HOME/.cabal/bin/```.
Alternatively, you can also use the v1-approach with sandboxes as
`cabal v1-sandbox init; cabal v1-install brittany --bindir=$HOME/.cabal/bin`.
(TODO: These instructions are more confusing than helpful. I am inclined
to just remove them.)
- on ArchLinux:
~~~~.sh
pacman -S haskell-brittany
~~~~
# Development tips
# Editor Integration
#### Sublime text
[In this gist](https://gist.github.com/lspitzner/097c33177248a65e7657f0c6d0d12075)
I have described a haskell setup that includes a shortcut to run brittany formatting.
#### VSCode
[This extension](https://marketplace.visualstudio.com/items?itemName=MaxGabriel.brittany)
connects commandline `brittany` to VSCode formatting API. Thanks to @MaxGabriel.
#### Via HLS
[haskell-language-server](https://github.com/haskell/haskell-language-server)
includes a `brittany` plugin that directly uses the brittany library.
Relevant for any editors that properly support the language-server-protocol.
#### Neovim / Vim 8
The [Neoformat](https://github.com/sbdchd/neoformat) plugin comes with support for
brittany built in.
#### Atom
[Atom Beautify](https://atom.io/packages/atom-beautify) supports brittany as a formatter for Haskell. Since the default formatter is set to hindent, you will need to change this setting to brittany, after installing the extension.
#### Emacs
[format-all](https://github.com/lassik/emacs-format-all-the-code) support brittany as the default formatter for Haskell.
# Usage
- Currently one mode of operation: Transform a single module. By default read
from `stdin` and written to `stdout`, but commandline arguments allow to
read/write from/to files.
- Default mode of operation: Transform a single module, from `stdin` to `stdout`.
Can pass one or multiple files as input, and there is a flag to override them
in place instead of using `stdout` (since 0.9.0.0). So:
~~~~ .sh
brittany # stdin -> stdout
brittany mysource.hs # ./mysource.hs -> stdout
brittany --write-mode=inplace *.hs # apply formatting to all ./*.hs inplace
~~~~
- For stdin/stdout usage it makes sense to enable certain syntactic extensions
by default, i.e. to add something like this to your
`~/.brittany/config.yaml` (execute `brittany` once to create default):
`~/.config/brittany/config.yaml` (execute `brittany` once to create default):
~~~~
_conf_forward:
_options_ghc:
- -XLambdaCase
- -XMultiWayIf
- -XGADTs
- -XPatternGuards
- -XViewPatterns
- -XRecursiveDo
- -XTupleSections
- -XExplicitForAll
- -XImplicitParams
- -XQuasiQuotes
- -XTemplateHaskell
- -XBangPatterns
~~~~
~~~~
conf_forward:
options_ghc:
- -XLambdaCase
- -XMultiWayIf
- -XGADTs
- -XPatternGuards
- -XViewPatterns
- -XRecursiveDo
- -XTupleSections
- -XExplicitForAll
- -XImplicitParams
- -XQuasiQuotes
- -XTemplateHaskell
- -XBangPatterns
~~~~
# Feature Requests, Contribution, Documentation
For a long time this project has had a single maintainer, and as a consequence
there have been some mildly large delays for reacting to feature requests
and even PRs.
Sorry about that.
The good news is that this project is getting sponsored by PRODA LTD, and two
previous contributors, Evan Borden and Taylor Fausak, have agreed on helping
with organisational aspects. Thanks!
Still, this project has a long queue of very sensible feature requests, so it
may take some time until new ones get our attention. But with the help of
the co-maintainers, at least the reaction-times on PRs and the frequency
of releases should improve significantly.
If you are interested in making your own contributions, there is
a good amount of high-level documentation at
[the documentation index](doc/implementation/index.md)
# License
Copyright (C) 2016-2019 Lennart Spitzner\
Copyright (C) 2019 PRODA LTD
This program is free software: you can redistribute it and/or modify
it under the terms of the
[GNU Affero General Public License, version 3](http://www.gnu.org/licenses/agpl-3.0.html),
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

View File

@ -1,288 +0,0 @@
# brittany showcase
We will try to take the following module and try to fit it into 80 columns.
## input
~~~~ .hs
-- 10 20 30 40 50 60 70 80
module Language.Haskell.Brittany.BriLayouter
( layoutBriDoc
)
where
layoutBriDoc :: Data.Data.Data ast => ast -> BriDocNumbered -> PPM ()
layoutBriDoc ast briDoc = do
-- first step: transform the briDoc.
briDoc' <- MultiRWSS.withMultiStateS BDEmpty $ do
traceIfDumpConf "bridoc raw" _dconf_dump_bridoc_raw $ briDocToDoc $ unwrapBriDocNumbered $ briDoc
-- bridoc transformation: remove alts
transformAlts briDoc >>= mSet
mGet >>= traceIfDumpConf "bridoc post-alt" _dconf_dump_bridoc_simpl_alt . briDocToDoc
-- bridoc transformation: float stuff in
mGet <&> transformSimplifyFloating >>= mSet
mGet >>= traceIfDumpConf "bridoc post-floating" _dconf_dump_bridoc_simpl_floating . briDocToDoc
-- bridoc transformation: par removal
mGet <&> transformSimplifyPar >>= mSet
mGet >>= traceIfDumpConf "bridoc post-par" _dconf_dump_bridoc_simpl_par . briDocToDoc
-- bridoc transformation: float stuff in
mGet <&> transformSimplifyColumns >>= mSet
mGet >>= traceIfDumpConf "bridoc post-columns" _dconf_dump_bridoc_simpl_columns . briDocToDoc
-- -- bridoc transformation: indent
mGet <&> transformSimplifyIndent >>= mSet
mGet >>= traceIfDumpConf "bridoc post-indent" _dconf_dump_bridoc_simpl_indent . briDocToDoc
mGet >>= traceIfDumpConf "bridoc final" _dconf_dump_bridoc_final . briDocToDoc
-- -- convert to Simple type
-- simpl <- mGet <&> transformToSimple
-- return simpl
anns :: ExactPrint.Types.Anns <- mAsk
let filteredAnns = filterAnns ast anns
let state = LayoutState
{ _lstate_baseY = 0
, _lstate_curY = 0
, _lstate_indLevel = 0
, _lstate_indLevelLinger = 0
, _lstate_commentsPrior = extractCommentsPrior filteredAnns
, _lstate_commentsPost = extractCommentsPost filteredAnns
, _lstate_commentCol = Nothing
, _lstate_addSepSpace = Nothing
, _lstate_inhibitMTEL = False
, _lstate_isNewline = NewLineStateInit
}
state' <- MultiRWSS.withMultiStateS state $ layoutBriDocM briDoc'
let remainingComments = Map.elems (_lstate_commentsPrior state') ++ Map.elems (_lstate_commentsPost state')
remainingComments `forM_` (mTell . (:[]) . LayoutErrorUnusedComment . show . fmap fst)
return $ ()
~~~~
## `brittany` output
~~~~ .hs
-- 10 20 30 40 50 60 70 80
module Language.Haskell.Brittany.BriLayouter
( layoutBriDoc
)
where
layoutBriDoc :: Data.Data.Data ast => ast -> BriDocNumbered -> PPM ()
layoutBriDoc ast briDoc = do
-- first step: transform the briDoc.
briDoc' <- MultiRWSS.withMultiStateS BDEmpty $ do
traceIfDumpConf "bridoc raw" _dconf_dump_bridoc_raw
$ briDocToDoc
$ unwrapBriDocNumbered
$ briDoc
-- bridoc transformation: remove alts
transformAlts briDoc >>= mSet
mGet
>>= traceIfDumpConf "bridoc post-alt" _dconf_dump_bridoc_simpl_alt
. briDocToDoc
-- bridoc transformation: float stuff in
mGet <&> transformSimplifyFloating >>= mSet
mGet
>>= traceIfDumpConf "bridoc post-floating"
_dconf_dump_bridoc_simpl_floating
. briDocToDoc
-- bridoc transformation: par removal
mGet <&> transformSimplifyPar >>= mSet
mGet
>>= traceIfDumpConf "bridoc post-par" _dconf_dump_bridoc_simpl_par
. briDocToDoc
-- bridoc transformation: float stuff in
mGet <&> transformSimplifyColumns >>= mSet
mGet
>>= traceIfDumpConf "bridoc post-columns" _dconf_dump_bridoc_simpl_columns
. briDocToDoc
-- -- bridoc transformation: indent
mGet <&> transformSimplifyIndent >>= mSet
mGet
>>= traceIfDumpConf "bridoc post-indent" _dconf_dump_bridoc_simpl_indent
. briDocToDoc
mGet
>>= traceIfDumpConf "bridoc final" _dconf_dump_bridoc_final
. briDocToDoc
-- -- convert to Simple type
-- simpl <- mGet <&> transformToSimple
-- return simpl
anns :: ExactPrint.Types.Anns <- mAsk
let filteredAnns = filterAnns ast anns
let state = LayoutState
{ _lstate_baseY = 0
, _lstate_curY = 0
, _lstate_indLevel = 0
, _lstate_indLevelLinger = 0
, _lstate_commentsPrior = extractCommentsPrior filteredAnns
, _lstate_commentsPost = extractCommentsPost filteredAnns
, _lstate_commentCol = Nothing
, _lstate_addSepSpace = Nothing
, _lstate_inhibitMTEL = False
, _lstate_isNewline = NewLineStateInit
}
state' <- MultiRWSS.withMultiStateS state $ layoutBriDocM briDoc'
let remainingComments = Map.elems (_lstate_commentsPrior state')
++ Map.elems (_lstate_commentsPost state')
remainingComments
`forM_` (mTell . (:[]) . LayoutErrorUnusedComment . show . fmap fst)
return $ ()
~~~~
In contrast, let us look at Chris Done's `hindent` (version `5.2.1`) re-formatting results for the same input:
## `hindent` output
~~~~ .hs
-- 10 20 30 40 50 60 70 80
module Language.Haskell.Brittany.BriLayouter
( layoutBriDoc
) where
layoutBriDoc
:: Data.Data.Data ast
=> ast -> BriDocNumbered -> PPM ()
layoutBriDoc ast briDoc
-- first step: transform the briDoc.
= do
briDoc' <-
MultiRWSS.withMultiStateS BDEmpty $ do
traceIfDumpConf "bridoc raw" _dconf_dump_bridoc_raw $
briDocToDoc $ unwrapBriDocNumbered $ briDoc
-- bridoc transformation: remove alts
transformAlts briDoc >>= mSet
mGet >>=
traceIfDumpConf "bridoc post-alt" _dconf_dump_bridoc_simpl_alt .
briDocToDoc
-- bridoc transformation: float stuff in
mGet <&> transformSimplifyFloating >>= mSet
mGet >>=
traceIfDumpConf "bridoc post-floating" _dconf_dump_bridoc_simpl_floating .
briDocToDoc
-- bridoc transformation: par removal
mGet <&> transformSimplifyPar >>= mSet
mGet >>=
traceIfDumpConf "bridoc post-par" _dconf_dump_bridoc_simpl_par .
briDocToDoc
-- bridoc transformation: float stuff in
mGet <&> transformSimplifyColumns >>= mSet
mGet >>=
traceIfDumpConf "bridoc post-columns" _dconf_dump_bridoc_simpl_columns .
briDocToDoc
-- -- bridoc transformation: indent
mGet <&> transformSimplifyIndent >>= mSet
mGet >>=
traceIfDumpConf "bridoc post-indent" _dconf_dump_bridoc_simpl_indent .
briDocToDoc
mGet >>=
traceIfDumpConf "bridoc final" _dconf_dump_bridoc_final . briDocToDoc
-- -- convert to Simple type
-- simpl <- mGet <&> transformToSimple
-- return simpl
anns :: ExactPrint.Types.Anns <- mAsk
let filteredAnns = filterAnns ast anns
let state =
LayoutState
{ _lstate_baseY = 0
, _lstate_curY = 0
, _lstate_indLevel = 0
, _lstate_indLevelLinger = 0
, _lstate_commentsPrior = extractCommentsPrior filteredAnns
, _lstate_commentsPost = extractCommentsPost filteredAnns
, _lstate_commentCol = Nothing
, _lstate_addSepSpace = Nothing
, _lstate_inhibitMTEL = False
, _lstate_isNewline = NewLineStateInit
}
state' <- MultiRWSS.withMultiStateS state $ layoutBriDocM briDoc'
let remainingComments =
Map.elems (_lstate_commentsPrior state') ++
Map.elems (_lstate_commentsPost state')
remainingComments `forM_`
(mTell . (: []) . LayoutErrorUnusedComment . show . fmap fst)
return $ ()
~~~~
and haskell-formatter (version 1.0.0)
## `haskell-formatter` output
~~~~ .hs
-- 10 20 30 40 50 60 70 80
module Language.Haskell.Brittany.BriLayouter (layoutBriDoc) where
layoutBriDoc :: Data.Data.Data ast => ast -> BriDocNumbered -> PPM ()
layoutBriDoc ast briDoc
-- first step: transform the briDoc.
= do briDoc' <- MultiRWSS.withMultiStateS BDEmpty $
do traceIfDumpConf "bridoc raw" _dconf_dump_bridoc_raw $
briDocToDoc $ unwrapBriDocNumbered $ briDoc
-- bridoc transformation: remove alts
transformAlts briDoc >>= mSet
mGet >>=
traceIfDumpConf "bridoc post-alt"
_dconf_dump_bridoc_simpl_alt
. briDocToDoc
-- bridoc transformation: float stuff in
mGet <&> transformSimplifyFloating >>= mSet
mGet >>=
traceIfDumpConf "bridoc post-floating"
_dconf_dump_bridoc_simpl_floating
. briDocToDoc
-- bridoc transformation: par removal
mGet <&> transformSimplifyPar >>= mSet
mGet >>=
traceIfDumpConf "bridoc post-par"
_dconf_dump_bridoc_simpl_par
. briDocToDoc
-- bridoc transformation: float stuff in
mGet <&> transformSimplifyColumns >>= mSet
mGet >>=
traceIfDumpConf "bridoc post-columns"
_dconf_dump_bridoc_simpl_columns
. briDocToDoc
-- -- bridoc transformation: indent
mGet <&> transformSimplifyIndent >>= mSet
mGet >>=
traceIfDumpConf "bridoc post-indent"
_dconf_dump_bridoc_simpl_indent
. briDocToDoc
mGet >>=
traceIfDumpConf "bridoc final" _dconf_dump_bridoc_final
. briDocToDoc
-- -- convert to Simple type
-- simpl <- mGet <&> transformToSimple
-- return simpl
anns :: ExactPrint.Types.Anns <- mAsk
let filteredAnns = filterAnns ast anns
let state
= LayoutState{_lstate_baseY = 0, _lstate_curY = 0,
_lstate_indLevel = 0, _lstate_indLevelLinger = 0,
_lstate_commentsPrior =
extractCommentsPrior filteredAnns,
_lstate_commentsPost =
extractCommentsPost filteredAnns,
_lstate_commentCol = Nothing,
_lstate_addSepSpace = Nothing,
_lstate_inhibitMTEL = False,
_lstate_isNewline = NewLineStateInit}
state' <- MultiRWSS.withMultiStateS state $ layoutBriDocM briDoc'
let remainingComments
= Map.elems (_lstate_commentsPrior state') ++
Map.elems (_lstate_commentsPost state')
remainingComments `forM_`
(mTell . (: []) . LayoutErrorUnusedComment . show . fmap fst)
return $ ()
~~~~

View File

@ -1,249 +1,149 @@
name: brittany
version: 0.7.1.0
-- synopsis:
-- description:
license: AllRightsReserved
-- license-file: LICENSE
author: Lennart Spitzner
maintainer: lsp@informatik.uni-kiel.de
-- copyright:
category: Language
build-type: Simple
extra-source-files: ChangeLog.md
cabal-version: >=1.10
cabal-version: 2.2
flag brittany-dev
description: dev options
name: brittany
version: 0.14.0.2
synopsis: Haskell source code formatter
description:
See <https://github.com/lspitzner/brittany/blob/master/README.md the README>.
.
If you are interested in the implementation, have a look at <https://github.com/lspitzner/brittany/blob/master/doc/implementation/theory.md this document>;
.
The implementation is documented in more detail <https://github.com/lspitzner/brittany/blob/master/doc/implementation/index.md here>.
license: AGPL-3.0-only
license-file: LICENSE
author: Lennart Spitzner
maintainer: Lennart Spitzner <hexagoxel@hexagoxel.de>
copyright: Copyright (C) 2016-2019 Lennart Spitzner
Copyright (C) 2019 PRODA LTD
category: Language
build-type: Simple
homepage: https://github.com/lspitzner/brittany/
bug-reports: https://github.com/lspitzner/brittany/issues
extra-doc-files:
ChangeLog.md
README.md
doc/implementation/*.md
extra-source-files:
data/brittany.yaml
data/*.hs
source-repository head
type: git
location: https://github.com/lspitzner/brittany.git
flag pedantic
default: False
description: Enables @-Werror@, which turns warnings into errors.
manual: True
flag brittany-dev-lib
description: set buildable false for anything but lib
default: False
manual: True
library {
default-language:
Haskell2010
hs-source-dirs:
src
exposed-modules: {
Language.Haskell.Brittany
Language.Haskell.Brittany.Prelude
Language.Haskell.Brittany.Types
Language.Haskell.Brittany.Utils
Language.Haskell.Brittany.Config
Language.Haskell.Brittany.Config.Types
}
other-modules: {
Language.Haskell.Brittany.LayouterBasics
Language.Haskell.Brittany.Backend
Language.Haskell.Brittany.BackendUtils
Language.Haskell.Brittany.ExactPrintUtils
Language.Haskell.Brittany.Layouters.Type
Language.Haskell.Brittany.Layouters.Decl
Language.Haskell.Brittany.Layouters.Expr
Language.Haskell.Brittany.Layouters.Stmt
Language.Haskell.Brittany.Layouters.Pattern
Language.Haskell.Brittany.Transformations.Alt
Language.Haskell.Brittany.Transformations.Floating
Language.Haskell.Brittany.Transformations.Par
Language.Haskell.Brittany.Transformations.Columns
Language.Haskell.Brittany.Transformations.Indent
}
ghc-options: {
-Wall
-fprof-auto -fprof-cafs -fno-spec-constr
-j
-fno-warn-unused-imports
-fno-warn-orphans
}
if flag(brittany-dev) {
ghc-options: -O0 -Werror -fobject-code
}
common library
build-depends:
{ base >=4.9 && <4.10
, ghc >=8.0.1 && <8.1
, ghc-paths >=0.1.0.9 && <0.2
, ghc-exactprint >=0.5.1.1 && <0.6
, transformers >=0.5.2.0 && <0.6
, containers >=0.5.7.1 && <0.6
, mtl >=2.2.1 && <2.3
, text >=1.2 && <1.3
, multistate >=0.7.1.1 && <0.8
, syb >=0.6 && <0.7
, neat-interpolation >=0.3.2 && <0.4
, data-tree-print
, pretty >=1.1.3.3 && <1.2
, bytestring >=0.10.8.1 && <0.11
, directory >=1.2.6.2 && <1.3
, lens
, butcher
, yaml >=0.8.18 && <0.9
, extra >=1.4.10 && <1.5
, uniplate >=1.6.12 && <1.7
, strict >=0.3.2 && <0.4
, monad-memo >=0.4.1 && <0.5
, unsafe >=0.0 && <0.1
, safe >=0.3.9 && <0.4
, deepseq >=1.4.2.0 && <1.5
, either >=4.4.1.1 && <4.5
, semigroups >=0.18.2 && <0.19
, cmdargs >=0.10.14 && <0.11
}
default-extensions: {
CPP
, aeson ^>= 2.0.1
, base ^>= 4.15.0
, butcher ^>= 1.3.3
, bytestring ^>= 0.10.12
, cmdargs ^>= 0.10.21
, containers ^>= 0.6.4
, czipwith ^>= 1.0.1
, data-tree-print ^>= 0.1.0
, deepseq ^>= 1.4.5
, directory ^>= 1.3.6
, extra ^>= 1.7.10
, filepath ^>= 1.4.2
, ghc ^>= 9.0.1
, ghc-boot ^>= 9.0.1
, ghc-boot-th ^>= 9.0.1
, ghc-exactprint ^>= 0.6.4
, monad-memo ^>= 0.5.3
, mtl ^>= 2.2.2
, multistate ^>= 0.8.0
, pretty ^>= 1.1.3
, random ^>= 1.2.1
, safe ^>= 0.3.19
, semigroups ^>= 0.19.2
, strict ^>= 0.4.0
, syb ^>= 0.7.2
, text ^>= 1.2.5
, transformers ^>= 0.5.6
, uniplate ^>= 1.6.13
, yaml ^>= 0.11.7
default-language: Haskell2010
ghc-options:
-Weverything
-Wno-all-missed-specialisations
-Wno-incomplete-uni-patterns
-Wno-missing-deriving-strategies
-Wno-missing-export-lists
-Wno-missing-import-lists
-Wno-missing-local-signatures
-Wno-missing-safe-haskell-mode
-Wno-monomorphism-restriction
-Wno-prepositive-qualified-module
-Wno-safe
-Wno-unsafe
NoImplicitPrelude
if flag(pedantic)
ghc-options: -Werror
GADTs
common executable
import: library
FlexibleContexts
FlexibleInstances
ScopedTypeVariables
MonadComprehensions
LambdaCase
MultiWayIf
KindSignatures
}
include-dirs:
srcinc
}
build-depends: brittany
ghc-options:
-rtsopts
-threaded
-Wno-implicit-prelude
-Wno-unused-packages
library
import: library
autogen-modules: Paths_brittany
hs-source-dirs: source/library
exposed-modules:
Language.Haskell.Brittany
Language.Haskell.Brittany.Internal
Language.Haskell.Brittany.Internal.Backend
Language.Haskell.Brittany.Internal.BackendUtils
Language.Haskell.Brittany.Internal.Config
Language.Haskell.Brittany.Internal.Config.Types
Language.Haskell.Brittany.Internal.Config.Types.Instances
Language.Haskell.Brittany.Internal.ExactPrintUtils
Language.Haskell.Brittany.Internal.LayouterBasics
Language.Haskell.Brittany.Internal.Layouters.DataDecl
Language.Haskell.Brittany.Internal.Layouters.Decl
Language.Haskell.Brittany.Internal.Layouters.Expr
Language.Haskell.Brittany.Internal.Layouters.IE
Language.Haskell.Brittany.Internal.Layouters.Import
Language.Haskell.Brittany.Internal.Layouters.Module
Language.Haskell.Brittany.Internal.Layouters.Pattern
Language.Haskell.Brittany.Internal.Layouters.Stmt
Language.Haskell.Brittany.Internal.Layouters.Type
Language.Haskell.Brittany.Internal.Obfuscation
Language.Haskell.Brittany.Internal.ParseModule
Language.Haskell.Brittany.Internal.Prelude
Language.Haskell.Brittany.Internal.PreludeUtils
Language.Haskell.Brittany.Internal.Transformations.Alt
Language.Haskell.Brittany.Internal.Transformations.Columns
Language.Haskell.Brittany.Internal.Transformations.Floating
Language.Haskell.Brittany.Internal.Transformations.Indent
Language.Haskell.Brittany.Internal.Transformations.Par
Language.Haskell.Brittany.Internal.Types
Language.Haskell.Brittany.Internal.Utils
Language.Haskell.Brittany.Main
Paths_brittany
executable brittany
if flag(brittany-dev-lib) {
buildable: False
} else {
buildable: True
}
main-is: Main.hs
-- other-modules:
-- other-extensions:
import: executable
hs-source-dirs: source/executable
main-is: Main.hs
test-suite brittany-test-suite
import: executable
build-depends:
{ brittany
, base >=4.9 && <4.10
, ghc
, ghc-paths
, ghc-exactprint
, transformers
, containers
, mtl
, text
, multistate
, syb
, neat-interpolation
, hspec
, data-tree-print
, pretty
, bytestring
, directory
, lens
, butcher
, yaml
, extra
, uniplate
, strict
, monad-memo
, safe
, filepath >=1.4.1.0 && <1.5
, either
, ghc-boot-th
}
hs-source-dirs: src-brittany
default-language: Haskell2010
default-extensions: {
CPP
NoImplicitPrelude
GADTs
FlexibleContexts
FlexibleInstances
ScopedTypeVariables
MonadComprehensions
LambdaCase
MultiWayIf
KindSignatures
}
ghc-options: {
-Wall
-fprof-auto -fprof-cafs -fno-spec-constr
-j
-fno-warn-unused-imports
-fno-warn-orphans
-rtsopts
-with-rtsopts "-M2G"
}
if flag(brittany-dev) {
ghc-options: -O0 -Werror -fobject-code
}
test-suite unittests
if flag(brittany-dev-lib) {
buildable: False
} else {
buildable: True
}
type: exitcode-stdio-1.0
default-language: Haskell2010
build-depends:
{ brittany
, base >=4.9 && <4.10
, ghc
, ghc-paths
, ghc-exactprint
, transformers
, containers
, mtl
, text
, multistate
, syb
, neat-interpolation
, hspec
, data-tree-print
, pretty
, bytestring
, directory
, lens
, butcher
, yaml
, extra
, uniplate
, strict
, monad-memo
, safe
, either
}
ghc-options: -Wall
main-is: TestMain.hs
other-modules: IdentityTests
TestUtils
AsymptoticPerfTests
hs-source-dirs: src-unittests
default-extensions: {
CPP
NoImplicitPrelude
GADTs
FlexibleContexts
FlexibleInstances
ScopedTypeVariables
MonadComprehensions
LambdaCase
MultiWayIf
KindSignatures
}
ghc-options: {
-Wall
-j
-fno-warn-unused-imports
-fno-warn-orphans
-rtsopts
-with-rtsopts "-M2G"
}
if flag(brittany-dev) {
ghc-options: -O0 -Werror -fobject-code
}
, hspec ^>= 2.8.3
hs-source-dirs: source/test-suite
main-is: Main.hs
type: exitcode-stdio-1.0

4
brittany.yaml Normal file
View File

@ -0,0 +1,4 @@
conf_layout:
lconfig_columnAlignMode:
tag: ColumnAlignModeDisabled
lconfig_indentPolicy: IndentPolicyLeft

9
cabal.project Normal file
View File

@ -0,0 +1,9 @@
packages: .
allow-newer:
-- https://github.com/lspitzner/butcher/issues/7
, butcher:base
-- https://github.com/lspitzner/data-tree-print/pull/2
, data-tree-print:base
-- https://github.com/lspitzner/multistate/pull/8
, multistate:base

1
data/Test1.hs Normal file
View File

@ -0,0 +1 @@
func :: a -> a

3
data/Test10.hs Normal file
View File

@ -0,0 +1,3 @@
func
:: lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd
-> (lakjsdlkjasldkj -> lakjsdlkjasldkj)

1
data/Test100.hs Normal file
View File

@ -0,0 +1 @@
func = klajsdas klajsdas klajsdas

3
data/Test101.hs Normal file
View File

@ -0,0 +1,3 @@
func = lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd
lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd
lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd

3
data/Test102.hs Normal file
View File

@ -0,0 +1,3 @@
func = lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd lakjsdlajsdljas
lakjsdlajsdljas
lakjsdlajsdljas

1
data/Test103.hs Normal file
View File

@ -0,0 +1 @@
func = (1 +)

1
data/Test104.hs Normal file
View File

@ -0,0 +1 @@
func = (+ 1)

1
data/Test105.hs Normal file
View File

@ -0,0 +1 @@
func = (1 `abc`)

1
data/Test106.hs Normal file
View File

@ -0,0 +1 @@
func = (`abc` 1)

1
data/Test107.hs Normal file
View File

@ -0,0 +1 @@
func = (abc, def)

1
data/Test108.hs Normal file
View File

@ -0,0 +1 @@
func = (abc, )

1
data/Test109.hs Normal file
View File

@ -0,0 +1 @@
func = (, abc)

3
data/Test11.hs Normal file
View File

@ -0,0 +1,3 @@
func
:: (lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd -> lakjsdlkjasldkj)
-> lakjsdlkjasldkj

6
data/Test110.hs Normal file
View File

@ -0,0 +1,6 @@
myTupleSection =
( verylaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaargefirstelement
,
, verylaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaargethirdelement
,
)

4
data/Test111.hs Normal file
View File

@ -0,0 +1,4 @@
func =
( lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd
, lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd
)

6
data/Test112.hs Normal file
View File

@ -0,0 +1,6 @@
foo = if True
then
-- iiiiii
"a "
else
"b "

5
data/Test113.hs Normal file
View File

@ -0,0 +1,5 @@
func = if cond
then pure 42
else do
-- test
abc

3
data/Test114.hs Normal file
View File

@ -0,0 +1,3 @@
func = case x of
False -> False
True -> True

7
data/Test115.hs Normal file
View File

@ -0,0 +1,7 @@
func =
case
lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd
lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd
of
False -> False
True -> True

7
data/Test116.hs Normal file
View File

@ -0,0 +1,7 @@
func = do
case
lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd
lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd
of
False -> False
True -> True

1
data/Test117.hs Normal file
View File

@ -0,0 +1 @@
func = case x of {}

5
data/Test118.hs Normal file
View File

@ -0,0 +1,5 @@
func =
case
lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd
lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd
of {}

5
data/Test119.hs Normal file
View File

@ -0,0 +1,5 @@
func = do
case
lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd
lakjsdlajsdljasdlkjasldjasldjasldjalsdjlaskjd
of {}

5
data/Test12.hs Normal file
View File

@ -0,0 +1,5 @@
func
:: ( lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd
-> lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd
)
-> lakjsdlkjasldkj

3
data/Test120.hs Normal file
View File

@ -0,0 +1,3 @@
func = do
stmt
stmt

3
data/Test121.hs Normal file
View File

@ -0,0 +1,3 @@
func = do
x <- stmt
stmt x

3
data/Test122.hs Normal file
View File

@ -0,0 +1,3 @@
func = do
let x = 13
stmt x

7
data/Test123.hs Normal file
View File

@ -0,0 +1,7 @@
func =
foooooo
$ [ case
foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
of
_ -> True
]

4
data/Test124.hs Normal file
View File

@ -0,0 +1,4 @@
testMethod foo bar baz qux =
let x = undefined foo bar baz qux qux baz bar :: String
-- some comment explaining the in expression
in undefined foo x :: String

4
data/Test125.hs Normal file
View File

@ -0,0 +1,4 @@
testMethod foo bar baz qux =
let x = undefined :: String
-- some comment explaining the in expression
in undefined :: String

3
data/Test126.hs Normal file
View File

@ -0,0 +1,3 @@
testMethod foo bar baz qux =
-- some comment explaining the in expression
let x = undefined :: String in undefined :: String

6
data/Test127.hs Normal file
View File

@ -0,0 +1,6 @@
foo foo bar baz qux =
let a = 1
b = 2
c = 3
-- some comment explaining the in expression
in undefined :: String

6
data/Test128.hs Normal file
View File

@ -0,0 +1,6 @@
func =
foo
$ [ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
]
++ [ccccccccccccccccccccccccccccccccccccccccccccccccccccccccc]

1
data/Test129.hs Normal file
View File

@ -0,0 +1 @@
module Main where

5
data/Test13.hs Normal file
View File

@ -0,0 +1,5 @@
func
:: ( ( lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd
-> lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd
)
)

1
data/Test130.hs Normal file
View File

@ -0,0 +1 @@
module Main () where

1
data/Test131.hs Normal file
View File

@ -0,0 +1 @@
module Main (main) where

1
data/Test132.hs Normal file
View File

@ -0,0 +1 @@
module Main (main, test1, test2) where

12
data/Test133.hs Normal file
View File

@ -0,0 +1,12 @@
module Main
( main
, test1
, test2
, test3
, test4
, test5
, test6
, test7
, test8
, test9
) where

12
data/Test134.hs Normal file
View File

@ -0,0 +1,12 @@
module Main
( main
-- main
, test1
, test2
-- Test 3
, test3
, test4
-- Test 5
, test5
-- Test 6
) where

1
data/Test135.hs Normal file
View File

@ -0,0 +1 @@
module Main (Test(..)) where

1
data/Test136.hs Normal file
View File

@ -0,0 +1 @@
module Main (module Main) where

1
data/Test137.hs Normal file
View File

@ -0,0 +1 @@
module Main (Test(Test, a, b)) where

6
data/Test138.hs Normal file
View File

@ -0,0 +1,6 @@
-- comment1
module Main
( Test(Test, a, b)
, foo -- comment2
) -- comment3
where

1
data/Test139.hs Normal file
View File

@ -0,0 +1 @@
module Main (Test()) where

1
data/Test14.hs Normal file
View File

@ -0,0 +1 @@
func :: asd -> Either a b

1
data/Test140.hs Normal file
View File

@ -0,0 +1 @@
-- Intentionally left empty

1
data/Test141.hs Normal file
View File

@ -0,0 +1 @@
import Data.List

1
data/Test142.hs Normal file
View File

@ -0,0 +1 @@
import Data.List as L

1
data/Test143.hs Normal file
View File

@ -0,0 +1 @@
import qualified Data.List

1
data/Test144.hs Normal file
View File

@ -0,0 +1 @@
import qualified Data.List as L

1
data/Test145.hs Normal file
View File

@ -0,0 +1 @@
import safe Data.List as L

1
data/Test146.hs Normal file
View File

@ -0,0 +1 @@
import {-# SOURCE #-} Data.List ( )

1
data/Test147.hs Normal file
View File

@ -0,0 +1 @@
import safe qualified Data.List

1
data/Test148.hs Normal file
View File

@ -0,0 +1 @@
import {-# SOURCE #-} safe qualified Data.List

1
data/Test149.hs Normal file
View File

@ -0,0 +1 @@
import qualified "base" Data.List

5
data/Test15.hs Normal file
View File

@ -0,0 +1,5 @@
func
:: asd
-> Either
lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd
lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd

3
data/Test150.hs Normal file
View File

@ -0,0 +1,3 @@
import {-# SOURCE #-} safe qualified "base" Data.List as L
import {-# SOURCE #-} safe qualified "base" Data.List ( )
import {-# SOURCE #-} safe qualified Data.List hiding ( )

1
data/Test151.hs Normal file
View File

@ -0,0 +1 @@
import qualified Data.List ( )

1
data/Test152.hs Normal file
View File

@ -0,0 +1 @@
import Data.List ( nub )

4
data/Test153.hs Normal file
View File

@ -0,0 +1,4 @@
import Data.List ( foldl'
, indexElem
, nub
)

14
data/Test154.hs Normal file
View File

@ -0,0 +1,14 @@
import Test ( Long
, anymore
, fit
, items
, line
, list
, not
, onA
, quite
, single
, that
, will
, with
)

11
data/Test155.hs Normal file
View File

@ -0,0 +1,11 @@
import Test ( (+)
, (:!)(..)
, (:*)((:.), T7, t7)
, (:.)
, T
, T2()
, T3(..)
, T4(T4)
, T5(T5, t5)
, T6((<|>))
)

3
data/Test156.hs Normal file
View File

@ -0,0 +1,3 @@
import Test hiding ( )
import Test as T
hiding ( )

13
data/Test157.hs Normal file
View File

@ -0,0 +1,13 @@
import Prelude as X
hiding ( head
, init
, last
, maximum
, minimum
, pred
, read
, readFile
, succ
, tail
, undefined
)

3
data/Test158.hs Normal file
View File

@ -0,0 +1,3 @@
import TestJustAbitToLongModuleNameLikeThisOneIs
( )
import TestJustShortEnoughModuleNameLikeThisOne ( )

3
data/Test159.hs Normal file
View File

@ -0,0 +1,3 @@
import TestJustAbitToLongModuleNameLikeThisOneI
as T
import TestJustShortEnoughModuleNameLikeThisOn as T

6
data/Test16.hs Normal file
View File

@ -0,0 +1,6 @@
func
:: asd
-> Trither
lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd
lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd
lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd

3
data/Test160.hs Normal file
View File

@ -0,0 +1,3 @@
import TestJustAbitToLongModuleNameLikeTh
hiding ( )
import TestJustShortEnoughModuleNameLike hiding ( )

10
data/Test161.hs Normal file
View File

@ -0,0 +1,10 @@
import MoreThanSufficientlyLongModuleNameWithSome
( compact
, fit
, inA
, items
, layout
, not
, that
, will
)

11
data/Test162.hs Normal file
View File

@ -0,0 +1,11 @@
import TestJustAbitToLongModuleNameLikeTh
hiding ( abc
, def
, ghci
, jklm
)
import TestJustShortEnoughModuleNameLike hiding ( abc
, def
, ghci
, jklm
)

9
data/Test163.hs Normal file
View File

@ -0,0 +1,9 @@
import {-# SOURCE #-} safe qualified "qualifier" A hiding ( )
import {-# SOURCE #-} safe qualified "qualifiers" A
hiding ( )
import {-# SOURCE #-} safe qualified "qualifiers" AlsoAf as T
import {-# SOURCE #-} safe qualified "qualifiers" AlsoAff ( )
import {-# SOURCE #-} safe qualified "qualifiers" AlsoAff
as T
import {-# SOURCE #-} safe qualified "qualifiers" AlsoAffe
( )

7
data/Test164.hs Normal file
View File

@ -0,0 +1,7 @@
-- Test
import Data.List ( nub ) -- Test
{- Test -}
import qualified Data.List as L
( foldl' ) {- Test -}
-- Test
import Test ( test )

4
data/Test165.hs Normal file
View File

@ -0,0 +1,4 @@
import Test ( abc
, def
-- comment
)

3
data/Test166.hs Normal file
View File

@ -0,0 +1,3 @@
import Test ( abc
-- comment
)

8
data/Test167.hs Normal file
View File

@ -0,0 +1,8 @@
import Test ( abc
-- comment
, def
, ghi
{- comment -}
, jkl
-- comment
)

2
data/Test168.hs Normal file
View File

@ -0,0 +1,2 @@
import Test ( -- comment
)

8
data/Test169.hs Normal file
View File

@ -0,0 +1,8 @@
import Test ( longbindingNameThatoverflowsColum
)
import Test ( Long
( List
, Of
, Things
)
)

6
data/Test17.hs Normal file
View File

@ -0,0 +1,6 @@
func
:: Trither
lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd
lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd
lkasdlkjalsdjlakjsdlkjasldkjalskdjlkajsd
-> asd

18
data/Test170.hs Normal file
View File

@ -0,0 +1,18 @@
import Test ( Thing
( -- Comments
)
)
import Test ( Thing
( Item
-- and Comment
)
)
import Test ( Thing
( With
-- Comments
, and
-- also
, items
-- !
)
)

2
data/Test171.hs Normal file
View File

@ -0,0 +1,2 @@
import VeryLongModuleNameThatCouldEvenCauseAnEmptyBindingListToExpandIntoMultipleLine
( )

26
data/Test172.hs Normal file
View File

@ -0,0 +1,26 @@
{-# LANGUAGE BangPatterns #-}
{-
- Test module
-}
module Test
( test1
-- ^ test
, test2
-- | test
, test3
, test4
, test5
, test6
, test7
, test8
, test9
, test10
-- Test 10
) where
-- Test
import Data.List ( nub ) -- Test
{- Test -}
import qualified Data.List as L
( foldl' ) {- Test -}
-- Test
import Test ( test )

2
data/Test173.hs Normal file
View File

@ -0,0 +1,2 @@
import Aaa
import Baa

5
data/Test174.hs Normal file
View File

@ -0,0 +1,5 @@
import Zaa
import Zab
import Aaa
import Baa

2
data/Test175.hs Normal file
View File

@ -0,0 +1,2 @@
import Boo
import qualified Zoo

3
data/Test176.hs Normal file
View File

@ -0,0 +1,3 @@
import Boo ( a )
import Boo ( b )

Some files were not shown because too many files have changed in this diff Show More