094e70a · ormolu · git.iko.soy

on master help sign in

Avoid failing when comments get before an operator

094e70amrkkrp7 years ago

data/examples/declaration/value/other/comments-get-before-op-out.hsnew file+10

@@ -0,0 +1,10 @@

1+main :: IO ()

2+main = do

3+ migrateSchema

4+ [ migration1,

5+ migration1,

6+ migration3

7+ ] -- When adding migrations here, don't forget to update

8+ -- 'schemaVersion' in Galley.Data

9+ `finally`

10+ Log.close

data/examples/declaration/value/other/comments-get-before-op.hsnew file+11

@@ -0,0 +1,11 @@

1+main :: IO ()

2+main = do

3+ migrateSchema

4+ [ migration1

5+ , migration1

6+ , migration3

7+ -- When adding migrations here, don't forget to update

8+ -- 'schemaVersion' in Galley.Data

9+ ]

10+ `finally`

11+ Log.close

src/Ormolu/Printer/Meat/Declaration/Value.hs+3−1

@@ -453,7 +453,9 @@ p_hsExpr = \case

453 let opWrapper = case unLoc op of

454 EWildPat NoExt -> backticks

455 _ -> id

456+ -- NOTE Sometimes operator may be displaced from the line by comments,

457+ -- it still should be more indented to remain valid code.

456− located op (opWrapper . p_hsExpr)

458+ inci $ located op (opWrapper . p_hsExpr)

457 let placement =

459 let placement =

458 -- NOTE If end of operator and start of second argument are on

460 -- NOTE If end of operator and start of second argument are on

459 -- different lines, always use normal placement.

461 -- different lines, always use normal placement.