@@ -1,32 +1,43 @@
1−{-# LANGUAGE LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
2+{-# LANGUAGE MultiWayIf #-}
2{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
4+{-# LANGUAGE RecordWildCards #-}
5+{-# LANGUAGE TypeApplications #-}
5module Ormolu.Printer.Meat.Declaration.Value
7module Ormolu.Printer.Meat.Declaration.Value
6− ( p_valDecl
8+ ( p_valDecl,
8− , p_hsExpr
10+ p_hsExpr,
9− , p_hsSplice
11+ p_hsSplice,
13import Bag (bagToList)
16import Bag (bagToList)
14import BasicTypes
17import BasicTypes
15import Control.Monad
18import Control.Monad
16−import Data.Data
19+import Ctype (is_space)
20+import Data.Bool (bool)
21+import Data.Char (isPunctuation, isSymbol)
22+import Data.Data hiding (Infix, Prefix)
23+import Data.Functor ((<&>))
17import Data.List (intersperse, sortOn)
24import Data.List (intersperse, sortOn)
25+import Data.List.NonEmpty (NonEmpty (..), (<|))
26+import qualified Data.List.NonEmpty as NE
18import Data.Text (Text)
27import Data.Text (Text)
28+import qualified Data.Text as Text
30+import OccName (occNameString)
20import Ormolu.Printer.Combinators
31import Ormolu.Printer.Combinators
32+import Ormolu.Printer.Internal
21import Ormolu.Printer.Meat.Common
33import Ormolu.Printer.Meat.Common
34+import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
22import Ormolu.Printer.Meat.Declaration.Signature
35import Ormolu.Printer.Meat.Declaration.Signature
23import Ormolu.Printer.Meat.Type
36import Ormolu.Printer.Meat.Type
37+import Ormolu.Printer.Operators
24import Ormolu.Utils
38import Ormolu.Utils
25−import Outputable (Outputable (..))
26−import SrcLoc (combineSrcSpans, isOneLineSpan)
27−import qualified Data.List.NonEmpty as NE
28−import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
40+-- | Style of a group of equations.
30data MatchGroupStyle
41data MatchGroupStyle
31 = Function (Located RdrName)
42 = Function (Located RdrName)
32 | PatternBind
43 | PatternBind
@@ -34,588 +45,1062 @@ data MatchGroupStyle
35 | LambdaCase
46 | LambdaCase
48+-- | Style of equations in a group.
37data GroupStyle
49data GroupStyle
38 = EqualSign
50 = EqualSign
39 | RightArrow
51 | RightArrow
41-- | Expression placement. This marks the places where expressions that
53-- | Expression placement. This marks the places where expressions that
42-- implement handing forms may use them.
54-- implement handing forms may use them.
44data Placement
55data Placement
45− = Normal -- ^ Multi-line layout should cause
56+ = -- | Multi-line layout should cause
46− -- insertion of a newline and indentation
57+ -- insertion of a newline and indentation
48− | Hanging -- ^ Expressions that have hanging form
60+ | -- | Expressions that have hanging form
49− -- should use it and avoid bumping one level
61+ -- should use it and avoid bumping one level
50− -- of indentation
62+ -- of indentation
52p_valDecl :: HsBindLR GhcPs GhcPs -> R ()
66p_valDecl :: HsBindLR GhcPs GhcPs -> R ()
53−p_valDecl = line . p_valDecl'
67+p_valDecl = \case
55−p_valDecl' :: HsBindLR GhcPs GhcPs -> R ()
57− FunBind NoExt funId funMatches _ _ -> p_funBind funId funMatches
68+ FunBind NoExtField funId funMatches _ _ -> p_funBind funId funMatches
58− PatBind NoExt pat grhss _ -> p_match PatternBind False [pat] grhss
69+ PatBind NoExtField pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
59 VarBind {} -> notImplemented "VarBinds" -- introduced by the type checker
70 VarBind {} -> notImplemented "VarBinds" -- introduced by the type checker
60 AbsBinds {} -> notImplemented "AbsBinds" -- introduced by the type checker
71 AbsBinds {} -> notImplemented "AbsBinds" -- introduced by the type checker
61− PatSynBind NoExt psb -> p_patSynBind psb
72+ PatSynBind NoExtField psb -> p_patSynBind psb
62− XHsBindsLR NoExt -> notImplemented "XHsBindsLR"
73+ XHsBindsLR x -> noExtCon x
64−p_funBind
75+p_funBind ::
65− :: Located RdrName
76+ Located RdrName ->
66− -> MatchGroup GhcPs (LHsExpr GhcPs)
77+ MatchGroup GhcPs (LHsExpr GhcPs) ->
68−p_funBind name mgroup =
69− p_matchGroup (Function name) mgroup
79+p_funBind name = p_matchGroup (Function name)
71−p_matchGroup
81+p_matchGroup ::
72− :: MatchGroupStyle
82+ MatchGroupStyle ->
73− -> MatchGroup GhcPs (LHsExpr GhcPs)
83+ MatchGroup GhcPs (LHsExpr GhcPs) ->
85+p_matchGroup = p_matchGroup' exprPlacement p_hsExpr
89+ -- | How to get body placement
90+ (body -> Placement) ->
91+ -- | How to print body
93+ -- | Style of this group of equations
96+ MatchGroup GhcPs (Located body) ->
75−p_matchGroup style MG {..} =
98+p_matchGroup' placer render style MG {..} = do
76− locatedVia Nothing mg_alts $
99+ let ob = case style of
77− newlineSep (located' (\m@Match {..} ->
100+ Case -> id
103+ -- Since we are forcing braces on 'sepSemi' based on 'ob', we have to
104+ -- restore the brace state inside the sepsemi.
105+ ub <- bool dontUseBraces useBraces <$> canUseBraces
106+ ob $ sepSemi (located' (ub . p_Match)) (unLoc mg_alts)
108+ p_Match m@Match {..} =
112+ (adjustMatchGroupStyle m style)
78− p_match style (isInfixMatch m) m_pats m_grhss))
113+ (isInfixMatch m)
79−p_matchGroup _ (XMatchGroup NoExt) = notImplemented "XMatchGroup"
114+ (matchStrictness m)
117+ p_Match (XMatch x) = noExtCon x
118+p_matchGroup' _ _ _ (XMatchGroup x) = noExtCon x
120+-- | Function id obtained through pattern matching on 'FunBind' should not
121+-- be used to print the actual equations because the different ‘RdrNames’
122+-- used in the equations may have different “decorations” (such as backticks
123+-- and paretheses) associated with them. It is necessary to use per-equation
124+-- names obtained from 'm_ctxt' of 'Match'. This function replaces function
125+-- name inside of 'Function' accordingly.
126+adjustMatchGroupStyle ::
130+adjustMatchGroupStyle m = \case
131+ Function _ -> (Function . mc_fun . m_ctxt) m
134+matchStrictness :: Match id body -> SrcStrictness
135+matchStrictness match =
136+ case m_ctxt match of
137+ FunRhs {mc_strictness = s} -> s
141+ -- | Style of the group
143+ -- | Is this an infix match?
145+ -- | Strictness prefix (FunBind)
147+ -- | Argument patterns
150+ GRHSs GhcPs (LHsExpr GhcPs) ->
152+p_match = p_match' exprPlacement p_hsExpr
81−p_match
154+p_match' ::
82− :: MatchGroupStyle
155+ Data body =>
156+ -- | How to get body placement
157+ (body -> Placement) ->
158+ -- | How to print body
160+ -- | Style of this group of equations
83− -> Bool -- ^ Is this an infix match?
162+ -- | Is this an infix match?
164+ -- | Strictness prefix (FunBind)
166+ -- | Argument patterns
84− -> [LPat GhcPs]
167+ [LPat GhcPs] ->
85− -> GRHSs GhcPs (LHsExpr GhcPs)
169+ GRHSs GhcPs (Located body) ->
87−p_match style isInfix m_pats m_grhss = do
171+p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
88− -- NOTE Normally, since patterns may be placed in a multi-line layout, it
172+ -- Normally, since patterns may be placed in a multi-line layout, it is
89− -- is necessary to bump indentation for the pattern group so it's more
173+ -- necessary to bump indentation for the pattern group so it's more
90 -- indented than function name. This in turn means that indentation for
174 -- indented than function name. This in turn means that indentation for
91 -- the body should also be bumped. Normally this would mean that bodies
175 -- the body should also be bumped. Normally this would mean that bodies
92 -- would start with two indentation steps applied, which is ugly, so we
176 -- would start with two indentation steps applied, which is ugly, so we
93 -- need to be a bit more clever here and bump indentation level only when
177 -- need to be a bit more clever here and bump indentation level only when
94 -- pattern group is multiline.
178 -- pattern group is multiline.
180+ NoSrcStrict -> return ()
181+ SrcStrict -> txt "!"
95− inci' <- case NE.nonEmpty m_pats of
183+ indentBody <- case NE.nonEmpty m_pats of
96− Nothing -> id <$ case style of
185+ False <$ case style of
97− Function name -> p_rdrName name
186+ Function name -> p_rdrName name
98− _ -> return ()
187+ _ -> return ()
99 Just ne_pats -> do
188 Just ne_pats -> do
100− let combinedSpans = combineSrcSpans' $
189+ let combinedSpans = case style of
190+ Function name -> combineSrcSpans (getLoc name) patSpans
101− getLoc <$> ne_pats
192+ patSpans = combineSrcSpans' (getLoc <$> ne_pats)
102− inci' = if isOneLineSpan combinedSpans
193+ indentBody = not (isOneLineSpan combinedSpans)
105− switchLayout combinedSpans $ do
194+ switchLayout [combinedSpans] $ do
106− let stdCase = velt' (located' p_pat <$> m_pats)
195+ let stdCase = sep breakpoint (located' p_pat) m_pats
107 case style of
196 case style of
108 Function name ->
197 Function name ->
109 p_infixDefHelper
198 p_infixDefHelper
111− inci'
200+ indentBody
112 (p_rdrName name)
201 (p_rdrName name)
113 (located' p_pat <$> m_pats)
202 (located' p_pat <$> m_pats)
114 PatternBind -> stdCase
203 PatternBind -> stdCase
115 Case -> stdCase
204 Case -> stdCase
116 Lambda -> do
205 Lambda -> do
206+ let needsSpace = case unLoc (NE.head ne_pats) of
209+ SplicePat _ _ -> True
212+ when needsSpace space
118− stdCase
213+ sitcc stdCase
119 LambdaCase -> stdCase
214 LambdaCase -> stdCase
120− return inci'
215+ return indentBody
121−
216+ let -- Calculate position of end of patterns. This is useful when we decide
122− let
217+ -- about putting certain constructions in hanging positions.
123− -- Calculate a 'SrcSpan' that captures the end of the name\/pattern part
124− -- of the match. This is used to tell if we need to have the body on a
126− endOfPatsSpan = srcLocSpan . srcSpanEnd <$> case NE.nonEmpty m_pats of
218+ endOfPats = case NE.nonEmpty m_pats of
127− Nothing -> case style of
219+ Nothing -> case style of
128− Function name -> Just $ getLoc name
220+ Function name -> Just (getLoc name)
129− _ -> Nothing
221+ _ -> Nothing
130− Just pats -> Just . getLoc $ NE.last pats
222+ Just pats -> (Just . getLoc . NE.last) pats
131− isCase = \case
223+ isCase = \case
132− Case -> True
224+ Case -> True
133− LambdaCase -> True
225+ LambdaCase -> True
134− _ -> False
226+ _ -> False
136− let GRHSs {..} = m_grhss
137− hasGuards = withGuards grhssGRHSs
227+ hasGuards = withGuards grhssGRHSs
138− unless (length grhssGRHSs > 1) $ do
228+ grhssSpan =
140− Function _ -> txt " ="
141− PatternBind -> txt " ="
142− s | isCase s && hasGuards -> return ()
144− let grhssSpan = combineSrcSpans' $
229+ combineSrcSpans' $
145 getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
230 getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
146− patGrhssSpan = maybe grhssSpan (combineSrcSpans grhssSpan) endOfPatsSpan
234+ (combineSrcSpans grhssSpan . srcLocSpan . srcSpanEnd)
147− placement = blockPlacement grhssGRHSs
236+ placement =
148− inciLocalBinds = case placement of
237+ case endOfPats of
238+ Nothing -> blockPlacement placer grhssGRHSs
240+ if onTheSameLine spn grhssSpan
241+ then blockPlacement placer grhssGRHSs
149− Normal -> id
242+ else Normal
151− p_body = do
243+ p_body = do
152− let groupStyle =
244+ let groupStyle =
153− if isCase style && hasGuards
245+ if isCase style && hasGuards
154 then RightArrow
246 then RightArrow
155 else EqualSign
247 else EqualSign
156− newlineSep (located' (p_grhs groupStyle)) grhssGRHSs
248+ sep newline (located' (p_grhs' placer render groupStyle)) grhssGRHSs
157− unless
249+ p_where = do
158− (GHC.isEmptyLocalBindsPR (unLoc grhssLocalBinds))
250+ let whereIsEmpty = GHC.isEmptyLocalBindsPR (unLoc grhssLocalBinds)
159− (inciLocalBinds $ do
251+ unless (GHC.eqEmptyLocalBinds (unLoc grhssLocalBinds)) $ do
160− newline
252+ breakpoint
161− line (txt "where")
253+ txt "where"
254+ unless whereIsEmpty breakpoint
162− inci (located grhssLocalBinds p_hsLocalBinds)
255+ inci $ located grhssLocalBinds p_hsLocalBinds
163− )
256+ inciIf indentBody $ do
257+ unless (length grhssGRHSs > 1) $
164− case style of
258+ case style of
165− Lambda -> placeHanging placement $
259+ Function _ | hasGuards -> return ()
166− switchLayout patGrhssSpan p_body
260+ Function _ -> space >> inci equals
261+ PatternBind -> space >> inci equals
262+ s | isCase s && hasGuards -> return ()
263+ _ -> space >> txt "->"
167− _ -> switchLayout patGrhssSpan $
264+ switchLayout [patGrhssSpan] $
168− placeHanging placement p_body
265+ placeHanging placement p_body
267+p_match' _ _ _ _ _ _ (XGRHSs x) = noExtCon x
170p_grhs :: GroupStyle -> GRHS GhcPs (LHsExpr GhcPs) -> R ()
269p_grhs :: GroupStyle -> GRHS GhcPs (LHsExpr GhcPs) -> R ()
270+p_grhs = p_grhs' exprPlacement p_hsExpr
274+ -- | How to get body placement
275+ (body -> Placement) ->
276+ -- | How to print body
279+ GRHS GhcPs (Located body) ->
171−p_grhs style (GRHS NoExt guards body) =
281+p_grhs' placer render style (GRHS NoExtField guards body) =
172 case guards of
282 case guards of
173 [] -> p_body
283 [] -> p_body
175− txt "| "
285+ txt "|"
176− velt $ withSep comma (located' p_stmt) xs
287+ sitcc (sep commaDel (sitcc . located' p_stmt) xs)
178− txt $ case style of
289+ inci $ case style of
179− EqualSign -> "="
290+ EqualSign -> equals
180− RightArrow -> "->"
291+ RightArrow -> txt "->"
181− breakpoint
292+ placeHanging placement p_body
296+ Nothing -> placer (unLoc body)
298+ if onTheSameLine spn (getLoc body)
299+ then placer (unLoc body)
302+ case NE.nonEmpty guards of
304+ Just gs -> (Just . getLoc . NE.last) gs
184− p_body = located body p_hsExpr
305+ p_body = located body render
185−p_grhs _ (XGRHS NoExt) = notImplemented "XGRHS"
306+p_grhs' _ _ _ (XGRHS x) = noExtCon x
308+p_hsCmd :: HsCmd GhcPs -> R ()
310+ HsCmdArrApp NoExtField body input arrType _ -> do
311+ located body p_hsExpr
315+ HsFirstOrderApp -> txt "-<"
316+ HsHigherOrderApp -> txt "-<<"
317+ placeHanging (exprPlacement (unLoc input)) $
318+ located input p_hsExpr
319+ HsCmdArrForm NoExtField form Prefix _ cmds -> banana $ do
320+ located form p_hsExpr
321+ unless (null cmds) $ do
323+ inci (sequence_ (intersperse breakpoint (located' p_hsCmdTop <$> cmds)))
324+ HsCmdArrForm NoExtField form Infix _ [left, right] -> do
325+ located left p_hsCmdTop
327+ located form p_hsExpr
328+ placeHanging (cmdTopPlacement (unLoc right)) $
329+ located right p_hsCmdTop
330+ HsCmdArrForm NoExtField _ Infix _ _ -> notImplemented "HsCmdArrForm"
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.
334+ notImplemented "HsCmdApp"
335+ HsCmdLam NoExtField mgroup -> p_matchGroup' cmdPlacement p_hsCmd Lambda mgroup
336+ HsCmdPar NoExtField c -> parens N (located c p_hsCmd)
337+ HsCmdCase NoExtField e mgroup ->
338+ p_case cmdPlacement p_hsCmd e mgroup
339+ HsCmdIf NoExtField _ if' then' else' ->
340+ p_if cmdPlacement p_hsCmd if' then' else'
341+ HsCmdLet NoExtField localBinds c ->
342+ p_let p_hsCmd localBinds c
343+ HsCmdDo NoExtField es -> do
347+ sitcc . sep newline (sitcc . withSpacing (p_stmt' cmdPlacement p_hsCmd))
348+ HsCmdWrap {} -> notImplemented "HsCmdWrap"
349+ XCmd x -> noExtCon x
351+p_hsCmdTop :: HsCmdTop GhcPs -> R ()
353+ HsCmdTop NoExtField cmd -> located cmd p_hsCmd
354+ XCmdTop x -> noExtCon x
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)
187p_stmt :: Stmt GhcPs (LHsExpr GhcPs) -> R ()
385p_stmt :: Stmt GhcPs (LHsExpr GhcPs) -> R ()
188−p_stmt = \case
386+p_stmt = p_stmt' exprPlacement p_hsExpr
391+ (body -> Placement) ->
394+ -- | Statement to render
395+ Stmt GhcPs (Located body) ->
397+p_stmt' placer render = \case
189− LastStmt NoExt body _ _ -> located body p_hsExpr
398+ LastStmt NoExtField body _ _ -> located body render
190− BindStmt NoExt l f _ _ -> do
399+ BindStmt NoExtField p f _ _ -> do
191− located l p_pat
400+ located p p_pat
194− breakpoint
403+ let loc = getLoc p
195− inci (located f p_hsExpr)
404+ placement =
408+ (mkSrcSpan (srcSpanEnd loc) (srcSpanStart l'))
411+ switchLayout [loc, getLoc f] $
412+ placeHanging placement (located f render)
196− ApplicativeStmt {} -> notImplemented "ApplicativeStmt"
413+ ApplicativeStmt {} -> notImplemented "ApplicativeStmt" -- generated by renamer
197− BodyStmt NoExt body _ _ -> located body p_hsExpr
414+ BodyStmt NoExtField body _ _ -> located body render
198− LetStmt NoExt binds -> do
415+ LetStmt NoExtField binds -> do
199− txt "let "
416+ txt "let"
200 sitcc $ located binds p_hsLocalBinds
418 sitcc $ located binds p_hsLocalBinds
201− ParStmt NoExt stmts _ _ ->
419+ ParStmt {} ->
202− sequence_ $ intersperse breakpoint $
420+ -- 'ParStmt' should always be eliminated in 'gatherStmt' already, such
203− withSep (txt "| ") p_parStmtBlock stmts
421+ -- that it never occurs in 'p_stmt''. Consequently, handling it here
422+ -- would be redundant.
204− TransStmt {} -> notImplemented "TransStmt"
423+ notImplemented "ParStmt"
205− RecStmt {} -> notImplemented "RecStmt"
424+ TransStmt {..} ->
206− XStmtLR {} -> notImplemented "XStmtLR"
425+ -- 'TransStmt' only needs to account for render printing itself, since
207−
426+ -- pretty printing of relevant statements (e.g., in 'trS_stmts') is
208−p_parStmtBlock :: ParStmtBlock GhcPs GhcPs -> R ()
427+ -- handled through 'gatherStmt'.
209−p_parStmtBlock = \case
428+ case (trS_form, trS_by) of
210− ParStmtBlock NoExt stmts _ _ ->
429+ (ThenForm, Nothing) -> do
211− velt $ withSep comma (located' (sitcc . p_stmt)) stmts
430+ txt "then"
212− XParStmtBlock {} -> notImplemented "XParStmtBlock"
431+ breakpoint
432+ inci $ located trS_using p_hsExpr
433+ (ThenForm, Just e) -> do
436+ inci $ located trS_using p_hsExpr
440+ inci $ located e p_hsExpr
441+ (GroupForm, Nothing) -> do
442+ txt "then group using"
444+ inci $ located trS_using p_hsExpr
445+ (GroupForm, Just e) -> do
448+ inci $ located e p_hsExpr
452+ inci $ located trS_using p_hsExpr
456+ sitcc $ sepSemi (withSpacing (p_stmt' placer render)) recS_stmts
457+ XStmtLR c -> noExtCon c
459+gatherStmt :: ExprLStmt GhcPs -> [[ExprLStmt GhcPs]]
460+gatherStmt (L _ (ParStmt NoExtField block _ _)) =
461+ foldr ((<>) . gatherStmtBlock) [] block
462+gatherStmt (L s stmt@TransStmt {..}) =
463+ foldr liftAppend [] ((gatherStmt <$> trS_stmts) <> pure [[L s stmt]])
464+gatherStmt stmt = [[stmt]]
466+gatherStmtBlock :: ParStmtBlock GhcPs GhcPs -> [[ExprLStmt GhcPs]]
467+gatherStmtBlock (ParStmtBlock _ stmts _ _) =
468+ foldr (liftAppend . gatherStmt) [] stmts
469+gatherStmtBlock (XParStmtBlock x) = noExtCon x
214p_hsLocalBinds :: HsLocalBindsLR GhcPs GhcPs -> R ()
471p_hsLocalBinds :: HsLocalBindsLR GhcPs GhcPs -> R ()
215p_hsLocalBinds = \case
472p_hsLocalBinds = \case
216− HsValBinds NoExt (ValBinds NoExt bag lsigs) -> do
473+ HsValBinds NoExtField (ValBinds NoExtField bag lsigs) -> do
217− let ssStart = either
474+ -- When in a single-line layout, there is a chance that the inner
218− (srcSpanStart . getLoc)
475+ -- elements will also contain semicolons and they will confuse the
219− (srcSpanStart . getLoc)
476+ -- parser. so we request braces around every element except the last.
220− items =
477+ br <- layoutToBraces <$> getLayout
479+ let injectLeft (L l x) = L l (Left x)
480+ injectRight (L l x) = L l (Right x)
221− (Left <$> bagToList bag) ++ (Right <$> lsigs)
481+ in (injectLeft <$> bagToList bag) ++ (injectRight <$> lsigs)
222− p_item (Left x) = located x p_valDecl'
482+ positionToBracing = \case
223− p_item (Right x) = located x p_sigDecl'
483+ SinglePos -> id
224− newlineSep p_item (sortOn ssStart items)
484+ FirstPos -> br
488+ positionToBracing p $
489+ withSpacing (either p_valDecl p_sigDecl) item
490+ binds = sortOn (srcSpanStart . getLoc) items
491+ sitcc $ sepSemi p_item' (attachRelativePos binds)
225− HsValBinds NoExt _ -> notImplemented "HsValBinds"
492+ HsValBinds NoExtField _ -> notImplemented "HsValBinds"
226− HsIPBinds NoExt _ -> notImplemented "HsIPBinds"
493+ HsIPBinds NoExtField (IPBinds NoExtField xs) ->
494+ -- Second argument of IPBind is always Left before type-checking.
495+ let p_ipBind (IPBind NoExtField (Left name) expr) = do
500+ useBraces $ inci $ located expr p_hsExpr
501+ p_ipBind (IPBind NoExtField (Right _) _) =
502+ -- Should only occur after the type checker
503+ notImplemented "IPBind _ (Right _) _"
504+ p_ipBind (XIPBind x) = noExtCon x
505+ in sepSemi (located' p_ipBind) xs
506+ HsIPBinds NoExtField _ -> notImplemented "HsIpBinds"
227− EmptyLocalBinds NoExt -> return ()
507+ EmptyLocalBinds NoExtField -> return ()
228− XHsLocalBindsLR _ -> notImplemented "XHsLocalBindsLR"
508+ XHsLocalBindsLR x -> noExtCon x
230−p_hsRecField
510+p_hsRecField ::
231− :: (Data id, Outputable id)
232− => HsRecField' id (LHsExpr GhcPs)
511+ HsRecField' RdrName (LHsExpr GhcPs) ->
234−p_hsRecField = \HsRecField {..} -> do
513+p_hsRecField HsRecField {..} = do
235− located hsRecFieldLbl atom
514+ p_rdrName hsRecFieldLbl
236− unless hsRecPun $ do
515+ unless hsRecPun $ do
238− located hsRecFieldArg p_hsExpr
517+ equals
240−p_hsTupArg :: HsTupArg GhcPs -> R ()
519+ if onTheSameLine (getLoc hsRecFieldLbl) (getLoc hsRecFieldArg)
241−p_hsTupArg = \case
520+ then exprPlacement (unLoc hsRecFieldArg)
242− Present NoExt x -> located x p_hsExpr
521+ else Normal
243− Missing NoExt -> pure ()
522+ placeHanging placement (located hsRecFieldArg p_hsExpr)
244− XTupArg {} -> notImplemented "XTupArg"
246p_hsExpr :: HsExpr GhcPs -> R ()
524p_hsExpr :: HsExpr GhcPs -> R ()
247−p_hsExpr = \case
525+p_hsExpr = p_hsExpr' N
527+p_hsExpr' :: BracketStyle -> HsExpr GhcPs -> R ()
248− HsVar NoExt name -> p_rdrName name
529+ HsVar NoExtField name -> p_rdrName name
249− HsUnboundVar NoExt _ -> notImplemented "HsUnboundVar"
530+ HsUnboundVar NoExtField v -> atom (unboundVarOcc v)
250− HsConLikeOut NoExt _ -> notImplemented "HsConLikeOut"
531+ HsConLikeOut NoExtField _ -> notImplemented "HsConLikeOut"
251− HsRecFld NoExt x ->
532+ HsRecFld NoExtField x ->
252 case x of
533 case x of
253− Unambiguous NoExt name -> p_rdrName name
534+ Unambiguous NoExtField name -> p_rdrName name
254− Ambiguous NoExt name -> p_rdrName name
535+ Ambiguous NoExtField name -> p_rdrName name
255− XAmbiguousFieldOcc NoExt -> notImplemented "XAmbiguousFieldOcc"
536+ XAmbiguousFieldOcc xx -> noExtCon xx
256− HsOverLabel NoExt _ v -> do
537+ HsOverLabel NoExtField _ v -> do
259− HsIPVar NoExt (HsIPName name) -> do
540+ HsIPVar NoExtField (HsIPName name) -> do
261 atom name
542 atom name
262− HsOverLit NoExt v -> atom (ol_val v)
543+ HsOverLit NoExtField v -> atom (ol_val v)
263− HsLit NoExt lit -> atom lit
544+ HsLit NoExtField lit ->
546+ HsString (SourceText stxt) _ -> p_stringLit stxt
547+ HsStringPrim (SourceText stxt) _ -> p_stringLit stxt
264− HsLam NoExt mgroup ->
549+ HsLam NoExtField mgroup ->
265 p_matchGroup Lambda mgroup
550 p_matchGroup Lambda mgroup
266− HsLamCase NoExt mgroup -> do
551+ HsLamCase NoExtField mgroup -> do
267 txt "\\case"
552 txt "\\case"
269− inci (p_matchGroup LambdaCase mgroup)
270− HsApp NoExt f x -> do
272 breakpoint
553 breakpoint
554+ inci (p_matchGroup LambdaCase mgroup)
555+ HsApp NoExtField f x -> do
556+ let -- In order to format function applications with multiple parameters
557+ -- nicer, traverse the AST to gather the function and all the
558+ -- parameters together.
559+ gatherArgs f' knownArgs =
561+ L _ (HsApp _ l r) -> gatherArgs l (r <| knownArgs)
562+ _ -> (f', knownArgs)
563+ (func, args) = gatherArgs f (x :| [])
564+ -- We need to handle the last argument specially if it is a
565+ -- hanging construct, so separate it from the rest.
566+ (initp, lastp) = (NE.init args, NE.last args)
569+ getLoc f :| [(srcLocSpan . srcSpanStart . getLoc) lastp]
570+ -- Hang the last argument only if the initial arguments span one
573+ if isOneLineSpan initSpan
574+ then exprPlacement (unLoc lastp)
576+ -- If the last argument is not hanging, just separate every argument as
577+ -- usual. If it is hanging, print the initial arguments and hang the
578+ -- last one. Also, use braces around the every argument except the last
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
273− inci (located x p_hsExpr)
598+ located func (p_hsExpr' s)
600+ inciIf doIndent $ sep breakpoint (located' p_hsExpr) initp
601+ inciIf doIndent $ do
602+ unless (null initp) breakpoint
603+ located lastp p_hsExpr
605+ useBraces . switchLayout [initSpan] $ do
606+ located func (p_hsExpr' s)
608+ sep breakpoint (located' p_hsExpr) initp
609+ placeHanging placement $
610+ located lastp p_hsExpr
274− HsAppType a e -> do
611+ HsAppType NoExtField e a -> do
275 located e p_hsExpr
612 located e p_hsExpr
276 breakpoint
613 breakpoint
277 inci $ do
614 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
279 located (hswc_body a) p_hsType
621 located (hswc_body a) p_hsType
280− OpApp NoExt x op y -> do
622+ OpApp NoExtField x op y -> do
281− located x p_hsExpr
623+ let opTree = OpBranch (exprOpTree x) op (exprOpTree y)
282− space
624+ p_exprOpTree s (reassociateOpTree getOpName opTree)
284− placeHanging (exprPlacement (unLoc y)) $
286− NegApp NoExt e _ -> do
625+ NegApp NoExtField e _ -> do
288 located e p_hsExpr
628 located e p_hsExpr
629+ HsPar NoExtField e ->
289− HsPar NoExt e -> parens (located e p_hsExpr)
630+ parens s (located e (dontUseBraces . p_hsExpr))
290− SectionL NoExt x op -> do
631+ SectionL NoExtField x op -> do
291 located x p_hsExpr
632 located x p_hsExpr
292 breakpoint
633 breakpoint
293 inci (located op p_hsExpr)
634 inci (located op p_hsExpr)
294− SectionR NoExt op x -> do
635+ SectionR NoExtField op x -> do
295 located op p_hsExpr
636 located op p_hsExpr
637+ useRecordDot' <- useRecordDot
638+ let isRecordDot' = isRecordDot (unLoc op) (getLoc x)
296− breakpoint
639+ unless (useRecordDot' && isRecordDot') breakpoint
297 inci (located x p_hsExpr)
640 inci (located x p_hsExpr)
298− ExplicitTuple NoExt args boxity -> do
641+ ExplicitTuple NoExtField args boxity ->
299 let isSection = any (isMissing . unLoc) args
642 let isSection = any (isMissing . unLoc) args
300 isMissing = \case
643 isMissing = \case
301− Missing NoExt -> True
644+ Missing NoExtField -> True
302 _ -> False
645 _ -> 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
303− let parens' =
651+ parens' =
304 case boxity of
652 case boxity of
305 Boxed -> parens
653 Boxed -> parens
306 Unboxed -> parensHash
654 Unboxed -> parensHash
307− parens' $ if isSection
655+ in if isSection
308− then sequence_ (withSep (txt ",") (located' p_hsTupArg) args)
656+ then
309− else velt (withSep comma (located' p_hsTupArg) args)
657+ switchLayout [] . parens' s $
658+ sep comma p_larg args
660+ switchLayout (getLoc <$> args) . parens' s $
661+ sep commaDel p_larg args
310− ExplicitSum NoExt tag arity e -> do
662+ ExplicitSum NoExtField tag arity e ->
311− let before = tag - 1
312− after = arity - before - 1
313− args = replicate before Nothing <> [Just e] <> replicate after Nothing
315− let isFirst = i == 0
316− isLast = i == arity - 1
319− unless (isFirst || isLast) space
321− unless isFirst space
322− located l p_hsExpr
663+ p_unboxedSum N tag arity (located e p_hsExpr)
324− parensHash $ sequence_ (withSep (txt "|") f (zip args [0..]))
325− HsCase NoExt e mgroup -> do
664+ HsCase NoExtField e mgroup ->
326− txt "case "
665+ p_case exprPlacement p_hsExpr e mgroup
330− inci (p_matchGroup Case mgroup)
331− HsIf NoExt _ if' then' else' -> do
666+ HsIf NoExtField _ if' then' else' ->
332− txt "if "
667+ p_if exprPlacement p_hsExpr if' then' else'
333− located if' p_hsExpr
336− located then' $ \x -> do
341− located else' $ \x -> do
344− HsMultiIf NoExt guards -> do
668+ HsMultiIf NoExtField guards -> do
345− txt "if "
669+ txt "if"
346− sitcc $ newlineSep (located' (p_grhs RightArrow)) guards
347− HsLet NoExt localBinds e -> do
349− sitcc (located localBinds p_hsLocalBinds)
350 breakpoint
670 breakpoint
351− txt "in "
671+ inci . inci $ sep newline (located' (p_grhs RightArrow)) guards
352− sitcc (located e p_hsExpr)
672+ HsLet NoExtField localBinds e ->
673+ p_let p_hsExpr localBinds e
353− HsDo NoExt ctx es -> do
674+ HsDo NoExtField ctx es -> do
354 let doBody header = do
675 let doBody header = do
355 txt header
676 txt header
356− newline
677+ breakpoint
357− inci $ located es (newlineSep (located' (sitcc . p_stmt)))
678+ ub <- layoutToBraces <$> getLayout
681+ (ub . withSpacing (p_stmt' exprPlacement (p_hsExpr' S)))
358− compBody = brackets $ located es $ \xs -> do
683+ compBody = brackets N . located es $ \xs -> do
686+ (breakpoint >> txt "|" >> space)
692+ (located' (sitcc . p_stmt))
359− let stmts = init xs
693+ stmts = init xs
360 yield = last xs
694 yield = last xs
695+ lists = foldr (liftAppend . gatherStmt) [] stmts
361 located yield p_stmt
696 located yield p_stmt
362 breakpoint
697 breakpoint
363− txt "| "
698+ txt "|"
364− case stmts of
699+ space
365− [stmt] | ParStmt {} <- unLoc stmt -> located stmt p_stmt
700+ p_parBody lists
366− _ -> velt $ withSep comma (located' (sitcc . p_stmt)) stmts
367 case ctx of
701 case ctx of
368 DoExpr -> doBody "do"
702 DoExpr -> doBody "do"
369 MDoExpr -> doBody "mdo"
703 MDoExpr -> doBody "mdo"
370 ListComp -> compBody
704 ListComp -> compBody
371 MonadComp -> notImplemented "MonadComp"
705 MonadComp -> notImplemented "MonadComp"
372− ArrowExpr -> notImplemented "ArrowExpr"
706+ ArrowExpr -> notImplemented "ArrowExpr"
373 GhciStmtCtxt -> notImplemented "GhciStmtCtxt"
707 GhciStmtCtxt -> notImplemented "GhciStmtCtxt"
374 PatGuard _ -> notImplemented "PatGuard"
708 PatGuard _ -> notImplemented "PatGuard"
375 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
709 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
376 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
710 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
377 ExplicitList _ _ xs ->
711 ExplicitList _ _ xs ->
378− brackets $ velt (withSep comma (located' p_hsExpr) xs)
713+ sep commaDel (sitcc . located' p_hsExpr) xs
379 RecordCon {..} -> do
714 RecordCon {..} -> do
380 located rcon_con_name atom
715 located rcon_con_name atom
381 breakpoint
716 breakpoint
382 let HsRecFields {..} = rcon_flds
717 let HsRecFields {..} = rcon_flds
719+ (f :: HsRecField GhcPs (LHsExpr GhcPs))
720+ { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
722+ XFieldOcc x -> noExtCon x
383− fields = located' p_hsRecField <$> rec_flds
724+ fields = located' (p_hsRecField . updName) <$> rec_flds
385 case rec_dotdot of
726 case rec_dotdot of
386 Just {} -> [txt ".."]
727 Just {} -> [txt ".."]
387 Nothing -> []
728 Nothing -> []
388− inci $ braces $ velt (withSep comma id (fields <> dotdot))
729+ inci . braces N $
730+ sep commaDel sitcc (fields <> dotdot)
389 RecordUpd {..} -> do
731 RecordUpd {..} -> do
390 located rupd_expr p_hsExpr
732 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))
391− breakpoint
740+ unless (useRecordDot' && isPluginForm) breakpoint
742+ (f :: HsRecUpdField GhcPs)
743+ { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
745+ Unambiguous _ n -> n
746+ XAmbiguousFieldOcc x -> noExtCon x
392− inci $ braces $ velt (withSep comma (located' p_hsRecField) rupd_flds)
751+ (sitcc . located' (p_hsRecField . updName))
393− ExprWithTySig affix x -> sitcc $ do
753+ ExprWithTySig NoExtField x HsWC {hswc_body = HsIB {..}} -> sitcc $ do
394 located x p_hsExpr
754 located x p_hsExpr
395 breakpoint
757 breakpoint
398− let HsWC {..} = affix
399− HsIB {..} = hswc_body
400− located hsib_body p_hsType
758+ inci $ located hsib_body p_hsType
759+ ExprWithTySig NoExtField _ HsWC {hswc_body = XHsImplicitBndrs x} -> noExtCon x
760+ ExprWithTySig NoExtField _ (XHsWildCardBndrs x) -> noExtCon x
401− ArithSeq NoExt _ x -> do
761+ ArithSeq NoExtField _ x ->
402 case x of
762 case x of
403− From from -> brackets $ do
763+ From from -> brackets s $ do
404 located from p_hsExpr
764 located from p_hsExpr
405− breakpoint'
765+ breakpoint
407− FromThen from next -> brackets $ do
767+ FromThen from next -> brackets s $ do
408− velt (withSep comma (located' p_hsExpr) [from, next])
768+ sep commaDel (located' p_hsExpr) [from, next]
409− breakpoint'
769+ breakpoint
411− FromTo from to -> brackets $ do
771+ FromTo from to -> brackets s $ do
412 located from p_hsExpr
772 located from p_hsExpr
413− breakpoint'
773+ breakpoint
414− txt ".. "
774+ txt ".."
415 located to p_hsExpr
776 located to p_hsExpr
416− FromThenTo from next to -> brackets $ do
777+ FromThenTo from next to -> brackets s $ do
417− velt (withSep comma (located' p_hsExpr) [from, next])
778+ sep commaDel (located' p_hsExpr) [from, next]
418− breakpoint'
779+ breakpoint
419− txt ".. "
780+ txt ".."
420 located to p_hsExpr
782 located to p_hsExpr
421− HsSCC NoExt _ name x -> do
783+ HsSCC NoExtField _ name x -> do
422 txt "{-# SCC "
784 txt "{-# SCC "
423 atom name
785 atom name
424 txt " #-}"
786 txt " #-}"
425 breakpoint
787 breakpoint
426 located x p_hsExpr
788 located x p_hsExpr
427− HsCoreAnn NoExt _ value x -> do
789+ HsCoreAnn NoExtField _ value x -> do
428 txt "{-# CORE "
790 txt "{-# CORE "
429 atom value
791 atom value
430 txt " #-}"
792 txt " #-}"
431 breakpoint
793 breakpoint
432 located x p_hsExpr
794 located x p_hsExpr
433− HsBracket NoExt x -> p_hsBracket x
795+ HsBracket NoExtField x -> p_hsBracket x
434 HsRnBracketOut {} -> notImplemented "HsRnBracketOut"
796 HsRnBracketOut {} -> notImplemented "HsRnBracketOut"
435 HsTcBracketOut {} -> notImplemented "HsTcBracketOut"
797 HsTcBracketOut {} -> notImplemented "HsTcBracketOut"
436− HsSpliceE NoExt splice -> p_hsSplice splice
798+ HsSpliceE NoExtField splice -> p_hsSplice splice
437− HsProc {} -> notImplemented "HsProc"
799+ HsProc NoExtField p e -> do
801+ located p $ \x -> do
806+ placeHanging (cmdTopPlacement (unLoc e)) $
807+ located e p_hsCmdTop
438− HsStatic _ e -> do
808+ HsStatic _ e -> do
439 txt "static"
809 txt "static"
440 breakpoint
810 breakpoint
441 inci (located e p_hsExpr)
811 inci (located e p_hsExpr)
442− HsArrApp {} -> notImplemented "HsArrApp"
443− HsArrForm {} -> notImplemented "HsArrForm"
444 HsTick {} -> notImplemented "HsTick"
812 HsTick {} -> notImplemented "HsTick"
445 HsBinTick {} -> notImplemented "HsBinTick"
813 HsBinTick {} -> notImplemented "HsBinTick"
446 HsTickPragma {} -> notImplemented "HsTickPragma"
814 HsTickPragma {} -> notImplemented "HsTickPragma"
447− EWildPat NoExt -> txt "_"
448− EAsPat {} -> notImplemented "EAsPat"
449− EViewPat {} -> notImplemented "EViewPat"
450− ELazyPat {} -> notImplemented "ELazyPat"
451 HsWrap {} -> notImplemented "HsWrap"
815 HsWrap {} -> notImplemented "HsWrap"
452− XExpr {} -> notImplemented "XExpr"
816+ XExpr x -> noExtCon x
454p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
818p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
455p_patSynBind PSB {..} = do
819p_patSynBind PSB {..} = do
456− txt "pattern "
820+ let rhs = do
457− case psb_dir of
822+ case psb_dir of
458− Unidirectional -> do
823+ Unidirectional -> do
459− p_rdrName psb_id
824+ txt "<-"
826+ located psb_def p_pat
827+ ImplicitBidirectional -> do
830+ located psb_def p_pat
831+ ExplicitBidirectional mgroup -> do
834+ located psb_def p_pat
838+ inci (p_matchGroup (Function psb_id) mgroup)
461− p_patSynDetails psb_args
464− inci (located psb_def p_pat)
465− ImplicitBidirectional -> do
466 p_rdrName psb_id
843 p_rdrName psb_id
845+ switchLayout (getLoc <$> xs) $ do
846+ unless (null xs) breakpoint
847+ sitcc (sep breakpoint p_rdrName xs)
468− p_patSynDetails psb_args
471− located psb_def p_pat
472− ExplicitBidirectional mgroup -> do
473 p_rdrName psb_id
851 p_rdrName psb_id
475− p_patSynDetails psb_args
478− inci (located psb_def p_pat)
480 inci $ do
852 inci $ do
481− line (txt "where")
853+ switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
482− inci (p_matchGroup (Function psb_id) mgroup)
854+ unless (null xs) breakpoint
856+ sep commaDel (p_rdrName . recordPatSynPatVar) xs
859+ switchLayout [getLoc l, getLoc r] $ do
483−p_patSynBind (XPatSynBind NoExt) = notImplemented "XPatSynBind"
868+p_patSynBind (XPatSynBind x) = noExtCon x
485−p_patSynDetails :: HsPatSynDetails (Located RdrName) -> R ()
870+p_case ::
486−p_patSynDetails = \case
871+ Data body =>
487− PrefixCon xs ->
872+ -- | Placer
488− velt' (p_rdrName <$> xs)
873+ (body -> Placement) ->
489− RecCon xs ->
874+ -- | Render
490− velt' (p_rdrName . recordPatSynPatVar <$> xs)
875+ (body -> R ()) ->
491− InfixCon _ _ -> notImplemented "InfixCon"
876+ -- | Expression
879+ MatchGroup GhcPs (Located body) ->
881+p_case placer render e mgroup = do
888+ inci (p_matchGroup' placer render Case mgroup)
893+ (body -> Placement) ->
903+p_if placer render if' then' else' = do
906+ located if' p_hsExpr
911+ located then' $ \x ->
912+ placeHanging (placer x) (render x)
916+ located else' $ \x ->
917+ placeHanging (placer x) (render x)
923+ Located (HsLocalBindsLR GhcPs GhcPs) ->
926+p_let render localBinds e = sitcc $ do
929+ dontUseBraces $ sitcc (located localBinds p_hsLocalBinds)
930+ vlayout space (newline >> txt " ")
933+ sitcc (located e render)
493p_pat :: Pat GhcPs -> R ()
935p_pat :: Pat GhcPs -> R ()
494p_pat = \case
936p_pat = \case
495− WildPat NoExt -> txt "_"
937+ WildPat NoExtField -> txt "_"
496− VarPat NoExt name -> p_rdrName name
938+ VarPat NoExtField name -> p_rdrName name
497− LazyPat NoExt pat -> do
939+ LazyPat NoExtField pat -> do
499 located pat p_pat
941 located pat p_pat
500− AsPat NoExt name pat -> do
942+ AsPat NoExtField name pat -> do
501 p_rdrName name
943 p_rdrName name
503 located pat p_pat
945 located pat p_pat
504− ParPat NoExt pat ->
946+ ParPat NoExtField pat ->
505− located pat (parens . p_pat)
947+ located pat (parens S . p_pat)
506− BangPat NoExt pat -> do
948+ BangPat NoExtField pat -> do
508 located pat p_pat
950 located pat p_pat
509− ListPat NoExt pats -> do
951+ ListPat NoExtField pats ->
510− brackets $ velt (withSep comma (located' p_pat) pats)
952+ brackets S $ sep commaDel (located' p_pat) pats
511− TuplePat NoExt pats boxing -> do
953+ TuplePat NoExtField pats boxing -> do
512− let f =
954+ let parens' =
513 case boxing of
955 case boxing of
514− Boxed -> parens
956+ Boxed -> parens S
515− Unboxed -> parensHash
957+ Unboxed -> parensHash S
516− f $ velt (withSep comma (located' p_pat) pats)
958+ parens' $ sep commaDel (sitcc . located' p_pat) pats
517− SumPat NoExt pat _ _ -> do
959+ SumPat NoExtField pat tag arity ->
518− -- XXX I'm not sure about this one.
519− located pat p_pat
960+ p_unboxedSum S tag arity (located pat p_pat)
520 ConPatIn pat details ->
961 ConPatIn pat details ->
521 case details of
962 case details of
522 PrefixCon xs -> sitcc $ do
963 PrefixCon xs -> sitcc $ do
523 p_rdrName pat
964 p_rdrName pat
524 unless (null xs) $ do
965 unless (null xs) $ do
525 breakpoint
966 breakpoint
526− inci $ velt' (located' p_pat <$> xs)
967+ inci . sitcc $ sep breakpoint (sitcc . located' p_pat) xs
527 RecCon (HsRecFields fields dotdot) -> do
968 RecCon (HsRecFields fields dotdot) -> do
528 p_rdrName pat
969 p_rdrName pat
529 breakpoint
970 breakpoint
530 let f = \case
971 let f = \case
531 Nothing -> txt ".."
972 Nothing -> txt ".."
532 Just x -> located x p_pat_hsRecField
973 Just x -> located x p_pat_hsRecField
974+ inci . braces N . sep commaDel f $
533− inci . braces . velt . withSep comma f $ case dotdot of
975+ case dotdot of
534− Nothing -> Just <$> fields
976+ Nothing -> Just <$> fields
535− Just n -> (Just <$> take n fields) ++ [Nothing]
977+ Just (L _ n) -> (Just <$> take n fields) ++ [Nothing]
536− InfixCon x y -> do
978+ InfixCon l r -> do
979+ switchLayout [getLoc l, getLoc r] $ do
537− located x p_pat
980+ located l p_pat
538− space
981+ breakpoint
539− p_rdrName pat
983+ p_rdrName pat
540− breakpoint
984+ space
541− inci (located y p_pat)
985+ located r p_pat
542− ConPatOut {} -> notImplemented "ConPatOut"
986+ ConPatOut {} -> notImplemented "ConPatOut" -- presumably created by renamer?
543− ViewPat NoExt expr pat -> sitcc $ do
987+ ViewPat NoExtField expr pat -> sitcc $ do
544 located expr p_hsExpr
988 located expr p_hsExpr
545− txt " ->"
990+ txt "->"
546 breakpoint
991 breakpoint
547 inci (located pat p_pat)
992 inci (located pat p_pat)
548− SplicePat NoExt splice -> p_hsSplice splice
993+ SplicePat NoExtField splice -> p_hsSplice splice
549− LitPat NoExt p -> atom p
994+ LitPat NoExtField p -> atom p
550− NPat NoExt v _ _ -> located v (atom . ol_val)
995+ NPat NoExtField v _ _ -> located v (atom . ol_val)
551− NPlusKPat NoExt n k _ _ _ -> sitcc $ do
996+ NPlusKPat NoExtField n k _ _ _ -> sitcc $ do
552 p_rdrName n
997 p_rdrName n
553 breakpoint
998 breakpoint
554 inci $ do
999 inci $ do
555− txt "+ "
1000+ txt "+"
556 located k (atom . ol_val)
1002 located k (atom . ol_val)
557− SigPat hswc pat -> do
1003+ SigPat NoExtField pat hswc -> do
558 located pat p_pat
1004 located pat p_pat
559 p_typeAscription hswc
1005 p_typeAscription hswc
560− CoPat {} -> notImplemented "CoPat"
1006+ CoPat {} -> notImplemented "CoPat" -- apparently created at some later stage
561− XPat NoExt -> notImplemented "XPat"
1007+ XPat x -> noExtCon x
563p_pat_hsRecField :: HsRecField' (FieldOcc GhcPs) (LPat GhcPs) -> R ()
1009p_pat_hsRecField :: HsRecField' (FieldOcc GhcPs) (LPat GhcPs) -> R ()
564p_pat_hsRecField HsRecField {..} = do
1010p_pat_hsRecField HsRecField {..} = do
565 located hsRecFieldLbl $ \x ->
1011 located hsRecFieldLbl $ \x ->
566 p_rdrName (rdrNameFieldOcc x)
1012 p_rdrName (rdrNameFieldOcc x)
567 unless hsRecPun $ do
1013 unless hsRecPun $ do
569 breakpoint
1016 breakpoint
570 inci (located hsRecFieldArg p_pat)
1017 inci (located hsRecFieldArg p_pat)
1019+p_unboxedSum :: BracketStyle -> ConTag -> Arity -> R () -> R ()
1020+p_unboxedSum s tag arity m = do
1021+ let before = tag - 1
1022+ after = arity - before - 1
1023+ args = replicate before Nothing <> [Just m] <> replicate after Nothing
1025+ case x :: Maybe (R ()) of
1032+ parensHash s $ sep (txt "|") f args
572p_hsSplice :: HsSplice GhcPs -> R ()
1034p_hsSplice :: HsSplice GhcPs -> R ()
573p_hsSplice = \case
1035p_hsSplice = \case
574− HsTypedSplice NoExt deco _ expr -> p_hsSpliceTH True expr deco
1036+ HsTypedSplice NoExtField deco _ expr -> p_hsSpliceTH True expr deco
575− HsUntypedSplice NoExt deco _ expr -> p_hsSpliceTH False expr deco
1037+ HsUntypedSplice NoExtField deco _ expr -> p_hsSpliceTH False expr deco
576− HsQuasiQuote NoExt _ quoterName srcSpan str -> do
1038+ HsQuasiQuote NoExtField _ quoterName srcSpan str -> do
578 p_rdrName (L srcSpan quoterName)
1040 p_rdrName (L srcSpan quoterName)
580− -- NOTE QuasiQuoters often rely on precise custom strings. We cannot do
1042+ -- QuasiQuoters often rely on precise custom strings. We cannot do any
581− -- any formatting here without potentially breaking someone's code.
1043+ -- formatting here without potentially breaking someone's code.
582 atom str
1044 atom str
583 txt "|]"
1045 txt "|]"
584 HsSpliced {} -> notImplemented "HsSpliced"
1046 HsSpliced {} -> notImplemented "HsSpliced"
585− XSplice {} -> notImplemented "XSplice"
1047+ HsSplicedT {} -> notImplemented "HsSplicedT"
1048+ XSplice x -> noExtCon x
587−p_hsSpliceTH
1050+p_hsSpliceTH ::
588− :: Bool -- ^ Typed splice?
1051+ -- | Typed splice?
1053+ -- | Splice expression
589− -> LHsExpr GhcPs -- ^ Splice expression
1054+ LHsExpr GhcPs ->
1055+ -- | Splice decoration
590− -> SpliceDecoration -- ^ Splice decoration
1056+ SpliceDecoration ->
592p_hsSpliceTH isTyped expr = \case
1058p_hsSpliceTH isTyped expr = \case
593 HasParens -> do
1059 HasParens -> do
594 txt decoSymbol
1060 txt decoSymbol
595− parens (located expr (sitcc . p_hsExpr))
1061+ parens N (located expr (sitcc . p_hsExpr))
596 HasDollar -> do
1062 HasDollar -> do
597 txt decoSymbol
1063 txt decoSymbol
598 located expr (sitcc . p_hsExpr)
1064 located expr (sitcc . p_hsExpr)
599− NoParens -> do
1065+ NoParens ->
600 located expr (sitcc . p_hsExpr)
1066 located expr (sitcc . p_hsExpr)
602 decoSymbol = if isTyped then "$$" else "$"
1068 decoSymbol = if isTyped then "$$" else "$"
604p_hsBracket :: HsBracket GhcPs -> R ()
1070p_hsBracket :: HsBracket GhcPs -> R ()
605p_hsBracket = \case
1071p_hsBracket = \case
1072+ ExpBr NoExtField expr -> do
1073+ anns <- getEnclosingAnns
1074+ let name = case anns of
1075+ AnnOpenEQ : _ -> ""
606− ExpBr NoExt expr -> quote "e" (located expr p_hsExpr)
1077+ quote name (located expr p_hsExpr)
607− PatBr NoExt pat -> quote "p" (located pat p_pat)
1078+ PatBr NoExtField pat -> located pat (quote "p" . p_pat)
608− DecBrL NoExt decls -> quote "d" (p_hsDecls decls)
1079+ DecBrL NoExtField decls -> quote "d" (p_hsDecls Free decls)
609− DecBrG NoExt _ -> notImplemented "DecBrG" -- result of renamer
1080+ DecBrG NoExtField _ -> notImplemented "DecBrG" -- result of renamer
610− TypBr NoExt ty -> quote "t" (located ty p_hsType)
1081+ TypBr NoExtField ty -> quote "t" (located ty p_hsType)
611− VarBr NoExt _ _ -> notImplemented "VarBr"
1082+ VarBr NoExtField isSingleQuote name -> do
1083+ txt (bool "''" "'" isSingleQuote)
1084+ -- 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
1086+ -- is that 'VarBr' doesn't provide us with location of the name. This in
1087+ -- turn makes it impossible to detect if there are parentheses around
1088+ -- it, etc. So we have to add parentheses manually assuming they are
1089+ -- necessary for all operators.
1092+ (\i -> isPunctuation i || isSymbol i)
1093+ (showOutputable (rdrNameOcc name))
1094+ && not (doesNotNeedExtraParens name)
1095+ wrapper = if isOperator then parens N else id
1096+ wrapper $ p_rdrName (noLoc name)
612− TExpBr NoExt expr -> do
1097+ TExpBr NoExtField expr -> do
613 txt "[||"
1098 txt "[||"
614 breakpoint'
1099 breakpoint'
615 located expr p_hsExpr
1100 located expr p_hsExpr
616 breakpoint'
1101 breakpoint'
617 txt "||]"
1102 txt "||]"
618− XBracket {} -> notImplemented "XBracket"
1103+ XBracket x -> noExtCon x
620 quote :: Text -> R () -> R ()
1105 quote :: Text -> R () -> R ()
621 quote name body = do
1106 quote name body = do
@@ -623,23 +1108,86 @@ p_hsBracket = \case
623 txt name
1108 txt name
625 breakpoint'
1110 breakpoint'
627− breakpoint'
1113+ breakpoint'
628− txt "|]"
1114+ txt "|]"
1116+-- Print the source text of a string literal while indenting
1119+p_stringLit :: String -> R ()
1121+ let s = splitGaps src
1123+ txt $ Text.pack (mconcat s)
1125+ sitcc $ sep breakpoint (txt . Text.pack) (backslashes s)
1126+ in vlayout singleLine multiLine
1128+ -- Split a string on gaps (backslash delimited whitespaces)
1130+ -- > splitGaps "bar\\ \\fo\\&o" == ["bar", "fo\\&o"]
1131+ splitGaps :: String -> [String]
1134+ let -- A backslash and a whitespace starts a "gap"
1135+ p (Just '\\', _, _) = True
1136+ p (_, '\\', Just c) | ghcSpace c = False
1138+ in case span p (zipPrevNext s) of
1140+ let -- drop the initial '\', any amount of 'ghcSpace', and another '\'
1141+ r' = drop 1 . dropWhile ghcSpace . drop 1 $ map orig r
1142+ in map orig l : splitGaps r'
1143+ -- GHC's definition of whitespaces in strings
1144+ -- See: https://gitlab.haskell.org/ghc/ghc/blob/86753475/compiler/parser/Lexer.x#L1653
1145+ ghcSpace :: Char -> Bool
1146+ ghcSpace c = c <= '\x7f' && is_space c
1147+ -- Add backslashes to the inner side of the strings
1149+ -- > backslashes ["a", "b", "c"] == ["a\\", "\\b\\", "\\c"]
1150+ backslashes :: [String] -> [String]
1151+ backslashes (x : y : xs) = (x ++ "\\") : backslashes (('\\' : y) : xs)
1152+ backslashes xs = xs
1153+ -- Attaches previous and next items to each list element
1154+ zipPrevNext :: [a] -> [(Maybe a, a, Maybe a)]
1158+ (zip (Nothing : map Just xs) xs)
1159+ (map Just (tail xs) ++ repeat Nothing)
1160+ in map (\((p, x), n) -> (p, x, n)) z
630----------------------------------------------------------------------------
1163----------------------------------------------------------------------------
631-- Helpers
1164-- Helpers
1166+-- | Return the wrapping function controlling the use of braces according to
1167+-- the current layout.
1168+layoutToBraces :: Layout -> R () -> R ()
1169+layoutToBraces = \case
1170+ SingleLine -> useBraces
1173+-- | Append each element in both lists with semigroups. If one list is shorter
1174+-- than the other, return the rest of the longer list unchanged.
1175+liftAppend :: Semigroup a => [a] -> [a] -> [a]
1176+liftAppend [] [] = []
1177+liftAppend [] (y : ys) = y : ys
1178+liftAppend (x : xs) [] = x : xs
1179+liftAppend (x : xs) (y : ys) = x <> y : liftAppend xs ys
633−getGRHSSpan :: GRHS GhcPs (LHsExpr GhcPs) -> SrcSpan
1181+getGRHSSpan :: GRHS GhcPs (Located body) -> SrcSpan
634−getGRHSSpan (GRHS NoExt _ body) = getLoc body
1182+getGRHSSpan (GRHS NoExtField guards body) =
1183+ combineSrcSpans' $ getLoc body :| map getLoc guards
635−getGRHSSpan (XGRHS NoExt) = notImplemented "XGRHS"
1184+getGRHSSpan (XGRHS x) = noExtCon x
637-- | Place a thing that may have a hanging form. This function handles how
1186-- | Place a thing that may have a hanging form. This function handles how
638-- to separate it from preceding expressions and whether to bump indentation
1187-- to separate it from preceding expressions and whether to bump indentation
639-- depending on what sort of expression we have.
1188-- depending on what sort of expression we have.
641placeHanging :: Placement -> R () -> R ()
1189placeHanging :: Placement -> R () -> R ()
642−placeHanging placement m = do
1190+placeHanging placement m =
643 case placement of
1191 case placement of
644 Hanging -> do
1192 Hanging -> do
@@ -650,26 +1198,165 @@ placeHanging placement m = do
651-- | Check if given block contains single expression which has a hanging
1199-- | Check if given block contains single expression which has a hanging
1202+ (body -> Placement) ->
1203+ [LGRHS GhcPs (Located body)] ->
1205+blockPlacement placer [L _ (GRHS NoExtField _ (L _ x))] = placer x
1206+blockPlacement _ _ = Normal
654−blockPlacement :: [LGRHS GhcPs (LHsExpr GhcPs)] -> Placement
1208+-- | Check if given command has a hanging form.
655−blockPlacement [(L _ (GRHS NoExt _ (L _ e)))] = exprPlacement e
1209+cmdPlacement :: HsCmd GhcPs -> Placement
1210+cmdPlacement = \case
1211+ HsCmdLam NoExtField _ -> Hanging
1212+ HsCmdCase NoExtField _ _ -> Hanging
1213+ HsCmdDo NoExtField _ -> Hanging
656−blockPlacement _ = Normal
1214+ _ -> Normal
658−-- | Check if given expression has hinging a form.
1216+cmdTopPlacement :: HsCmdTop GhcPs -> Placement
1217+cmdTopPlacement = \case
1218+ HsCmdTop NoExtField (L _ x) -> cmdPlacement x
1219+ XCmdTop x -> noExtCon x
1221+-- | Check if given expression has a hanging form.
660exprPlacement :: HsExpr GhcPs -> Placement
1222exprPlacement :: HsExpr GhcPs -> Placement
661exprPlacement = \case
1223exprPlacement = \case
1224+ -- Only hang lambdas with single line parameter lists
1225+ HsLam NoExtField mg -> case mg of
1226+ MG _ (L _ [L _ (Match NoExtField _ (x : xs) _)]) _
1227+ | isOneLineSpan (combineSrcSpans' $ fmap getLoc (x :| xs)) ->
662− HsLam NoExt _ -> Hanging
1228+ Hanging
663− HsLamCase NoExt _ -> Hanging
1230+ HsLamCase NoExtField _ -> Hanging
664− HsCase NoExt _ _ -> Hanging
1231+ HsCase NoExtField _ _ -> Hanging
665− HsDo NoExt DoExpr _ -> Hanging
1232+ HsDo NoExtField DoExpr _ -> Hanging
666− HsDo NoExt MDoExpr _ -> Hanging
1233+ HsDo NoExtField MDoExpr _ -> Hanging
1234+ OpApp NoExtField _ op y ->
1235+ case (fmap getOpNameStr . getOpName . unLoc) op of
1236+ Just "$" -> exprPlacement (unLoc y)
1238+ HsApp NoExtField _ y -> exprPlacement (unLoc y)
1239+ HsProc NoExtField p _ ->
1240+ -- Indentation breaks if pattern is longer than one line and left
1241+ -- hanging. Consequently, only apply hanging when it is safe.
1242+ if isOneLineSpan (getLoc p)
667− RecordCon NoExt _ _ -> Hanging
1243+ then Hanging
668 _ -> Normal
1245 _ -> Normal
670−withGuards :: [LGRHS GhcPs (LHsExpr GhcPs)] -> Bool
1247+withGuards :: [LGRHS GhcPs (Located body)] -> Bool
671withGuards = any (checkOne . unLoc)
1248withGuards = any (checkOne . unLoc)
673− checkOne :: GRHS GhcPs (LHsExpr GhcPs) -> Bool
1250+ checkOne :: GRHS GhcPs (Located body) -> Bool
674− checkOne (GRHS NoExt [] _) = False
1251+ checkOne (GRHS NoExtField [] _) = False
675 checkOne _ = True
1252 checkOne _ = True
1254+exprOpTree :: LHsExpr GhcPs -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs)
1255+exprOpTree (L _ (OpApp NoExtField x op y)) = OpBranch (exprOpTree x) op (exprOpTree y)
1256+exprOpTree n = OpNode n
1258+getOpName :: HsExpr GhcPs -> Maybe RdrName
1260+ HsVar NoExtField (L _ a) -> Just a
1263+getOpNameStr :: RdrName -> String
1264+getOpNameStr = occNameString . rdrNameOcc
1267+ -- | Bracket style to use
1269+ OpTree (LHsExpr GhcPs) (LHsExpr GhcPs) ->
1271+p_exprOpTree s (OpNode x) = located x (p_hsExpr' s)
1272+p_exprOpTree s (OpBranch x op y) = do
1273+ -- If the beginning of the first argument and the second argument are on
1274+ -- the same line, and the second argument has a hanging form, use hanging
1278+ (mkSrcSpan (srcSpanStart (opTreeLoc x)) (srcSpanStart (opTreeLoc y)))
1280+ OpNode (L _ n) -> exprPlacement n
1283+ -- Distinguish holes used in infix notation.
1284+ -- eg. '1 _foo 2' and '1 `_foo` 2'
1285+ opWrapper = case unLoc op of
1286+ HsUnboundVar NoExtField _ -> backticks
1288+ layout <- getLayout
1289+ let ub = case layout of
1290+ SingleLine -> useBraces
1291+ MultiLine -> case placement of
1292+ Hanging -> useBraces
1293+ Normal -> dontUseBraces
1294+ opNameStr = (fmap getOpNameStr . getOpName . unLoc) op
1295+ gotDollar = opNameStr == Just "$"
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
1308+ OpNode (L _ HsDo {}) -> True
1310+ useRecordDot' <- useRecordDot
1322+ inciIf (isDoBlock y) p_y
1324+ && isOneLineSpan (opTreeLoc x)
1325+ && placement == Normal -> do
1331+ | useRecordDot' && gotRecordDot -> do
1333+ when isSection space
1338+ 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.
1357+getEnclosingAnns :: R [AnnKeywordId]
1358+getEnclosingAnns = do
1359+ e <- getEnclosingSpan (const True)
1361+ Nothing -> return []
1362+ Just e' -> getAnns (RealSrcSpan e')