1
1
mirror of https://github.com/google/ormolu.git synced 2024-11-27 13:13:23 +03:00
Commit Graph

176 Commits

Author SHA1 Message Date
mrkkrp
87406cbd8f Align opening/closing parentheses and other similar punctuation 2019-09-17 11:58:22 +02:00
mrkkrp
a4e97da37d Introduce a breakpoint after ‘forall’ in type signatures 2019-09-16 13:16:26 +02:00
Utku Demir
c16fe06df3 Tweak hanging logic on HsApp 2019-09-16 10:56:18 +02:00
Utku Demir
ed27fb4a9a Handle operators as record fields 2019-09-16 10:38:07 +02:00
mrkkrp
a83796bccb Fix positioning of shebangs 2019-09-14 16:47:19 +02:00
mrkkrp
75ac291f13 Hang guarded equations
Previously guarded expressions were always printed in non-hanging fashion
even if they had a hanging form. This change fixes this behavior.
2019-09-14 14:34:39 +02:00
Utku Demir
1b818c0064 Correct indentation on string gaps
Haskell strings can have "gaps", where any amount of whitespace between
two backslashes are ignored. This allows writing multi-line strings. As
an example, all strings below are the same:

```
"foobar"
"foo\   \bar"
"foo\

   \bar"
```

When parsing a string literal, lexer usually produces two fields, one
of them is the actual string user wrote as a 'SourceText', the other one
is the sanitized version where gaps and other special characters removed.

While printing the string, GHC's Outputable instance uses the 'SourceText'
field, however since that text contains gaps as-is, we can not change
the original indentation. In order to fix this, this commit splits the
strings by the gaps and print each line separately applying the layout
rules.

Also, it applies the same logic to type-level strings.
2019-09-13 11:26:05 +02:00
mrkkrp
c9c3876410 Handle comments inside of import statements better 2019-09-12 21:59:43 +02:00
Utku Demir
5c923a2cf7 Group together pragmas after type signatures 2019-09-11 13:10:19 +02:00
Utku Demir
7268eb1e98 Handle operator chains better
I implemented a custom logic where we assign a score to every occurance of
an operator based on their location, and the average of that score determine
the fixity of the operator.

As you can imagine, the solution is a bit brittle; and it is easy to mislead
it if you knowingly craft an input, but it gave acceptable results for every
code snippet I found online. And since it returns the same AST no matter how
we infer the fixities, it is not the end of the world if we infer something
incorrectly.

The code is not really optimised, and I think it has quadratic time
complexity. Notably, we use opTreeLoc function quite often and it traverses
the whole tree every time. Memoizing that on the OpBranch constructor would
make formatting files with reeeally long operator chains a lot faster. We
can do this once we decide to optimize for speed.
2019-09-10 18:27:15 +02:00
mrkkrp
e5d197fed9 Do not enable -XBangPatterns by default
Here is an example which fails to parse with bang patterns but succeeds
otherwise:

  (!) :: Foo -> Int -> Int
  (Foo n) ! p = n + p

To run Ormolu on this we must not enable bang patterns by default.
2019-09-10 15:33:55 +02:00
mrkkrp
1e14f9ff7e Better handle multi-line following comments 2019-09-09 11:54:18 +02:00
mrkkrp
d4761bf425 Enable checking the ‘tls’ package on CI 2019-09-09 11:13:58 +02:00
mrkkrp
a3a93ebfef Refactor the comment rendering code and ‘newline’
This removes (or rather puts it to a lower level) logic around “modifying
newline” because it was very hard to reason about and almost blocked my work
on fixing issue #337.

I also dropped debugging output because it's too verbose and I'm not using
it anyway.

As part of these changes I also changed now the ‘newline’ combinator works.
Now, similar to ‘space’, the second ‘newline’ in a row just tells the
rendering engine to prefix next thing with a newline, using the ‘newline’
combinator more than twice in a row has no effect.

To take full advantage of the new feature I also went through the code and
simplified some logic around outputting exact amount of newlines because now
it's harder to get things wrong, so we can be less careful with counting
newlines.
2019-09-05 16:56:43 +02:00
Utku Demir
e90508e88f Support infix patern synonyms 2019-09-05 11:38:23 +02:00
Utku Demir
b2c6388a01 Remove extra space before type variables with apostrophe 2019-09-05 11:25:33 +02:00
Utku Demir
9dd08eea3b Remove UnicodeSyntax from default extensions 2019-08-30 11:48:26 +02:00
Utku Demir
4ae8025f90 Workaround pattern constructs in expressions 2019-08-30 11:47:30 +02:00
Utku Demir
a2af1eb831 Remove TypeApplications from default extensions 2019-08-30 11:32:31 +02:00
Utku Demir
76ce40df7f Don't use newlines on LambdaCases on single-line layouts 2019-08-30 11:28:47 +02:00
Utku Demir
592e4695c9 Make multi-line multi-name patterns prettier 2019-08-28 12:04:25 +02:00
Utku Demir
8662581ad5 Correctly place comments inside enclosing expressions at the end of the module 2019-08-28 12:04:14 +02:00
mrkkrp
8485e34ec7
Use ‘sitcc’ around let-in construction
Due to the “weird” leading space before ‘in’ we get rather unpleasing
results without ‘sitcc’.
2019-08-27 18:28:49 +02:00
mrkkrp
96390b2405 Fix idempotence bug due to wandering comments
Previously, if an operator had preceding comments attached to its second
argument, they would end up printed right after the operator:

  a
    + -- b comment
      b

