Commit Graph

99 Commits (2dfa691f9e0abf57f6a610233fd5141bf0eddf33)

Author SHA1 Message Date
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 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 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 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 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 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 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 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 575d530188 Use ExactPrintFallback for unknown constructs
fixes #11
2017-03-06 12:45:19 +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 1b7576dcd1 Fix --ghc-options handling 2016-09-06 15:29:13 +02:00
Lennart Spitzner cb93a6903c Fix horizontal alignment issue; Add testcases 2016-09-04 14:24:19 +02:00
Lennart Spitzner a29836d09c Refactor module structure; Clean up imports 2016-09-04 00:24:20 +02:00
Lennart Spitzner b03996e401 Apply brittany on parts of its source; Add comments 2016-09-03 23:02:32 +02:00
Lennart Spitzner 3809ba9ef0 Fix some type sig layouting minor issue 2016-09-03 21:50:31 +02:00
Lennart Spitzner 48b2057d84 Improve horizontal alignments significantly (patterns) 2016-09-03 21:32:18 +02:00
Lennart Spitzner fc47372005 Restore aligning on non-function bindings 2016-09-02 00:38:56 +02:00
Lennart Spitzner 371fad303d Improve column aligning; Add config for aligning 2016-09-02 00:38:56 +02:00
Lennart Spitzner 395fe02644 Stop aligning patterns for different functions 2016-09-02 00:06:49 +02:00
Lennart Spitzner 8218b6e199 Fix tuple type multiline layouting 2016-09-01 15:19:56 +02:00
Lennart Spitzner 40509dc3f0 Fix comment omission on type vars and qual type 2016-09-01 14:37:17 +02:00
Lennart Spitzner fedfeaaecd Improve HsLam and OpApp layouting 2016-09-01 13:49:30 +02:00
Lennart Spitzner 8277e85187 Fix NonBottom/setBaseY getSpacing(s) interaction
- Rename NonBottom -> Always
2016-09-01 12:35:11 +02:00
Lennart Spitzner cc9b1f6885 Fix comment placement for HsIf/HsLet 2016-08-18 15:27:10 +02:00
Lennart Spitzner d0fcfc563e Fix if-then-else comment placement issue 2016-08-18 01:14:11 +02:00
Lennart Spitzner e67855fd98 Fix list comprehension comment placement issue 2016-08-18 00:59:12 +02:00
Lennart Spitzner b58a8b0146 Fix commandline flag parsing (again, oops) 2016-08-12 20:57:37 +02:00