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
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
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
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
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
a42bf2e03f
Merge branch 'IndentPolicyMultiple'
2018-05-01 23:26:05 +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
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
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
18704e403f
Fix inline disabling of brittany
2018-04-19 17:09:10 +02:00
Lennart Spitzner
b43ee43220
Fix/Implement empty type constraint handling ( fixes #133 )
2018-04-02 17:11:53 +02: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
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
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
41a60ce60f
Merge branch 'master' into import
2018-03-11 17:43:16 +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
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
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
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
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
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
98c93f0d63
Move expanded binding list to standard indent level for compact layout
2017-12-22 16:35:39 +01:00
ad34a8b9b9
Only expand empty binding list with comments
2017-12-22 10:18:09 +01:00
3708838b6a
Also handle comments inside ThingWith
2017-12-22 06:58:39 +01:00
21c080572b
Add compact version of import layout
...
Also let layoutLLIEs deal with comments
2017-12-21 23:51:27 +01:00
Lennart Spitzner
f651d02898
Merge branch 'dev' into import
2017-12-19 22:27:37 +01:00
162b6e6bfd
Also fix export comments
...
Also refactored a little to improve reuse of the docWrapNode logic
2017-12-19 16:33:13 +01:00
a59df1f391
Fix comments!! 🎉
2017-12-19 14:28:22 +01:00
7c51a181c8
Fix operators for ThingWith
2017-12-19 01:17:19 +01:00
Lennart Spitzner
8c3a9bec25
Fix operators in import list
2017-12-18 18:56:50 +01:00
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
a72465ebef
Add context-free tests
2017-12-17 13:13:19 +01:00
ee9abff9e8
Add import and module support
2017-12-17 12:51:04 +01:00
9704fc3490
add tuple section tests
2017-12-14 18:15:07 -05:00
Lennart Spitzner
39c48b33f1
Fix error in Annotation filtering ( fixes #70 )
2017-12-08 19:57:16 +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
f6859d184f
Fix tests after rebase.
2017-11-27 13:05:04 -05:00
e9a2de7a85
Filter binders with docSetBaseAndIndent.
2017-11-27 18:12:19 +01:00
ba3d9ad739
Add tests for record construction.
2017-11-27 18:12:19 +01:00
d7ac478fc6
Update type operator pending tests to remove context.
2017-11-27 18:12:19 +01:00
44e95940c0
Change record update syntax for left indent policy
2017-11-27 18:12:19 +01:00
a6bea7542b
Update pending long operator use for left indent.
2017-11-27 18:12:19 +01:00
d1e1984206
Update guard formatting for IndentPolicyLeft
2017-11-27 18:12:19 +01:00
f3c37a6abf
Update pending long argument test to context free.
2017-11-27 18:12:19 +01:00
cd9f7de566
Update pending type operator test for context free.
2017-11-27 18:12:19 +01:00
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
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
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
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
ccf2eb092f
Support RecordWildCards, Add one-liner layouting for records
...
fixes #52
2017-10-01 17:24:13 +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
655074d1c0
Fix comment insertion error introduced in 91b9a240
2017-08-10 13:09:39 +02:00
Lennart Spitzner
91b9a240f1
Fix comment-before-BDCols issue; Relax alignmentBreakOnMultiline
2017-08-07 00:35:09 +02:00
00ad6c71b9
Impl. layouting of TypeApplication, fixes #38
2017-07-28 18:03:21 +02:00
6268b8075a
Fix layouting bug for RecordUpd
2017-07-04 23:57:54 +02:00
5a82968a7b
Add sub-config-alternative default to lib interface
...
i.e. `forwardOptionsSyntaxExtsEnabled`
2017-07-04 23:26:13 +02:00
cece70380c
Fix/Implement proper layouting of MultiWayIf
2017-06-28 23:35:02 +02:00
6d472315e3
Fix layouting special-case (getSpacing(s) internals)
2017-06-04 18:15:22 +02:00
5e3cc0a7c3
Fix OpApp layouting/indentation annoyance
2017-06-04 16:28:01 +02:00
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
f350113f7f
Refactor all modules: +Internal; Add public Brittany module
2017-05-22 21:25:08 +02:00
8f1e366f9c
Change config file structure; Add config version tag
2017-05-21 16:48:05 +02:00
4ee44388f7
Improve layouting for OpApp (special-case for dollar/HsVar)
2017-05-21 13:43:39 +02:00
8b7b1334e2
Fix forall type signature layouting
2017-05-18 14:18:10 +02:00
83ba7803e6
Fix layouting issues in lists/listcomprehension
2017-05-17 23:31:20 +02:00
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
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
c3dc3b6074
And one more touch to ExplicitList
2017-05-02 16:32:43 +02:00
ca42178eff
Improve tuple layouting (also fixes #18 for tuples)
2017-05-02 16:21:13 +02:00
f6324da600
Fix ExplicitList comment insertion ( fixes #18 )
2017-05-02 14:20:58 +02:00
505ad99f35
Handle InlineSig construct (pragma), fixes #20
2017-04-12 21:47:59 +02:00
Phil Hazelden
Lennart Spitzner
Bryan Richter
Evan Rutledge Borden
sniperrifle2004
Matthew Piziak
Evan Rutledge Borden
Lennart Spitzner
Lennart Spitzner