@@ -1,8 +1,6 @@
1{-# LANGUAGE LambdaCase #-}
1{-# LANGUAGE LambdaCase #-}
2−{-# LANGUAGE MultiWayIf #-}
3{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
4{-# LANGUAGE RecordWildCards #-}
3{-# LANGUAGE RecordWildCards #-}
5−{-# LANGUAGE TypeApplications #-}
7module Ormolu.Printer.Meat.Declaration.Value
5module Ormolu.Printer.Meat.Declaration.Value
8 ( p_valDecl,
6 ( p_valDecl,
@@ -20,22 +18,23 @@ import Ctype (is_space)
20import Data.Bool (bool)
18import Data.Bool (bool)
21import Data.Char (isPunctuation, isSymbol)
19import Data.Char (isPunctuation, isSymbol)
22import Data.Data hiding (Infix, Prefix)
20import Data.Data hiding (Infix, Prefix)
23−import Data.Functor ((<&>))
24import Data.List (intersperse, sortOn)
21import Data.List (intersperse, sortOn)
25−import Data.List.NonEmpty (NonEmpty (..), (<|))
22+import Data.List.NonEmpty ((<|), NonEmpty ((:|)))
26import qualified Data.List.NonEmpty as NE
23import qualified Data.List.NonEmpty as NE
27import Data.Text (Text)
24import Data.Text (Text)
28import qualified Data.Text as Text
25import qualified Data.Text as Text
30−import OccName (occNameString)
27+import OccName (mkVarOcc)
31import Ormolu.Printer.Combinators
28import Ormolu.Printer.Combinators
32−import Ormolu.Printer.Internal
33import Ormolu.Printer.Meat.Common
29import Ormolu.Printer.Meat.Common
34import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
30import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
35import Ormolu.Printer.Meat.Declaration.Signature
31import Ormolu.Printer.Meat.Declaration.Signature
36import Ormolu.Printer.Meat.Type
32import Ormolu.Printer.Meat.Type
37import Ormolu.Printer.Operators
33import Ormolu.Printer.Operators
38import Ormolu.Utils
34import Ormolu.Utils
35+import RdrName (RdrName (..))
36+import RdrName (rdrNameOcc)
37+import SrcLoc (combineSrcSpans, isOneLineSpan)
40-- | Style of a group of equations.
39-- | Style of a group of equations.
41data MatchGroupStyle
40data MatchGroupStyle
@@ -61,16 +60,16 @@ data Placement
61 -- should use it and avoid bumping one level
60 -- should use it and avoid bumping one level
62 -- of indentation
61 -- of indentation
64− deriving (Eq, Show)
63+ deriving (Eq)
66p_valDecl :: HsBindLR GhcPs GhcPs -> R ()
65p_valDecl :: HsBindLR GhcPs GhcPs -> R ()
67p_valDecl = \case
66p_valDecl = \case
68− FunBind NoExtField funId funMatches _ _ -> p_funBind funId funMatches
67+ FunBind NoExt funId funMatches _ _ -> p_funBind funId funMatches
69− PatBind NoExtField pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
68+ PatBind NoExt pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
70 VarBind {} -> notImplemented "VarBinds" -- introduced by the type checker
69 VarBind {} -> notImplemented "VarBinds" -- introduced by the type checker
71 AbsBinds {} -> notImplemented "AbsBinds" -- introduced by the type checker
70 AbsBinds {} -> notImplemented "AbsBinds" -- introduced by the type checker
72− PatSynBind NoExtField psb -> p_patSynBind psb
71+ PatSynBind NoExt psb -> p_patSynBind psb
73− XHsBindsLR x -> noExtCon x
72+ XHsBindsLR NoExt -> notImplemented "XHsBindsLR"
75p_funBind ::
74p_funBind ::
76 Located RdrName ->
75 Located RdrName ->
@@ -100,7 +99,7 @@ p_matchGroup' placer render style MG {..} = do
100 Case -> id
99 Case -> id
101 LambdaCase -> id
100 LambdaCase -> id
102 _ -> dontUseBraces
101 _ -> dontUseBraces
103− -- Since we are forcing braces on 'sepSemi' based on 'ob', we have to
102+ -- NOTE since we are forcing braces on 'sepSemi' based on 'ob', we have to
104 -- restore the brace state inside the sepsemi.
103 -- restore the brace state inside the sepsemi.
105 ub <- bool dontUseBraces useBraces <$> canUseBraces
104 ub <- bool dontUseBraces useBraces <$> canUseBraces
106 ob $ sepSemi (located' (ub . p_Match)) (unLoc mg_alts)
105 ob $ sepSemi (located' (ub . p_Match)) (unLoc mg_alts)
@@ -114,8 +113,8 @@ p_matchGroup' placer render style MG {..} = do
114 (matchStrictness m)
113 (matchStrictness m)
117− p_Match (XMatch x) = noExtCon x
116+ p_Match _ = notImplemented "XMatch"
118−p_matchGroup' _ _ _ (XMatchGroup x) = noExtCon x
117+p_matchGroup' _ _ _ (XMatchGroup NoExt) = notImplemented "XMatchGroup"
120-- | Function id obtained through pattern matching on 'FunBind' should not
119-- | Function id obtained through pattern matching on 'FunBind' should not
121-- be used to print the actual equations because the different ‘RdrNames’
120-- be used to print the actual equations because the different ‘RdrNames’
@@ -168,9 +167,9 @@ p_match' ::
168 -- | Equations
167 -- | Equations
169 GRHSs GhcPs (Located body) ->
168 GRHSs GhcPs (Located body) ->
171−p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
170+p_match' placer render style isInfix strictness m_pats m_grhss = do
172− -- Normally, since patterns may be placed in a multi-line layout, it is
171+ -- NOTE Normally, since patterns may be placed in a multi-line layout, it
173− -- necessary to bump indentation for the pattern group so it's more
172+ -- is necessary to bump indentation for the pattern group so it's more
174 -- indented than function name. This in turn means that indentation for
173 -- indented than function name. This in turn means that indentation for
175 -- the body should also be bumped. Normally this would mean that bodies
174 -- the body should also be bumped. Normally this would mean that bodies
176 -- would start with two indentation steps applied, which is ugly, so we
175 -- would start with two indentation steps applied, which is ugly, so we
@@ -180,24 +179,25 @@ p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
180 NoSrcStrict -> return ()
179 NoSrcStrict -> return ()
181 SrcStrict -> txt "!"
180 SrcStrict -> txt "!"
182 SrcLazy -> txt "~"
181 SrcLazy -> txt "~"
183− indentBody <- case NE.nonEmpty m_pats of
182+ inci' <- case NE.nonEmpty m_pats of
185− False <$ case style of
183+ Nothing -> id <$ case style of
186− Function name -> p_rdrName name
184+ Function name -> p_rdrName name
187− _ -> return ()
185+ _ -> return ()
188 Just ne_pats -> do
186 Just ne_pats -> do
189− let combinedSpans = case style of
187+ let combinedSpans =
190− Function name -> combineSrcSpans (getLoc name) patSpans
188+ combineSrcSpans' $
192− patSpans = combineSrcSpans' (getLoc <$> ne_pats)
189+ getLoc <$> ne_pats
193− indentBody = not (isOneLineSpan combinedSpans)
191+ if isOneLineSpan combinedSpans
194 switchLayout [combinedSpans] $ do
194 switchLayout [combinedSpans] $ do
195 let stdCase = sep breakpoint (located' p_pat) m_pats
195 let stdCase = sep breakpoint (located' p_pat) m_pats
196 case style of
196 case style of
197 Function name ->
197 Function name ->
198 p_infixDefHelper
198 p_infixDefHelper
200− indentBody
200+ inci'
201 (p_rdrName name)
201 (p_rdrName name)
202 (located' p_pat <$> m_pats)
202 (located' p_pat <$> m_pats)
203 PatternBind -> stdCase
203 PatternBind -> stdCase
@@ -212,32 +212,41 @@ p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
212 when needsSpace space
212 when needsSpace space
213 sitcc stdCase
213 sitcc stdCase
214 LambdaCase -> stdCase
214 LambdaCase -> stdCase
215− return indentBody
215+ return inci'
216 let -- Calculate position of end of patterns. This is useful when we decide
216 let -- Calculate position of end of patterns. This is useful when we decide
217 -- about putting certain constructions in hanging positions.
217 -- about putting certain constructions in hanging positions.
218 endOfPats = case NE.nonEmpty m_pats of
218 endOfPats = case NE.nonEmpty m_pats of
219 Nothing -> case style of
219 Nothing -> case style of
220− Function name -> Just (getLoc name)
220+ Function name -> (Just . srcSpanEnd . getLoc) name
221 _ -> Nothing
221 _ -> Nothing
222− Just pats -> (Just . getLoc . NE.last) pats
222+ Just pats -> (Just . srcSpanEnd . getLoc . NE.last) pats
223 isCase = \case
223 isCase = \case
224 Case -> True
224 Case -> True
225 LambdaCase -> True
225 LambdaCase -> True
226 _ -> False
226 _ -> False
227+ let GRHSs {..} = m_grhss
227 hasGuards = withGuards grhssGRHSs
228 hasGuards = withGuards grhssGRHSs
229+ unless (length grhssGRHSs > 1) $ do
231+ Function _ | hasGuards -> return ()
232+ Function _ -> space >> txt "="
233+ PatternBind -> space >> txt "="
234+ s | isCase s && hasGuards -> return ()
235+ _ -> space >> txt "->"
228− grhssSpan =
236+ let grhssSpan =
229 combineSrcSpans' $
237 combineSrcSpans' $
230 getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
238 getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
231 patGrhssSpan =
239 patGrhssSpan =
233 grhssSpan
241 grhssSpan
234− (combineSrcSpans grhssSpan . srcLocSpan . srcSpanEnd)
242+ (combineSrcSpans grhssSpan . srcLocSpan)
235 endOfPats
243 endOfPats
236 placement =
244 placement =
237 case endOfPats of
245 case endOfPats of
238 Nothing -> blockPlacement placer grhssGRHSs
246 Nothing -> blockPlacement placer grhssGRHSs
239 Just spn ->
247 Just spn ->
240− if onTheSameLine spn grhssSpan
249+ (mkSrcSpan spn (srcSpanStart grhssSpan))
241 then blockPlacement placer grhssGRHSs
250 then blockPlacement placer grhssGRHSs
242 else Normal
251 else Normal
243 p_body = do
252 p_body = do
@@ -253,18 +262,10 @@ p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
253 txt "where"
262 txt "where"
254 unless whereIsEmpty breakpoint
263 unless whereIsEmpty breakpoint
255 inci $ located grhssLocalBinds p_hsLocalBinds
264 inci $ located grhssLocalBinds p_hsLocalBinds
256− inciIf indentBody $ do
265+ inci' $ do
257− unless (length grhssGRHSs > 1) $
259− Function _ | hasGuards -> return ()
260− Function _ -> space >> inci equals
261− PatternBind -> space >> inci equals
262− s | isCase s && hasGuards -> return ()
263− _ -> space >> txt "->"
264 switchLayout [patGrhssSpan] $
266 switchLayout [patGrhssSpan] $
265 placeHanging placement p_body
267 placeHanging placement p_body
266 inci p_where
268 inci p_where
267−p_match' _ _ _ _ _ _ (XGRHSs x) = noExtCon x
269p_grhs :: GroupStyle -> GRHS GhcPs (LHsExpr GhcPs) -> R ()
270p_grhs :: GroupStyle -> GRHS GhcPs (LHsExpr GhcPs) -> R ()
270p_grhs = p_grhs' exprPlacement p_hsExpr
271p_grhs = p_grhs' exprPlacement p_hsExpr
@@ -278,109 +279,79 @@ p_grhs' ::
278 GroupStyle ->
279 GroupStyle ->
279 GRHS GhcPs (Located body) ->
280 GRHS GhcPs (Located body) ->
281−p_grhs' placer render style (GRHS NoExtField guards body) =
282+p_grhs' placer render style (GRHS NoExt guards body) =
282 case guards of
283 case guards of
283 [] -> p_body
284 [] -> p_body
287− sitcc (sep commaDel (sitcc . located' p_stmt) xs)
288+ sitcc (sep (comma >> breakpoint) (sitcc . located' p_stmt) xs)
289− inci $ case style of
290+ txt $ case style of
290− EqualSign -> equals
291+ EqualSign -> "="
291− RightArrow -> txt "->"
292+ RightArrow -> "->"
292 placeHanging placement p_body
293 placeHanging placement p_body
294 placement =
295 placement =
295 case endOfGuards of
296 case endOfGuards of
296 Nothing -> placer (unLoc body)
297 Nothing -> placer (unLoc body)
297 Just spn ->
298 Just spn ->
298− if onTheSameLine spn (getLoc body)
299+ if isOneLineSpan (mkSrcSpan spn (srcSpanStart (getLoc body)))
299 then placer (unLoc body)
300 then placer (unLoc body)
300 else Normal
301 else Normal
301 endOfGuards =
302 endOfGuards =
302 case NE.nonEmpty guards of
303 case NE.nonEmpty guards of
303 Nothing -> Nothing
304 Nothing -> Nothing
304− Just gs -> (Just . getLoc . NE.last) gs
305+ Just gs -> (Just . srcSpanEnd . getLoc . NE.last) gs
305 p_body = located body render
306 p_body = located body render
306−p_grhs' _ _ _ (XGRHS x) = noExtCon x
307+p_grhs' _ _ _ (XGRHS NoExt) = notImplemented "XGRHS"
308p_hsCmd :: HsCmd GhcPs -> R ()
309p_hsCmd :: HsCmd GhcPs -> R ()
309p_hsCmd = \case
310p_hsCmd = \case
310− HsCmdArrApp NoExtField body input arrType _ -> do
311+ HsCmdArrApp NoExt body input arrType _ -> do
311 located body p_hsExpr
312 located body p_hsExpr
312− breakpoint
313+ space
314− case arrType of
314+ case arrType of
315− HsFirstOrderApp -> txt "-<"
315+ HsFirstOrderApp -> txt "-<"
316− HsHigherOrderApp -> txt "-<<"
316+ HsHigherOrderApp -> txt "-<<"
317− placeHanging (exprPlacement (unLoc input)) $
317+ placeHanging (exprPlacement (unLoc input)) $
318− located input p_hsExpr
318+ located input p_hsExpr
319− HsCmdArrForm NoExtField form Prefix _ cmds -> banana $ do
319+ HsCmdArrForm NoExt form Prefix _ cmds -> banana $ sitcc $ do
320 located form p_hsExpr
320 located form p_hsExpr
321 unless (null cmds) $ do
321 unless (null cmds) $ do
322 breakpoint
322 breakpoint
323 inci (sequence_ (intersperse breakpoint (located' p_hsCmdTop <$> cmds)))
323 inci (sequence_ (intersperse breakpoint (located' p_hsCmdTop <$> cmds)))
324− HsCmdArrForm NoExtField form Infix _ [left, right] -> do
324+ HsCmdArrForm NoExt form Infix _ [left, right] -> do
325 located left p_hsCmdTop
325 located left p_hsCmdTop
327 located form p_hsExpr
327 located form p_hsExpr
328 placeHanging (cmdTopPlacement (unLoc right)) $
328 placeHanging (cmdTopPlacement (unLoc right)) $
329 located right p_hsCmdTop
329 located right p_hsCmdTop
330− HsCmdArrForm NoExtField _ Infix _ _ -> notImplemented "HsCmdArrForm"
330+ HsCmdArrForm NoExt _ Infix _ _ -> notImplemented "HsCmdArrForm"
331 HsCmdApp {} ->
331 HsCmdApp {} ->
332 -- XXX Does this ever occur in the syntax tree? It does not seem like it
332 -- XXX Does this ever occur in the syntax tree? It does not seem like it
333 -- does. Open an issue and ping @yumiova if this ever occurs in output.
333 -- does. Open an issue and ping @yumiova if this ever occurs in output.
334 notImplemented "HsCmdApp"
334 notImplemented "HsCmdApp"
335− HsCmdLam NoExtField mgroup -> p_matchGroup' cmdPlacement p_hsCmd Lambda mgroup
335+ HsCmdLam NoExt mgroup -> p_matchGroup' cmdPlacement p_hsCmd Lambda mgroup
336− HsCmdPar NoExtField c -> parens N (located c p_hsCmd)
336+ HsCmdPar NoExt c -> parens N (located c p_hsCmd)
337− HsCmdCase NoExtField e mgroup ->
337+ HsCmdCase NoExt e mgroup ->
338 p_case cmdPlacement p_hsCmd e mgroup
338 p_case cmdPlacement p_hsCmd e mgroup
339− HsCmdIf NoExtField _ if' then' else' ->
339+ HsCmdIf NoExt _ if' then' else' ->
340 p_if cmdPlacement p_hsCmd if' then' else'
340 p_if cmdPlacement p_hsCmd if' then' else'
341− HsCmdLet NoExtField localBinds c ->
341+ HsCmdLet NoExt localBinds c ->
342 p_let p_hsCmd localBinds c
342 p_let p_hsCmd localBinds c
343− HsCmdDo NoExtField es -> do
343+ HsCmdDo NoExt es -> do
346 inci . located es $
346 inci . located es $
347− sitcc . sep newline (sitcc . withSpacing (p_stmt' cmdPlacement p_hsCmd))
347+ sitcc . sep newline (located' (sitcc . p_stmt' cmdPlacement p_hsCmd))
348 HsCmdWrap {} -> notImplemented "HsCmdWrap"
348 HsCmdWrap {} -> notImplemented "HsCmdWrap"
349− XCmd x -> noExtCon x
349+ XCmd {} -> notImplemented "XCmd"
351p_hsCmdTop :: HsCmdTop GhcPs -> R ()
351p_hsCmdTop :: HsCmdTop GhcPs -> R ()
352p_hsCmdTop = \case
352p_hsCmdTop = \case
353− HsCmdTop NoExtField cmd -> located cmd p_hsCmd
353+ HsCmdTop NoExt cmd -> located cmd p_hsCmd
354− XCmdTop x -> noExtCon x
354+ XCmdTop {} -> notImplemented "XHsCmdTop"
356−-- | Render an expression preserving blank lines between such consecutive
357−-- expressions found in the original source code.
359− -- | Rendering function
361− -- | Entity to render
364−withSpacing f l = located l $ \x -> do
366− UnhelpfulSpan _ -> f x
367− RealSrcSpan currentSpn -> do
368− getSpanMark >>= \case
369− -- Spacing before comments will be handled by the code
370− -- that prints comments, so we just have to deal with
371− -- blank lines between statements here.
372− Just (StatementSpan lastSpn) ->
373− if srcSpanStartLine currentSpn > srcSpanEndLine lastSpn + 1
378− -- In some cases the (f x) expression may insert a new mark. We want
379− -- to be careful not to override comment marks.
380− getSpanMark >>= \case
381− Just (HaddockSpan _ _) -> return ()
382− Just (CommentSpan _) -> return ()
383− _ -> setSpanMark (StatementSpan currentSpn)
385p_stmt :: Stmt GhcPs (LHsExpr GhcPs) -> R ()
356p_stmt :: Stmt GhcPs (LHsExpr GhcPs) -> R ()
386p_stmt = p_stmt' exprPlacement p_hsExpr
357p_stmt = p_stmt' exprPlacement p_hsExpr
@@ -395,36 +366,35 @@ p_stmt' ::
395 Stmt GhcPs (Located body) ->
366 Stmt GhcPs (Located body) ->
397p_stmt' placer render = \case
368p_stmt' placer render = \case
398− LastStmt NoExtField body _ _ -> located body render
369+ LastStmt NoExt body _ _ -> located body render
399− BindStmt NoExtField p f _ _ -> do
370+ BindStmt NoExt l f _ _ -> do
400− located p p_pat
371+ located l p_pat
404− placement =
374+ let placement =
405 case f of
375 case f of
406 L l' x ->
376 L l' x ->
407 if isOneLineSpan
377 if isOneLineSpan
408− (mkSrcSpan (srcSpanEnd loc) (srcSpanStart l'))
378+ (mkSrcSpan (srcSpanEnd (getLoc l)) (srcSpanStart l'))
409 then placer x
379 then placer x
410 else Normal
380 else Normal
411− switchLayout [loc, getLoc f] $
381+ switchLayout [getLoc l, getLoc f] $
412 placeHanging placement (located f render)
382 placeHanging placement (located f render)
413 ApplicativeStmt {} -> notImplemented "ApplicativeStmt" -- generated by renamer
383 ApplicativeStmt {} -> notImplemented "ApplicativeStmt" -- generated by renamer
414− BodyStmt NoExtField body _ _ -> located body render
384+ BodyStmt NoExt body _ _ -> located body render
415− LetStmt NoExtField binds -> do
385+ LetStmt NoExt binds -> do
416 txt "let"
386 txt "let"
418 sitcc $ located binds p_hsLocalBinds
388 sitcc $ located binds p_hsLocalBinds
419 ParStmt {} ->
389 ParStmt {} ->
420− -- 'ParStmt' should always be eliminated in 'gatherStmt' already, such
390+ -- NOTE 'ParStmt' should always be eliminated in 'gatherStmt' already,
421− -- that it never occurs in 'p_stmt''. Consequently, handling it here
391+ -- such that it never occurs in 'p_stmt''. Consequently, handling it
422− -- would be redundant.
392+ -- here would be redundant.
423 notImplemented "ParStmt"
393 notImplemented "ParStmt"
424− TransStmt {..} ->
394+ TransStmt {..} -> do
425− -- 'TransStmt' only needs to account for render printing itself, since
395+ -- NOTE 'TransStmt' only needs to account for render printing itself,
426− -- pretty printing of relevant statements (e.g., in 'trS_stmts') is
396+ -- since pretty printing of relevant statements (e.g., in 'trS_stmts')
427− -- handled through 'gatherStmt'.
397+ -- is handled through 'gatherStmt'.
428 case (trS_form, trS_by) of
398 case (trS_form, trS_by) of
429 (ThenForm, Nothing) -> do
399 (ThenForm, Nothing) -> do
430 txt "then"
400 txt "then"
@@ -453,11 +423,11 @@ p_stmt' placer render = \case
453 RecStmt {..} -> do
423 RecStmt {..} -> do
454 txt "rec"
424 txt "rec"
456− sitcc $ sepSemi (withSpacing (p_stmt' placer render)) recS_stmts
426+ sitcc $ sepSemi (located' (p_stmt' placer render)) recS_stmts
457− XStmtLR c -> noExtCon c
427+ XStmtLR {} -> notImplemented "XStmtLR"
459gatherStmt :: ExprLStmt GhcPs -> [[ExprLStmt GhcPs]]
429gatherStmt :: ExprLStmt GhcPs -> [[ExprLStmt GhcPs]]
460−gatherStmt (L _ (ParStmt NoExtField block _ _)) =
430+gatherStmt (L _ (ParStmt NoExt block _ _)) =
461 foldr ((<>) . gatherStmtBlock) [] block
431 foldr ((<>) . gatherStmtBlock) [] block
462gatherStmt (L s stmt@TransStmt {..}) =
432gatherStmt (L s stmt@TransStmt {..}) =
463 foldr liftAppend [] ((gatherStmt <$> trS_stmts) <> pure [[L s stmt]])
433 foldr liftAppend [] ((gatherStmt <$> trS_stmts) <> pure [[L s stmt]])
@@ -466,93 +436,96 @@ gatherStmt stmt = [[stmt]]
466gatherStmtBlock :: ParStmtBlock GhcPs GhcPs -> [[ExprLStmt GhcPs]]
436gatherStmtBlock :: ParStmtBlock GhcPs GhcPs -> [[ExprLStmt GhcPs]]
467gatherStmtBlock (ParStmtBlock _ stmts _ _) =
437gatherStmtBlock (ParStmtBlock _ stmts _ _) =
468 foldr (liftAppend . gatherStmt) [] stmts
438 foldr (liftAppend . gatherStmt) [] stmts
469−gatherStmtBlock (XParStmtBlock x) = noExtCon x
439+gatherStmtBlock XParStmtBlock {} = notImplemented "XParStmtBlock"
471p_hsLocalBinds :: HsLocalBindsLR GhcPs GhcPs -> R ()
441p_hsLocalBinds :: HsLocalBindsLR GhcPs GhcPs -> R ()
472p_hsLocalBinds = \case
442p_hsLocalBinds = \case
473− HsValBinds NoExtField (ValBinds NoExtField bag lsigs) -> do
443+ HsValBinds NoExt (ValBinds NoExt bag lsigs) -> do
446+ (srcSpanStart . getLoc)
447+ (srcSpanStart . getLoc)
449+ (Left <$> bagToList bag) ++ (Right <$> lsigs)
450+ p_item (Left x) = located x p_valDecl
451+ p_item (Right x) = located x p_sigDecl
452+ -- Assigns 'False' to the last element, 'True' to the rest.
453+ markInit :: [a] -> [(Bool, a)]
455+ markInit (x : []) = [(False, x)]
456+ markInit (x : xs) = (True, x) : markInit xs
474− -- When in a single-line layout, there is a chance that the inner
457+ -- NOTE When in a single-line layout, there is a chance that the inner
475 -- elements will also contain semicolons and they will confuse the
458 -- elements will also contain semicolons and they will confuse the
476 -- parser. so we request braces around every element except the last.
459 -- parser. so we request braces around every element except the last.
477 br <- layoutToBraces <$> getLayout
460 br <- layoutToBraces <$> getLayout
478− let items =
461+ sitcc $
479− let injectLeft (L l x) = L l (Left x)
462+ sepSemi
480− injectRight (L l x) = L l (Right x)
463+ (\(m, i) -> (if m then br else id) $ p_item i)
481− in (injectLeft <$> bagToList bag) ++ (injectRight <$> lsigs)
464+ (markInit $ sortOn ssStart items)
482− positionToBracing = \case
488− positionToBracing p $
489− withSpacing (either p_valDecl p_sigDecl) item
490− binds = sortOn (srcSpanStart . getLoc) items
491− sitcc $ sepSemi p_item' (attachRelativePos binds)
492− HsValBinds NoExtField _ -> notImplemented "HsValBinds"
465+ HsValBinds NoExt _ -> notImplemented "HsValBinds"
493− HsIPBinds NoExtField (IPBinds NoExtField xs) ->
466+ HsIPBinds NoExt (IPBinds NoExt xs) ->
494 -- Second argument of IPBind is always Left before type-checking.
467 -- Second argument of IPBind is always Left before type-checking.
495− let p_ipBind (IPBind NoExtField (Left name) expr) = do
468+ let p_ipBind (IPBind NoExt (Left name) expr) = do
496 atom name
469 atom name
499 breakpoint
472 breakpoint
500 useBraces $ inci $ located expr p_hsExpr
473 useBraces $ inci $ located expr p_hsExpr
501− p_ipBind (IPBind NoExtField (Right _) _) =
502− -- Should only occur after the type checker
503− notImplemented "IPBind _ (Right _) _"
474+ p_ipBind _ = notImplemented "XHsIPBinds"
504− p_ipBind (XIPBind x) = noExtCon x
505 in sepSemi (located' p_ipBind) xs
475 in sepSemi (located' p_ipBind) xs
506− HsIPBinds NoExtField _ -> notImplemented "HsIpBinds"
476+ HsIPBinds NoExt _ -> notImplemented "HsIpBinds"
507− EmptyLocalBinds NoExtField -> return ()
477+ EmptyLocalBinds NoExt -> return ()
508− XHsLocalBindsLR x -> noExtCon x
478+ XHsLocalBindsLR _ -> notImplemented "XHsLocalBindsLR"
510p_hsRecField ::
480p_hsRecField ::
511 HsRecField' RdrName (LHsExpr GhcPs) ->
481 HsRecField' RdrName (LHsExpr GhcPs) ->
513−p_hsRecField HsRecField {..} = do
483+p_hsRecField = \HsRecField {..} -> do
514 p_rdrName hsRecFieldLbl
484 p_rdrName hsRecFieldLbl
515 unless hsRecPun $ do
485 unless hsRecPun $ do
519− if onTheSameLine (getLoc hsRecFieldLbl) (getLoc hsRecFieldArg)
520− then exprPlacement (unLoc hsRecFieldArg)
488+ let placement = exprPlacement (unLoc hsRecFieldArg)
522− placeHanging placement (located hsRecFieldArg p_hsExpr)
489+ placeHanging placement $ located hsRecFieldArg p_hsExpr
491+p_hsTupArg :: HsTupArg GhcPs -> R ()
493+ Present NoExt x -> located x p_hsExpr
494+ Missing NoExt -> pure ()
495+ XTupArg {} -> notImplemented "XTupArg"
524p_hsExpr :: HsExpr GhcPs -> R ()
497p_hsExpr :: HsExpr GhcPs -> R ()
525p_hsExpr = p_hsExpr' N
498p_hsExpr = p_hsExpr' N
527p_hsExpr' :: BracketStyle -> HsExpr GhcPs -> R ()
500p_hsExpr' :: BracketStyle -> HsExpr GhcPs -> R ()
528p_hsExpr' s = \case
501p_hsExpr' s = \case
529− HsVar NoExtField name -> p_rdrName name
502+ HsVar NoExt name -> p_rdrName name
530− HsUnboundVar NoExtField v -> atom (unboundVarOcc v)
503+ HsUnboundVar NoExt _ -> notImplemented "HsUnboundVar"
531− HsConLikeOut NoExtField _ -> notImplemented "HsConLikeOut"
504+ HsConLikeOut NoExt _ -> notImplemented "HsConLikeOut"
532− HsRecFld NoExtField x ->
505+ HsRecFld NoExt x ->
533 case x of
506 case x of
534− Unambiguous NoExtField name -> p_rdrName name
507+ Unambiguous NoExt name -> p_rdrName name
535− Ambiguous NoExtField name -> p_rdrName name
508+ Ambiguous NoExt name -> p_rdrName name
536− XAmbiguousFieldOcc xx -> noExtCon xx
509+ XAmbiguousFieldOcc NoExt -> notImplemented "XAmbiguousFieldOcc"
537− HsOverLabel NoExtField _ v -> do
510+ HsOverLabel NoExt _ v -> do
540− HsIPVar NoExtField (HsIPName name) -> do
513+ HsIPVar NoExt (HsIPName name) -> do
542 atom name
515 atom name
543− HsOverLit NoExtField v -> atom (ol_val v)
516+ HsOverLit NoExt v -> atom (ol_val v)
544− HsLit NoExtField lit ->
517+ HsLit NoExt lit ->
545 case lit of
518 case lit of
546 HsString (SourceText stxt) _ -> p_stringLit stxt
519 HsString (SourceText stxt) _ -> p_stringLit stxt
547 HsStringPrim (SourceText stxt) _ -> p_stringLit stxt
520 HsStringPrim (SourceText stxt) _ -> p_stringLit stxt
548 r -> atom r
521 r -> atom r
549− HsLam NoExtField mgroup ->
522+ HsLam NoExt mgroup ->
550 p_matchGroup Lambda mgroup
523 p_matchGroup Lambda mgroup
551− HsLamCase NoExtField mgroup -> do
524+ HsLamCase NoExt mgroup -> do
552 txt "\\case"
525 txt "\\case"
553 breakpoint
526 breakpoint
554 inci (p_matchGroup LambdaCase mgroup)
527 inci (p_matchGroup LambdaCase mgroup)
555− HsApp NoExtField f x -> do
528+ HsApp NoExt f x -> do
556 let -- In order to format function applications with multiple parameters
529 let -- In order to format function applications with multiple parameters
557 -- nicer, traverse the AST to gather the function and all the
530 -- nicer, traverse the AST to gather the function and all the
558 -- parameters together.
531 -- parameters together.
@@ -564,10 +537,8 @@ p_hsExpr' s = \case
564 -- We need to handle the last argument specially if it is a
537 -- We need to handle the last argument specially if it is a
565 -- hanging construct, so separate it from the rest.
538 -- hanging construct, so separate it from the rest.
566 (initp, lastp) = (NE.init args, NE.last args)
539 (initp, lastp) = (NE.init args, NE.last args)
568− combineSrcSpans' $
540+ initSpan = combineSrcSpans' $ getLoc f :| map getLoc initp
569− getLoc f :| [(srcLocSpan . srcSpanStart . getLoc) lastp]
570− -- Hang the last argument only if the initial arguments span one
541+ -- Hang the last argument only if the initial arguments spans one
572 placement =
543 placement =
573 if isOneLineSpan initSpan
544 if isOneLineSpan initSpan
@@ -579,26 +550,11 @@ p_hsExpr' s = \case
580 case placement of
551 case placement of
581 Normal -> do
552 Normal -> do
582− let -- Usually we want to bump indentation for arguments for the
583− -- sake of readability. However, when the function itself is a
584− -- do-block or case expression it is not a good idea. It seems
585− -- to be safe to always bump indentation when the function
586− -- expression is parenthesised.
589− L _ (HsPar NoExtField _) -> True
590− L _ (HsAppType NoExtField _ _) -> True
591− L _ (HsMultiIf NoExtField _) -> True
592− L spn _ -> isOneLineSpan spn
595− SingleLine -> useBraces
553+ useBraces $ do
598 located func (p_hsExpr' s)
554 located func (p_hsExpr' s)
599 breakpoint
555 breakpoint
600− inciIf doIndent $ sep breakpoint (located' p_hsExpr) initp
556+ inci $ sep breakpoint (located' p_hsExpr) initp
601− inciIf doIndent $ do
557+ inci $ do
602 unless (null initp) breakpoint
558 unless (null initp) breakpoint
603 located lastp p_hsExpr
559 located lastp p_hsExpr
604 Hanging -> do
560 Hanging -> do
@@ -608,87 +564,75 @@ p_hsExpr' s = \case
608 sep breakpoint (located' p_hsExpr) initp
564 sep breakpoint (located' p_hsExpr) initp
609 placeHanging placement $
565 placeHanging placement $
610 located lastp p_hsExpr
566 located lastp p_hsExpr
611− HsAppType NoExtField e a -> do
567+ HsAppType a e -> do
612 located e p_hsExpr
568 located e p_hsExpr
613 breakpoint
569 breakpoint
614 inci $ do
570 inci $ do
616− -- Insert a space when the type is represented as a TH splice to avoid
617− -- gluing @ and $ together.
618− case unLoc (hswc_body a) of
619− HsSpliceTy {} -> space
621 located (hswc_body a) p_hsType
572 located (hswc_body a) p_hsType
622− OpApp NoExtField x op y -> do
573+ OpApp NoExt x op y -> do
623 let opTree = OpBranch (exprOpTree x) op (exprOpTree y)
574 let opTree = OpBranch (exprOpTree x) op (exprOpTree y)
624− p_exprOpTree s (reassociateOpTree getOpName opTree)
575+ p_exprOpTree True s (reassociateOpTree getOpName opTree)
625− NegApp NoExtField e _ -> do
576+ NegApp NoExt e _ -> do
628 located e p_hsExpr
579 located e p_hsExpr
629− HsPar NoExtField e ->
580+ HsPar NoExt e ->
630 parens s (located e (dontUseBraces . p_hsExpr))
581 parens s (located e (dontUseBraces . p_hsExpr))
631− SectionL NoExtField x op -> do
582+ SectionL NoExt x op -> do
632 located x p_hsExpr
583 located x p_hsExpr
633 breakpoint
584 breakpoint
634 inci (located op p_hsExpr)
585 inci (located op p_hsExpr)
635− SectionR NoExtField op x -> do
586+ SectionR NoExt op x -> do
636 located op p_hsExpr
587 located op p_hsExpr
637− useRecordDot' <- useRecordDot
638− let isRecordDot' = isRecordDot (unLoc op) (getLoc x)
639− unless (useRecordDot' && isRecordDot') breakpoint
588+ breakpoint
640 inci (located x p_hsExpr)
589 inci (located x p_hsExpr)
641− ExplicitTuple NoExtField args boxity ->
590+ ExplicitTuple NoExt args boxity -> do
642 let isSection = any (isMissing . unLoc) args
591 let isSection = any (isMissing . unLoc) args
643 isMissing = \case
592 isMissing = \case
644− Missing NoExtField -> True
593+ Missing NoExt -> True
645 _ -> False
594 _ -> False
647− Present NoExtField x -> located x p_hsExpr
648− Missing NoExtField -> pure ()
649− XTupArg x -> noExtCon x
650− p_larg = sitcc . located' p_arg
651− parens' =
595+ let parens' =
652 case boxity of
596 case boxity of
653 Boxed -> parens
597 Boxed -> parens
654 Unboxed -> parensHash
598 Unboxed -> parensHash
655− in if isSection
599+ if isSection
657− switchLayout [] . parens' s $
601+ switchLayout [] . parens' s $
658− sep comma p_larg args
602+ sep comma (located' p_hsTupArg) args
660− switchLayout (getLoc <$> args) . parens' s $
604+ switchLayout (getLoc <$> args) . parens' s . sitcc $
661− sep commaDel p_larg args
605+ sep (comma >> breakpoint) (sitcc . located' p_hsTupArg) args
662− ExplicitSum NoExtField tag arity e ->
606+ ExplicitSum NoExt tag arity e ->
663 p_unboxedSum N tag arity (located e p_hsExpr)
607 p_unboxedSum N tag arity (located e p_hsExpr)
664− HsCase NoExtField e mgroup ->
608+ HsCase NoExt e mgroup ->
665 p_case exprPlacement p_hsExpr e mgroup
609 p_case exprPlacement p_hsExpr e mgroup
666− HsIf NoExtField _ if' then' else' ->
610+ HsIf NoExt _ if' then' else' ->
667 p_if exprPlacement p_hsExpr if' then' else'
611 p_if exprPlacement p_hsExpr if' then' else'
668− HsMultiIf NoExtField guards -> do
612+ HsMultiIf NoExt guards -> do
670 breakpoint
614 breakpoint
671− inci . inci $ sep newline (located' (p_grhs RightArrow)) guards
615+ inci . sitcc $ sep newline (located' (p_grhs RightArrow)) guards
672− HsLet NoExtField localBinds e ->
616+ HsLet NoExt localBinds e ->
673 p_let p_hsExpr localBinds e
617 p_let p_hsExpr localBinds e
674− HsDo NoExtField ctx es -> do
618+ HsDo NoExt ctx es -> do
675 let doBody header = do
619 let doBody header = do
676 txt header
620 txt header
677 breakpoint
621 breakpoint
678 ub <- layoutToBraces <$> getLayout
622 ub <- layoutToBraces <$> getLayout
681− (ub . withSpacing (p_stmt' exprPlacement (p_hsExpr' S)))
625+ (located' (ub . p_stmt' exprPlacement (p_hsExpr' S)))
682 (unLoc es)
626 (unLoc es)
683− compBody = brackets N . located es $ \xs -> do
627+ compBody = brackets N $ located es $ \xs -> do
684 let p_parBody =
628 let p_parBody =
686− (breakpoint >> txt "|" >> space)
630+ (breakpoint >> txt "| ")
687 p_seqBody
631 p_seqBody
688 p_seqBody =
632 p_seqBody =
691− commaDel
635+ (comma >> breakpoint)
692 (located' (sitcc . p_stmt))
636 (located' (sitcc . p_stmt))
693 stmts = init xs
637 stmts = init xs
694 yield = last xs
638 yield = last xs
@@ -709,94 +653,88 @@ p_hsExpr' s = \case
709 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
653 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
710 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
654 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
711 ExplicitList _ _ xs ->
655 ExplicitList _ _ xs ->
712− brackets s $
656+ brackets s . sitcc $
713− sep commaDel (sitcc . located' p_hsExpr) xs
657+ sep (comma >> breakpoint) (sitcc . located' p_hsExpr) xs
714 RecordCon {..} -> do
658 RecordCon {..} -> do
715 located rcon_con_name atom
659 located rcon_con_name atom
716 breakpoint
660 breakpoint
717 let HsRecFields {..} = rcon_flds
661 let HsRecFields {..} = rcon_flds
718 updName f =
662 updName f =
719− (f :: HsRecField GhcPs (LHsExpr GhcPs))
663+ f
720 { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
664 { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
721 FieldOcc _ n -> n
665 FieldOcc _ n -> n
722− XFieldOcc x -> noExtCon x
666+ XFieldOcc _ -> notImplemented "XFieldOcc"
724 fields = located' (p_hsRecField . updName) <$> rec_flds
668 fields = located' (p_hsRecField . updName) <$> rec_flds
726 case rec_dotdot of
670 case rec_dotdot of
727 Just {} -> [txt ".."]
671 Just {} -> [txt ".."]
728 Nothing -> []
672 Nothing -> []
729− inci . braces N $
673+ inci . braces N . sitcc $
730− sep commaDel sitcc (fields <> dotdot)
674+ sep (comma >> breakpoint) sitcc (fields <> dotdot)
731 RecordUpd {..} -> do
675 RecordUpd {..} -> do
732 located rupd_expr p_hsExpr
676 located rupd_expr p_hsExpr
733− useRecordDot' <- useRecordDot
734− let mrs sp = case getLoc sp of
735− RealSrcSpan r -> Just r
738− ((1 +) . srcSpanEndCol <$> mrs rupd_expr)
739− == (srcSpanStartCol <$> mrs (head rupd_flds))
740− unless (useRecordDot' && isPluginForm) breakpoint
677+ breakpoint
741 let updName f =
678 let updName f =
742− (f :: HsRecUpdField GhcPs)
679+ f
743 { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
680 { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
744 Ambiguous _ n -> n
681 Ambiguous _ n -> n
745 Unambiguous _ n -> n
682 Unambiguous _ n -> n
746− XAmbiguousFieldOcc x -> noExtCon x
683+ XAmbiguousFieldOcc _ -> notImplemented "XAmbiguousFieldOcc"
748− inci . braces N $
685+ inci . braces N . sitcc $
750− commaDel
687+ (comma >> breakpoint)
751 (sitcc . located' (p_hsRecField . updName))
688 (sitcc . located' (p_hsRecField . updName))
752 rupd_flds
689 rupd_flds
753− ExprWithTySig NoExtField x HsWC {hswc_body = HsIB {..}} -> sitcc $ do
690+ ExprWithTySig affix x -> sitcc $ do
754 located x p_hsExpr
691 located x p_hsExpr
757 breakpoint
694 breakpoint
696+ let HsWC {..} = affix
697+ HsIB {..} = hswc_body
758− inci $ located hsib_body p_hsType
698+ located hsib_body p_hsType
759− ExprWithTySig NoExtField _ HsWC {hswc_body = XHsImplicitBndrs x} -> noExtCon x
760− ExprWithTySig NoExtField _ (XHsWildCardBndrs x) -> noExtCon x
761− ArithSeq NoExtField _ x ->
699+ ArithSeq NoExt _ x -> do
762 case x of
700 case x of
763− From from -> brackets s $ do
701+ From from -> brackets s . sitcc $ do
764 located from p_hsExpr
702 located from p_hsExpr
765 breakpoint
703 breakpoint
767− FromThen from next -> brackets s $ do
705+ FromThen from next -> brackets s . sitcc $ do
768− sep commaDel (located' p_hsExpr) [from, next]
706+ sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
769 breakpoint
707 breakpoint
771− FromTo from to -> brackets s $ do
709+ FromTo from to -> brackets s . sitcc $ do
772 located from p_hsExpr
710 located from p_hsExpr
773 breakpoint
711 breakpoint
776 located to p_hsExpr
714 located to p_hsExpr
777− FromThenTo from next to -> brackets s $ do
715+ FromThenTo from next to -> brackets s . sitcc $ do
778− sep commaDel (located' p_hsExpr) [from, next]
716+ sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
779 breakpoint
717 breakpoint
782 located to p_hsExpr
720 located to p_hsExpr
783− HsSCC NoExtField _ name x -> do
721+ HsSCC NoExt _ name x -> do
784 txt "{-# SCC "
722 txt "{-# SCC "
785 atom name
723 atom name
786 txt " #-}"
724 txt " #-}"
787 breakpoint
725 breakpoint
788 located x p_hsExpr
726 located x p_hsExpr
789− HsCoreAnn NoExtField _ value x -> do
727+ HsCoreAnn NoExt _ value x -> do
790 txt "{-# CORE "
728 txt "{-# CORE "
791 atom value
729 atom value
792 txt " #-}"
730 txt " #-}"
793 breakpoint
731 breakpoint
794 located x p_hsExpr
732 located x p_hsExpr
795− HsBracket NoExtField x -> p_hsBracket x
733+ HsBracket NoExt x -> p_hsBracket x
796 HsRnBracketOut {} -> notImplemented "HsRnBracketOut"
734 HsRnBracketOut {} -> notImplemented "HsRnBracketOut"
797 HsTcBracketOut {} -> notImplemented "HsTcBracketOut"
735 HsTcBracketOut {} -> notImplemented "HsTcBracketOut"
798− HsSpliceE NoExtField splice -> p_hsSplice splice
736+ HsSpliceE NoExt splice -> p_hsSplice splice
799− HsProc NoExtField p e -> do
737+ HsProc NoExt p e -> do
800 txt "proc"
738 txt "proc"
801 located p $ \x -> do
739 located p $ \x -> do
802 breakpoint
740 breakpoint
@@ -809,11 +747,31 @@ p_hsExpr' s = \case
809 txt "static"
747 txt "static"
810 breakpoint
748 breakpoint
811 inci (located e p_hsExpr)
749 inci (located e p_hsExpr)
750+ HsArrApp NoExt body input arrType cond ->
751+ p_hsCmd (HsCmdArrApp NoExt body input arrType cond)
752+ HsArrForm NoExt form mfixity cmds ->
753+ p_hsCmd (HsCmdArrForm NoExt form Prefix mfixity cmds)
812 HsTick {} -> notImplemented "HsTick"
754 HsTick {} -> notImplemented "HsTick"
813 HsBinTick {} -> notImplemented "HsBinTick"
755 HsBinTick {} -> notImplemented "HsBinTick"
814 HsTickPragma {} -> notImplemented "HsTickPragma"
756 HsTickPragma {} -> notImplemented "HsTickPragma"
757+ -- These four constructs should never appear in correct programs.
758+ -- See: https://github.com/tweag/ormolu/issues/343
759+ EWildPat NoExt -> txt "_"
760+ EAsPat NoExt n p -> do
764+ EViewPat NoExt p e -> do
769+ inci (located e p_hsExpr)
770+ ELazyPat NoExt p -> do
815 HsWrap {} -> notImplemented "HsWrap"
773 HsWrap {} -> notImplemented "HsWrap"
816− XExpr x -> noExtCon x
774+ XExpr {} -> notImplemented "XExpr"
818p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
776p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
819p_patSynBind PSB {..} = do
777p_patSynBind PSB {..} = do
@@ -825,7 +783,7 @@ p_patSynBind PSB {..} = do
825 breakpoint
783 breakpoint
826 located psb_def p_pat
784 located psb_def p_pat
827 ImplicitBidirectional -> do
785 ImplicitBidirectional -> do
829 breakpoint
787 breakpoint
830 located psb_def p_pat
788 located psb_def p_pat
831 ExplicitBidirectional mgroup -> do
789 ExplicitBidirectional mgroup -> do
@@ -852,8 +810,8 @@ p_patSynBind PSB {..} = do
852 inci $ do
810 inci $ do
853 switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
811 switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
854 unless (null xs) breakpoint
812 unless (null xs) breakpoint
855− braces N $
813+ braces N . sitcc $
856− sep commaDel (p_rdrName . recordPatSynPatVar) xs
814+ sep (comma >> breakpoint) (p_rdrName . recordPatSynPatVar) xs
858 InfixCon l r -> do
816 InfixCon l r -> do
859 switchLayout [getLoc l, getLoc r] $ do
817 switchLayout [getLoc l, getLoc r] $ do
@@ -865,7 +823,7 @@ p_patSynBind PSB {..} = do
866 p_rdrName r
824 p_rdrName r
868−p_patSynBind (XPatSynBind x) = noExtCon x
826+p_patSynBind (XPatSynBind NoExt) = notImplemented "XPatSynBind"
871 Data body =>
829 Data body =>
@@ -876,7 +834,7 @@ p_case ::
876 -- | Expression
834 -- | Expression
877 LHsExpr GhcPs ->
835 LHsExpr GhcPs ->
878 -- | Match group
836 -- | Match group
879− MatchGroup GhcPs (Located body) ->
837+ (MatchGroup GhcPs (Located body)) ->
881p_case placer render e mgroup = do
839p_case placer render e mgroup = do
882 txt "case"
840 txt "case"
@@ -907,12 +865,10 @@ p_if placer render if' then' else' = do
907 breakpoint
865 breakpoint
908 inci $ do
866 inci $ do
909 txt "then"
867 txt "then"
911 located then' $ \x ->
868 located then' $ \x ->
912 placeHanging (placer x) (render x)
869 placeHanging (placer x) (render x)
913 breakpoint
870 breakpoint
914 txt "else"
871 txt "else"
916 located else' $ \x ->
872 located else' $ \x ->
917 placeHanging (placer x) (render x)
873 placeHanging (placer x) (render x)
@@ -934,29 +890,29 @@ p_let render localBinds e = sitcc $ do
935p_pat :: Pat GhcPs -> R ()
891p_pat :: Pat GhcPs -> R ()
936p_pat = \case
892p_pat = \case
937− WildPat NoExtField -> txt "_"
893+ WildPat NoExt -> txt "_"
938− VarPat NoExtField name -> p_rdrName name
894+ VarPat NoExt name -> p_rdrName name
939− LazyPat NoExtField pat -> do
895+ LazyPat NoExt pat -> do
941 located pat p_pat
897 located pat p_pat
942− AsPat NoExtField name pat -> do
898+ AsPat NoExt name pat -> do
943 p_rdrName name
899 p_rdrName name
945 located pat p_pat
901 located pat p_pat
946− ParPat NoExtField pat ->
902+ ParPat NoExt pat ->
947 located pat (parens S . p_pat)
903 located pat (parens S . p_pat)
948− BangPat NoExtField pat -> do
904+ BangPat NoExt pat -> do
950 located pat p_pat
906 located pat p_pat
951− ListPat NoExtField pats ->
907+ ListPat NoExt pats -> do
952− brackets S $ sep commaDel (located' p_pat) pats
908+ brackets S . sitcc $ sep (comma >> breakpoint) (located' p_pat) pats
953− TuplePat NoExtField pats boxing -> do
909+ TuplePat NoExt pats boxing -> do
954− let parens' =
910+ let f =
955 case boxing of
911 case boxing of
956 Boxed -> parens S
912 Boxed -> parens S
957 Unboxed -> parensHash S
913 Unboxed -> parensHash S
958− parens' $ sep commaDel (sitcc . located' p_pat) pats
914+ f . sitcc $ sep (comma >> breakpoint) (sitcc . located' p_pat) pats
959− SumPat NoExtField pat tag arity ->
915+ SumPat NoExt pat tag arity ->
960 p_unboxedSum S tag arity (located pat p_pat)
916 p_unboxedSum S tag arity (located pat p_pat)
961 ConPatIn pat details ->
917 ConPatIn pat details ->
962 case details of
918 case details of
@@ -971,40 +927,38 @@ p_pat = \case
971 let f = \case
927 let f = \case
972 Nothing -> txt ".."
928 Nothing -> txt ".."
973 Just x -> located x p_pat_hsRecField
929 Just x -> located x p_pat_hsRecField
974− inci . braces N . sep commaDel f $
930+ inci . braces N . sitcc . sep (comma >> breakpoint) f $
975 case dotdot of
931 case dotdot of
976 Nothing -> Just <$> fields
932 Nothing -> Just <$> fields
977− Just (L _ n) -> (Just <$> take n fields) ++ [Nothing]
933+ Just n -> (Just <$> take n fields) ++ [Nothing]
978− InfixCon l r -> do
934+ InfixCon x y -> do
979− switchLayout [getLoc l, getLoc r] $ do
935+ located x p_pat
980− located l p_pat
936+ space
981− breakpoint
938+ breakpoint
985− located r p_pat
939+ inci (located y p_pat)
986 ConPatOut {} -> notImplemented "ConPatOut" -- presumably created by renamer?
940 ConPatOut {} -> notImplemented "ConPatOut" -- presumably created by renamer?
987− ViewPat NoExtField expr pat -> sitcc $ do
941+ ViewPat NoExt expr pat -> sitcc $ do
988 located expr p_hsExpr
942 located expr p_hsExpr
991 breakpoint
945 breakpoint
992 inci (located pat p_pat)
946 inci (located pat p_pat)
993− SplicePat NoExtField splice -> p_hsSplice splice
947+ SplicePat NoExt splice -> p_hsSplice splice
994− LitPat NoExtField p -> atom p
948+ LitPat NoExt p -> atom p
995− NPat NoExtField v _ _ -> located v (atom . ol_val)
949+ NPat NoExt v _ _ -> located v (atom . ol_val)
996− NPlusKPat NoExtField n k _ _ _ -> sitcc $ do
950+ NPlusKPat NoExt n k _ _ _ -> sitcc $ do
997 p_rdrName n
951 p_rdrName n
998 breakpoint
952 breakpoint
999 inci $ do
953 inci $ do
1002 located k (atom . ol_val)
956 located k (atom . ol_val)
1003− SigPat NoExtField pat hswc -> do
957+ SigPat hswc pat -> do
1004 located pat p_pat
958 located pat p_pat
1005 p_typeAscription hswc
959 p_typeAscription hswc
1006 CoPat {} -> notImplemented "CoPat" -- apparently created at some later stage
960 CoPat {} -> notImplemented "CoPat" -- apparently created at some later stage
1007− XPat x -> noExtCon x
961+ XPat NoExt -> notImplemented "XPat"
1009p_pat_hsRecField :: HsRecField' (FieldOcc GhcPs) (LPat GhcPs) -> R ()
963p_pat_hsRecField :: HsRecField' (FieldOcc GhcPs) (LPat GhcPs) -> R ()
1010p_pat_hsRecField HsRecField {..} = do
964p_pat_hsRecField HsRecField {..} = do
@@ -1012,7 +966,7 @@ p_pat_hsRecField HsRecField {..} = do
1012 p_rdrName (rdrNameFieldOcc x)
966 p_rdrName (rdrNameFieldOcc x)
1013 unless hsRecPun $ do
967 unless hsRecPun $ do
1016 breakpoint
970 breakpoint
1017 inci (located hsRecFieldArg p_pat)
971 inci (located hsRecFieldArg p_pat)
@@ -1021,31 +975,32 @@ p_unboxedSum s tag arity m = do
1021 let before = tag - 1
975 let before = tag - 1
1022 after = arity - before - 1
976 after = arity - before - 1
1023 args = replicate before Nothing <> [Just m] <> replicate after Nothing
977 args = replicate before Nothing <> [Just m] <> replicate after Nothing
1024− f x =
978+ f (x, i) = do
979+ let isFirst = i == 0
980+ isLast = i == arity - 1
1025 case x :: Maybe (R ()) of
981 case x :: Maybe (R ()) of
1026 Nothing ->
982 Nothing ->
1027− space
983+ unless (isFirst || isLast) space
1028 Just m' -> do
984 Just m' -> do
1029− space
985+ unless isFirst space
1031− space
987+ unless isLast space
1032− parensHash s $ sep (txt "|") f args
988+ parensHash s $ sep (txt "|") f (zip args [0 ..])
1034p_hsSplice :: HsSplice GhcPs -> R ()
990p_hsSplice :: HsSplice GhcPs -> R ()
1035p_hsSplice = \case
991p_hsSplice = \case
1036− HsTypedSplice NoExtField deco _ expr -> p_hsSpliceTH True expr deco
992+ HsTypedSplice NoExt deco _ expr -> p_hsSpliceTH True expr deco
1037− HsUntypedSplice NoExtField deco _ expr -> p_hsSpliceTH False expr deco
993+ HsUntypedSplice NoExt deco _ expr -> p_hsSpliceTH False expr deco
1038− HsQuasiQuote NoExtField _ quoterName srcSpan str -> do
994+ HsQuasiQuote NoExt _ quoterName srcSpan str -> do
1040 p_rdrName (L srcSpan quoterName)
996 p_rdrName (L srcSpan quoterName)
1042− -- QuasiQuoters often rely on precise custom strings. We cannot do any
998+ -- NOTE QuasiQuoters often rely on precise custom strings. We cannot do
1043− -- formatting here without potentially breaking someone's code.
999+ -- any formatting here without potentially breaking someone's code.
1044 atom str
1000 atom str
1045 txt "|]"
1001 txt "|]"
1046 HsSpliced {} -> notImplemented "HsSpliced"
1002 HsSpliced {} -> notImplemented "HsSpliced"
1047− HsSplicedT {} -> notImplemented "HsSplicedT"
1003+ XSplice {} -> notImplemented "XSplice"
1048− XSplice x -> noExtCon x
1050p_hsSpliceTH ::
1005p_hsSpliceTH ::
1051 -- | Typed splice?
1006 -- | Typed splice?
@@ -1069,17 +1024,17 @@ p_hsSpliceTH isTyped expr = \case
1070p_hsBracket :: HsBracket GhcPs -> R ()
1025p_hsBracket :: HsBracket GhcPs -> R ()
1071p_hsBracket = \case
1026p_hsBracket = \case
1072− ExpBr NoExtField expr -> do
1027+ ExpBr NoExt expr -> do
1073 anns <- getEnclosingAnns
1028 anns <- getEnclosingAnns
1074 let name = case anns of
1029 let name = case anns of
1075 AnnOpenEQ : _ -> ""
1030 AnnOpenEQ : _ -> ""
1076 _ -> "e"
1031 _ -> "e"
1077 quote name (located expr p_hsExpr)
1032 quote name (located expr p_hsExpr)
1078− PatBr NoExtField pat -> located pat (quote "p" . p_pat)
1033+ PatBr NoExt pat -> quote "p" (located pat p_pat)
1079− DecBrL NoExtField decls -> quote "d" (p_hsDecls Free decls)
1034+ DecBrL NoExt decls -> quote "d" (p_hsDecls Free decls)
1080− DecBrG NoExtField _ -> notImplemented "DecBrG" -- result of renamer
1035+ DecBrG NoExt _ -> notImplemented "DecBrG" -- result of renamer
1081− TypBr NoExtField ty -> quote "t" (located ty p_hsType)
1036+ TypBr NoExt ty -> quote "t" (located ty p_hsType)
1082− VarBr NoExtField isSingleQuote name -> do
1037+ VarBr NoExt isSingleQuote name -> do
1083 txt (bool "''" "'" isSingleQuote)
1038 txt (bool "''" "'" isSingleQuote)
1084 -- HACK As you can see we use 'noLoc' here to be able to pass name into
1039 -- HACK As you can see we use 'noLoc' here to be able to pass name into
1085 -- 'p_rdrName' since the latter expects a "located" thing. The problem
1040 -- 'p_rdrName' since the latter expects a "located" thing. The problem
@@ -1094,13 +1049,13 @@ p_hsBracket = \case
1094 && not (doesNotNeedExtraParens name)
1049 && not (doesNotNeedExtraParens name)
1095 wrapper = if isOperator then parens N else id
1050 wrapper = if isOperator then parens N else id
1096 wrapper $ p_rdrName (noLoc name)
1051 wrapper $ p_rdrName (noLoc name)
1097− TExpBr NoExtField expr -> do
1052+ TExpBr NoExt expr -> do
1098 txt "[||"
1053 txt "[||"
1099 breakpoint'
1054 breakpoint'
1100 located expr p_hsExpr
1055 located expr p_hsExpr
1101 breakpoint'
1056 breakpoint'
1102 txt "||]"
1057 txt "||]"
1103− XBracket x -> noExtCon x
1058+ XBracket {} -> notImplemented "XBracket"
1105 quote :: Text -> R () -> R ()
1060 quote :: Text -> R () -> R ()
1106 quote name body = do
1061 quote name body = do
@@ -1179,9 +1134,9 @@ liftAppend (x : xs) [] = x : xs
1179liftAppend (x : xs) (y : ys) = x <> y : liftAppend xs ys
1134liftAppend (x : xs) (y : ys) = x <> y : liftAppend xs ys
1181getGRHSSpan :: GRHS GhcPs (Located body) -> SrcSpan
1136getGRHSSpan :: GRHS GhcPs (Located body) -> SrcSpan
1182−getGRHSSpan (GRHS NoExtField guards body) =
1137+getGRHSSpan (GRHS NoExt guards body) =
1183 combineSrcSpans' $ getLoc body :| map getLoc guards
1138 combineSrcSpans' $ getLoc body :| map getLoc guards
1184−getGRHSSpan (XGRHS x) = noExtCon x
1139+getGRHSSpan (XGRHS NoExt) = notImplemented "XGRHS"
1186-- | Place a thing that may have a hanging form. This function handles how
1141-- | Place a thing that may have a hanging form. This function handles how
1187-- to separate it from preceding expressions and whether to bump indentation
1142-- to separate it from preceding expressions and whether to bump indentation
@@ -1202,44 +1157,46 @@ blockPlacement ::
1202 (body -> Placement) ->
1157 (body -> Placement) ->
1203 [LGRHS GhcPs (Located body)] ->
1158 [LGRHS GhcPs (Located body)] ->
1204 Placement
1159 Placement
1205−blockPlacement placer [L _ (GRHS NoExtField _ (L _ x))] = placer x
1160+blockPlacement placer [(L _ (GRHS NoExt _ (L _ x)))] = placer x
1206blockPlacement _ _ = Normal
1161blockPlacement _ _ = Normal
1208-- | Check if given command has a hanging form.
1163-- | Check if given command has a hanging form.
1209cmdPlacement :: HsCmd GhcPs -> Placement
1164cmdPlacement :: HsCmd GhcPs -> Placement
1210cmdPlacement = \case
1165cmdPlacement = \case
1211− HsCmdLam NoExtField _ -> Hanging
1166+ HsCmdLam NoExt _ -> Hanging
1212− HsCmdCase NoExtField _ _ -> Hanging
1167+ HsCmdCase NoExt _ _ -> Hanging
1213− HsCmdDo NoExtField _ -> Hanging
1168+ HsCmdDo NoExt _ -> Hanging
1214 _ -> Normal
1169 _ -> Normal
1216cmdTopPlacement :: HsCmdTop GhcPs -> Placement
1171cmdTopPlacement :: HsCmdTop GhcPs -> Placement
1217cmdTopPlacement = \case
1172cmdTopPlacement = \case
1218− HsCmdTop NoExtField (L _ x) -> cmdPlacement x
1173+ HsCmdTop NoExt (L _ x) -> cmdPlacement x
1219− XCmdTop x -> noExtCon x
1174+ XCmdTop {} -> notImplemented "XCmdTop"
1221-- | Check if given expression has a hanging form.
1176-- | Check if given expression has a hanging form.
1222exprPlacement :: HsExpr GhcPs -> Placement
1177exprPlacement :: HsExpr GhcPs -> Placement
1223exprPlacement = \case
1178exprPlacement = \case
1224 -- Only hang lambdas with single line parameter lists
1179 -- Only hang lambdas with single line parameter lists
1225− HsLam NoExtField mg -> case mg of
1180+ HsLam NoExt mg -> case mg of
1226− MG _ (L _ [L _ (Match NoExtField _ (x : xs) _)]) _
1181+ MG _ (L _ [L _ (Match NoExt _ (x : xs) _)]) _
1227 | isOneLineSpan (combineSrcSpans' $ fmap getLoc (x :| xs)) ->
1182 | isOneLineSpan (combineSrcSpans' $ fmap getLoc (x :| xs)) ->
1229 _ -> Normal
1184 _ -> Normal
1230− HsLamCase NoExtField _ -> Hanging
1185+ HsLamCase NoExt _ -> Hanging
1231− HsCase NoExtField _ _ -> Hanging
1186+ HsCase NoExt _ _ -> Hanging
1232− HsDo NoExtField DoExpr _ -> Hanging
1187+ HsDo NoExt DoExpr _ -> Hanging
1233− HsDo NoExtField MDoExpr _ -> Hanging
1188+ HsDo NoExt MDoExpr _ -> Hanging
1234− OpApp NoExtField _ op y ->
1189+ RecordCon NoExt _ _ -> Hanging
1235− case (fmap getOpNameStr . getOpName . unLoc) op of
1190+ -- If the rightmost expression in an operator chain is hanging, make the
1236− Just "$" -> exprPlacement (unLoc y)
1191+ -- whole block hanging; so that we can use the common @f = foo $ do@
1237− _ -> Normal
1192+ -- style.
1193+ OpApp NoExt _ _ y -> exprPlacement (unLoc y)
1194+ -- Same thing for function applications (usually with -XBlockArguments)
1238− HsApp NoExtField _ y -> exprPlacement (unLoc y)
1195+ HsApp NoExt _ y -> exprPlacement (unLoc y)
1239− HsProc NoExtField p _ ->
1196+ HsProc NoExt (L s _) _ ->
1240 -- Indentation breaks if pattern is longer than one line and left
1197 -- Indentation breaks if pattern is longer than one line and left
1241 -- hanging. Consequently, only apply hanging when it is safe.
1198 -- hanging. Consequently, only apply hanging when it is safe.
1242− if isOneLineSpan (getLoc p)
1199+ if isOneLineSpan s
1243 then Hanging
1200 then Hanging
1244 else Normal
1201 else Normal
1245 _ -> Normal
1202 _ -> Normal
@@ -1248,31 +1205,30 @@ withGuards :: [LGRHS GhcPs (Located body)] -> Bool
1248withGuards = any (checkOne . unLoc)
1205withGuards = any (checkOne . unLoc)
1250 checkOne :: GRHS GhcPs (Located body) -> Bool
1207 checkOne :: GRHS GhcPs (Located body) -> Bool
1251− checkOne (GRHS NoExtField [] _) = False
1208+ checkOne (GRHS NoExt [] _) = False
1252 checkOne _ = True
1209 checkOne _ = True
1254exprOpTree :: LHsExpr GhcPs -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs)
1211exprOpTree :: LHsExpr GhcPs -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs)
1255−exprOpTree (L _ (OpApp NoExtField x op y)) = OpBranch (exprOpTree x) op (exprOpTree y)
1212+exprOpTree (L _ (OpApp NoExt x op y)) = OpBranch (exprOpTree x) op (exprOpTree y)
1256exprOpTree n = OpNode n
1213exprOpTree n = OpNode n
1258getOpName :: HsExpr GhcPs -> Maybe RdrName
1215getOpName :: HsExpr GhcPs -> Maybe RdrName
1259getOpName = \case
1216getOpName = \case
1260− HsVar NoExtField (L _ a) -> Just a
1217+ HsVar NoExt (L _ a) -> Just a
1261 _ -> Nothing
1218 _ -> Nothing
1263−getOpNameStr :: RdrName -> String
1264−getOpNameStr = occNameString . rdrNameOcc
1266p_exprOpTree ::
1220p_exprOpTree ::
1221+ -- | Can use special handling of dollar?
1267 -- | Bracket style to use
1223 -- | Bracket style to use
1268 BracketStyle ->
1224 BracketStyle ->
1269 OpTree (LHsExpr GhcPs) (LHsExpr GhcPs) ->
1225 OpTree (LHsExpr GhcPs) (LHsExpr GhcPs) ->
1271−p_exprOpTree s (OpNode x) = located x (p_hsExpr' s)
1227+p_exprOpTree _ s (OpNode x) = located x (p_hsExpr' s)
1272−p_exprOpTree s (OpBranch x op y) = do
1228+p_exprOpTree isDollarSpecial s (OpBranch x op y) = do
1273− -- If the beginning of the first argument and the second argument are on
1229+ -- NOTE If the beginning of the first argument and the second argument
1274− -- the same line, and the second argument has a hanging form, use hanging
1230+ -- are on the same line, and the second argument has a hanging form, use
1275− -- placement.
1231+ -- hanging placement.
1276 let placement =
1232 let placement =
1277 if isOneLineSpan
1233 if isOneLineSpan
1278 (mkSrcSpan (srcSpanStart (opTreeLoc x)) (srcSpanStart (opTreeLoc y)))
1234 (mkSrcSpan (srcSpanStart (opTreeLoc x)) (srcSpanStart (opTreeLoc y)))
@@ -1280,10 +1236,8 @@ p_exprOpTree s (OpBranch x op y) = do
1280 OpNode (L _ n) -> exprPlacement n
1236 OpNode (L _ n) -> exprPlacement n
1281 _ -> Normal
1237 _ -> Normal
1282 else Normal
1238 else Normal
1283− -- Distinguish holes used in infix notation.
1284− -- eg. '1 _foo 2' and '1 `_foo` 2'
1285 opWrapper = case unLoc op of
1239 opWrapper = case unLoc op of
1286− HsUnboundVar NoExtField _ -> backticks
1240+ EWildPat NoExt -> backticks
1288 layout <- getLayout
1242 layout <- getLayout
1289 let ub = case layout of
1243 let ub = case layout of
@@ -1291,67 +1245,24 @@ p_exprOpTree s (OpBranch x op y) = do
1291 MultiLine -> case placement of
1245 MultiLine -> case placement of
1292 Hanging -> useBraces
1246 Hanging -> useBraces
1293 Normal -> dontUseBraces
1247 Normal -> dontUseBraces
1294− opNameStr = (fmap getOpNameStr . getOpName . unLoc) op
1248+ gotDollar = case getOpName (unLoc op) of
1295− gotDollar = opNameStr == Just "$"
1249+ Just rname -> mkVarOcc "$" == (rdrNameOcc rname)
1296− gotColon = opNameStr == Just ":"
1297− gotRecordDot = isRecordDot (unLoc op) (opTreeLoc y)
1299− switchLayout [opTreeLoc x] $
1301− p_op = located op (opWrapper . p_hsExpr)
1302− p_y = switchLayout [opTreeLoc y] (p_exprOpTree N y)
1303− isSection = case (opTreeLoc x, getLoc op) of
1304− (RealSrcSpan treeSpan, RealSrcSpan opSpan) ->
1305− srcSpanEndCol treeSpan /= srcSpanStartCol opSpan
1306 _ -> False
1250 _ -> False
1307− isDoBlock = \case
1251+ switchLayout [opTreeLoc x]
1308− OpNode (L _ HsDo {}) -> True
1252+ $ ub
1309− _ -> False
1253+ $ p_exprOpTree (not gotDollar) s x
1310− useRecordDot' <- useRecordDot
1254+ let p_op = located op (opWrapper . p_hsExpr)
1311− if
1255+ p_y = switchLayout [opTreeLoc y] (p_exprOpTree True N y)
1322− inciIf (isDoBlock y) p_y
1324− && isOneLineSpan (opTreeLoc x)
1256+ if isDollarSpecial && gotDollar && placement == Normal && isOneLineSpan (opTreeLoc x)
1325− && placement == Normal -> do
1257+ then do
1329− breakpoint
1260+ breakpoint
1330− inci p_y
1261+ inci p_y
1331− | useRecordDot' && gotRecordDot -> do
1333− when isSection space
1338− placeHanging placement $ do
1262+ else placeHanging placement $ do
1343−-- | Return 'True' if given expression is a record-dot operator expression.
1345− -- | Operator expression
1347− -- | Span of the expression on the right-hand side of the operator
1350−isRecordDot op (RealSrcSpan ySpan) = case op of
1351− HsVar NoExtField (L (RealSrcSpan opSpan) opName) ->
1352− (getOpNameStr opName == ".") && (srcSpanEndCol opSpan == srcSpanStartCol ySpan)
1354−isRecordDot _ _ = False
1356-- | Get annotations for the enclosing element.
1267-- | Get annotations for the enclosing element.
1357getEnclosingAnns :: R [AnnKeywordId]
1268getEnclosingAnns :: R [AnnKeywordId]