Commit Graph

409 Commits (17fb271694d5d2936564776f804918fabf1cb730)

Author SHA1 Message Date
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