1
1
mirror of https://github.com/google/ormolu.git synced 2024-12-04 06:32:12 +03:00
Commit Graph

143 Commits

Author SHA1 Message Date
mrkkrp
803f76aab9 Fix Haddock placement for function arguments
I'm not sure it's perfect, but it fixes the original issue and all the tests
pass.

The problem was in entering with locate (or some version of it) the same
span twice. So the algorithm saw an element with identical enclosing element
and the ‘commentFollowsElt’ function got confused.

The solution is two first augment registration of enclosing spans to allow
us to keep more than one item there. Then we can filter out spans which are
just copies of current reference span to get to the “real” enclosing span.

It seems to make sense to attach comments to child element if it starts
exactly at the same position of parent element, hence the distance between
start of enclosing/reference span and start of comment is the same, thus
changing ‘>’ to ‘>=’ in ‘commentFollowsElt’.
2019-06-11 22:21:41 +02:00
mrkkrp
5165003149 Fix rendering of implicit parameter variables 2019-06-10 22:43:37 +02:00
mrkkrp
be0ce29744 Fix rendering of case alternatives with guards
Also rolls back handing things in if branches, because it doesn't look so
good?
2019-06-10 22:34:12 +02:00
mrkkrp
656d0369d4 Output multiple specialize pragmas in a row nicer
We should not insert newlines between them.
2019-06-10 21:34:49 +02:00
mrkkrp
e98df37597 Fix rendering of value-level units 2019-06-10 21:24:12 +02:00
Mitchell Rosen
4b1d31e4ea Implement rendering of ‘SigPat’s 2019-06-10 21:24:00 +02:00
mrkkrp
fab9f15ad6 Implement specialize pragma 2019-06-09 15:03:55 +02:00
mrkkrp
d9d4219f83 Add ‘pragmaBraces’ 2019-06-09 15:03:55 +02:00
mrkkrp
c421b22832 Make test suite failures a bit more readable 2019-06-09 15:03:55 +02:00
mrkkrp
046f14e7e5 Implement support for inline signatures 2019-06-09 15:03:55 +02:00
mrkkrp
a8235f7164 Implement fixity signatures, plus some refactoring 2019-06-09 15:03:55 +02:00
yumiova
c05d9d62e0 Support associated data types and open data family instances 2019-06-08 22:28:25 +02:00
mrkkrp
2dfd181c2f Avoid comparing ‘SourceText’ when comparing ASTs 2019-06-08 22:28:25 +02:00
yumiova
5f5f9227aa Implement rendering of instance declarations
This pull request implements half of #49. Specifically, it deals with pretty printing instance declarations and most structures needed to support that. This includes pretty printing of associated types (and therefore also type family instances.) However, this _does not_ include pretty printing of associated data types.

Pretty printing of type class declarations is to be dealt with at a later time.

Instances are formatted such that indentation hangs after the `instance`. Namely,

```haskell
instance Eq a
         => Eq [a] where
```

To support pretty printing associated types, the function `p_tyFamInstEqn` was exported from the appropriate module. This was done to avoid redundant code duplication.
2019-06-08 22:28:25 +02:00
waddlaw
59bc871d1a Implement view patterns 2019-06-08 20:31:08 +02:00
mrkkrp
fda95194f6 Fix rendering of hanging constructions 2019-06-08 19:29:23 +02:00
mrkkrp
46d175c89d Make case expressions hanging 2019-06-06 22:35:53 +02:00
mrkkrp
f937aa7aaf Handle “prefixed blocks” when they go after an operator
The change is obvious from the examples.
2019-06-06 22:35:53 +02:00
Utku Demir
99a345b919 Initial support for do notation 2019-06-06 20:50:52 +02:00
mrkkrp
6bc7333a6d Fix rendering of certain record patterns 2019-06-05 21:17:22 +02:00
mrkkrp
1b287b3b0d Change formatting of operators and infix constructors
This formatting scheme is more appropriate if you think of chaining multiple
infix expressions and combining it with do-blocks. The operator should hang
on previous line instead going first on the next line, e.g.:

foo +
  bar

instead of

foo
  + bar
2019-06-05 20:36:04 +02:00
mrkkrp
f27a6abaf8
Skip pushing to cachix when the required context is not provided 2019-06-05 20:27:46 +02:00
mrkkrp
777524b6de Various adjustments
The main point of this commit is perhaps that certain constructions are rare
and unnatural in multi-line form, so we could print them always in
single-line form however putting parentheses still in multi-line fashion so
the properly of idempotency is satisfied.
2019-06-04 22:45:16 +02:00
yumiova
45e25a1146 Implement rendering of most types of expressions
This pull request implements most of currently missing types of expressions,
with the exception of:

