e21e4ef · ormolu · git.iko.soy

data/examples/declaration/instance/contexts-out.hs+2−4

compare with master

unifiedsplit

@@ -25,14 +25,12 @@ instance

25 ( Read a, -- Foo

26 Read b,

27 Read

28− ( c,

29− -- Bar

28+ ( c, -- Bar

30 d

29 d

31 )

30 )

32 )

31 )

33 => Read

32 => Read

34− ( a,

35− -- Baz

33+ ( a, -- Baz

36 b,

34 b,

37 ( c, -- Quux

35 ( c, -- Quux

38 d

36 d

data/examples/declaration/value/function/operators-out.hs+1−2

@@ -1,6 +1,5 @@

1foo = bar

2− ++ {- some comment -}

3− case foo of

2+ ++ case foo of

4 a -> a

3 a -> a

5

4

6main =

5main =

data/examples/declaration/value/function/operators.hs−1

@@ -1,5 +1,4 @@

1foo = bar ++

2− {- some comment -}

3 case foo of

2 case foo of

4 a -> a

3 a -> a

5

4

data/examples/other/argument-comment-out.hs+10

@@ -2,3 +2,13 @@ foo

2 :: Int -- ^ Documentation

3 -> Bool

4foo _ = True

5+

6+foo

7+ :: Foo a

8+ => Int -- ^ Foo

9+ -> Int

10+

11+foo

12+ :: Foo a

13+ => Int -- ^ Foo

14+ -> Int

data/examples/other/argument-comment.hs+9

@@ -2,3 +2,12 @@ foo

2 :: Int -- ^ Documentation

3 -> Bool

4foo _ = True

5+

6+foo :: Foo a

7+ => Int -- ^ Foo

8+ -> Int

9+

10+foo

11+ :: Foo a

12+ => Int -- ^ Foo

13+ -> Int

src/Ormolu/Printer/Comments.hs+4−2

@@ -208,8 +208,10 @@ commentFollowsElt ref mnSpn meSpn mlastSpn (L l comment) =

208 Nothing -> True

209 Just espn ->

210 let startColumn = srcLocCol . realSrcSpanStart

211+ in if startColumn espn > startColumn ref

212+ then True

211− in abs (startColumn espn - startColumn l)

213+ else abs (startColumn espn - startColumn l)

212− >= abs (startColumn ref - startColumn l)

214+ >= abs (startColumn ref - startColumn l)

213 continuation =

215 continuation =

214 case mlastSpn of

216 case mlastSpn of

215 Nothing -> False

217 Nothing -> False