On second run however, the comment would be interpreted as attached to ‘(+)’
and the result would be:

  a
    + b -- b comment

Breaking the idempotence guarantees.

The solution that this commit implements includes several steps:

* Introduce the concept of “dirty line”. A line is dirty if it has something
  on it that can have a comment attached to it.

* ‘txt’ is supposed to output fixed bits of syntax that cannot have comments
  attached to them (at least in Ormolu's model).

* ‘atom’ on the other hand outputs things that mark the current line dirty.

* When we're to print preceding comments for the second argument we check if
  the current line is dirty. If it is, we output an extra newline to prevent
  the first comment from changing “hosts”.

* Now there is another problem with trailing whitespace after the operator
  in that case. We solve that by making spaces a bit “lazy”. When the ‘space’
  combinator is used (which is the recommeneded way to separate different
  constructs now) it just guarantees that the next thing we'll output on the
  same line will be separated from previous output by a single space.
  So, using ‘space’ twice results in single space in output still. This has
  the extra benefit of simplifying all the logic that made sure that we have
  only single space and not 0 or 2 spaces when spaces are inserted
  conditionally and independently.
2019-08-27 17:32:11 +02:00
Utku Demir
effb5cd306 Group declarations referring to multiple names 2019-08-27 11:08:43 +02:00
Utku Demir
721ba7e367 Only force braces on hsLocalBinds on a single-line layout 2019-08-27 10:33:11 +02:00
Utku Demir
e5b99e8e66 Be more conservative when inserting braces 2019-08-26 11:58:19 +02:00
Utku Demir
af907ecb9e Make the first newline optional on class declarations 2019-08-26 10:49:23 +02:00
Utku Demir
25c609ca23 Fix an issue with detecting spans of patterns with guards 2019-08-26 10:39:25 +02:00
Utku Demir
de279d8012 Align multi-line lambda arguments nicer 2019-08-25 13:36:47 +02:00
Utku Demir
b2c26b7859 Conditionally add an extra newline on instances 2019-08-25 13:03:45 +02:00
Utku Demir
8cb86d3fac Hang expressions in if-then-else 2019-08-25 12:43:12 +02:00
Utku Demir
9a1f5ebd87 Split large examples
There has been a lot of good intense work lately and as a result of that
some examples have grown considerably. The problem is that we do not show
diffs when something is not formatted as expected, we show entire
"expected/got" files. It works well when files are small, but not so well
where they are huge (some of our examples are well beyond 100 lines). It can
be hard to understand where the problem is.

This commit split long examples into smaller ones to make it easier to see
what went wrong when a test fails.
2019-08-25 12:35:31 +02:00
mrkkrp
f94400b486 Indent ‘then’ and ‘else’ clauses one level further
This arguably improves readability especially when if-then-else is placed
inside of a ‘do’-block.
2019-08-16 22:38:38 +02:00
Utku Demir
e598b72be5 Preserve the name of the expression bracket
Both `[e|...|]` and `[||]` mean the same thing, and instead of sticking to a
single style, we can just preserve what user wrote.
2019-08-16 22:17:53 +02:00
Yuriy Syrovetskiy
ee3c506889 Change multiway if layout to keep consistent 2-space indent increase 2019-08-16 17:03:11 +02:00
mrkkrp
d0a44c23cb Add a couple of tests for lambdas with block arguments 2019-08-16 16:48:39 +02:00
mrkkrp
0f76bd4a56
Fix the build 2019-08-16 16:42:35 +02:00
Utku Demir
118558738b Hang after block arguments 2019-08-16 16:20:33 +02:00
yumiova
682a5f4672 Dedent parallel list comprehensions by one step 2019-08-16 16:20:20 +02:00
Utku Demir
159e5e7761 Use new operator style in types & declarations
```
a
  + b
```

instead of

```
a +
  b
2019-08-16 16:15:28 +02:00
Utku Demir
f86155a8ea Try to contain comments inside enclosing constructs
Attach the comment if the next element is not a sibling. I think this is
quite often what we want, since if we put a comment inside a construct, we
prefer it to stay inside the same element.
2019-08-16 16:11:33 +02:00
Utku Demir
58f81876e9 Hang record constructor fields 2019-08-16 16:08:17 +02:00
Utku Demir
625f23959c Implement implicit parameter bindings 2019-08-16 15:57:20 +02:00
Utku Demir
16f2c644a7 Implement handling of semicolons 2019-08-16 15:41:40 +02:00
Utku Demir
c3d69d5853 Print multiline comments without changing the contents
Changing the relative position of the closing brace can cause whitespace
changes.
2019-08-16 15:41:26 +02:00
Utku Demir
b3f6e1b4f6 Correctly format when adding annotations to types 2019-08-14 21:35:35 +02:00
Utku Demir
f55021d89b Fix printing of the rewrite rule names 2019-08-14 21:34:05 +02:00
Utku Demir
a392aef71e Fix the issue with promoted containers with promoted elements 2019-08-14 21:31:50 +02:00
Utku Demir
57373e536d Fix formatting of infix type synonyms using ‘p_infixDefHelper’ 2019-08-14 21:30:43 +02:00