* Do notation
* List comprehensions (list comprehensions are considered a kind of do
  notation in GHC)
* Arrow notation
* Template Haskell

Most expressions are pretty printed in an uncontroversial manner, preferably
similar to existing syntax.
2019-06-04 22:45:16 +02:00
mrkkrp
9a0276b36d Implement the rest of binding types
This includes pattern binds, pattern synonyms, and a refactoring around
printing ‘RdrName’s.
2019-06-04 00:49:33 +02:00
mrkkrp
3874bb6588 Try to save Haddock as a build artifact 2019-05-31 16:09:35 +02:00
mrkkrp
47ffeb123d Add ‘CONTRIBUTING.md’ file to the repository 2019-05-31 16:09:35 +02:00
mrkkrp
e2a20217dd Update the readme 2019-05-31 14:43:15 +02:00
mrkkrp
34b9b71601 Build the project with Nix and switct to GHC 8.6.4
It was decided that we're going to make the project compatible with just one
GHC version at a time. Right now this version is going to be 8.6.4.

A small refactoring included, plus support for the “deriving via” feature.
2019-05-31 14:43:15 +02:00
Facundo Domínguez
cce75c7840 Add stack invocation to the README. 2019-05-30 14:39:17 +02:00
Facundo Domínguez
777e0e3135 Mention how to build and how to configure in the README. #56 #55 2019-05-30 14:39:17 +02:00
Utku Demir
06e4f1d5ad Implement TypeApplications and StaticPointers support 2019-05-28 12:18:32 +02:00
mrkkrp
5f746eec91
Fix the link to license file and years there
[skip ci]
2019-05-23 19:57:32 +02:00
Mathieu Boespflug
c94805e997 Change the order of bullet points. 2019-05-23 15:58:07 +02:00
mrkkrp
b129979516 Fix guards 2019-05-23 15:30:55 +02:00
mrkkrp
61f49600f8 Adjust if formatting
This includes a refactoring which changes the default strategy for
indentation level bumping. I think it's an improvement overall.
2019-05-23 15:30:55 +02:00
mrkkrp
2e176093d7 Try to fix CI 2019-05-23 14:39:43 +02:00
mrkkrp
09afebbd9c Implement rendering of simplest value-level constructs 2019-05-18 18:47:53 +02:00
mrkkrp
ae3ea9b5b6
Mention minimal diffs in the readme
[skip ci]
2019-05-17 12:18:01 +02:00
mrkkrp
3553fc35d0 Implement signature declarations
This implements not everything, but the most common case: simple top-level
declarations for functions.
2019-05-16 19:03:14 +02:00
mrkkrp
4e087ff0c3
Fix a typo
[skip ci]
2019-05-16 18:45:45 +02:00
Mark Karpov
50fd9c7759 Various fixes, thanks to Facundo
[skip ci]
2019-05-10 19:00:43 +02:00
mrkkrp
5dcee957e4 Improve descriptions of rendering combinators 2019-05-10 19:00:43 +02:00
mrkkrp
0b7d784cd6 Update the readme file
[skip ci]
2019-05-10 19:00:43 +02:00
mrkkrp
759c2c6854 Fix ‘data-files’ field in the Cabal file
Apparently the situation here is quite broken because we need to list all
sub-directories explicitly, here is a Cabal issue:

https://github.com/haskell/cabal/issues/6043
2019-05-10 19:00:43 +02:00
mrkkrp
0d558f1cb6 Various minor corrections to the docs and code 2019-05-10 19:00:43 +02:00
mrkkrp
b9c8b64947 Implement more precise comment placement without ‘ghc-exactprint’
‘ghc-exactprint’ (or perhaps lexer of GHC itself) does a fairly poor job at
associating comments with elements of AST. In many cases the result is not
what you'd expect. We ran into insuperable problems with that to the effect
that correct comment placement were impossible.

The new approach is to exploit the raw position information provided by the
GHC lexer, that is, spans attached to AST elements and comments. This
allowed us to place comments in output in a very precise and satisfactory
fashion.
2019-05-08 22:03:21 +02:00
mrkkrp
5959c83480 Fix a failing test 2019-05-08 22:03:21 +02:00
mrkkrp
00b08eeaff Implement rendering of data type declarations 2019-05-08 22:03:21 +02:00
mrkkrp
e01287aa24 Implement rendering of type synonyms 2019-04-09 22:45:23 +02:00