@@ -1,15 +1,13 @@
1−{-# LANGUAGE LambdaCase #-}
2−{-# LANGUAGE MultiWayIf #-}
1+{-# LANGUAGE LambdaCase #-}
32{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE RecordWildCards #-}
5−{-# LANGUAGE TypeApplications #-}
3+{-# LANGUAGE RecordWildCards #-}
64
75module Ormolu.Printer.Meat.Declaration.Value
8− ( p_valDecl,
9− p_pat,
10− p_hsExpr,
11− p_hsSplice,
12− p_stringLit,
6+ ( p_valDecl
7+ , p_pat
8+ , p_hsExpr
9+ , p_hsSplice
10+ , p_stringLit
1311 )
1412where
1513
@@ -20,24 +18,24 @@ import Ctype (is_space)
2018import Data.Bool (bool)
2119import Data.Char (isPunctuation, isSymbol)
2220import Data.Data hiding (Infix, Prefix)
23−import Data.Functor ((<&>))
2421import Data.List (intersperse, sortOn)
25−import Data.List.NonEmpty (NonEmpty (..), (<|))
26−import qualified Data.List.NonEmpty as NE
22+import Data.List.NonEmpty (NonEmpty ((:|)))
2723import Data.Text (Text)
2824import qualified Data.Text as Text
2925import GHC
30−import OccName (occNameString)
3126import Ormolu.Printer.Combinators
32−import Ormolu.Printer.Internal
3327import Ormolu.Printer.Meat.Common
34−import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
3528import Ormolu.Printer.Meat.Declaration.Signature
3629import Ormolu.Printer.Meat.Type
3730import Ormolu.Printer.Operators
3831import Ormolu.Utils
32+import RdrName (rdrNameOcc)
33+import SrcLoc (combineSrcSpans, isOneLineSpan)
34+import qualified Data.List.NonEmpty as NE
35+import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
3936
4037-- | Style of a group of equations.
38+
4139data MatchGroupStyle
4240 = Function (Located RdrName)
4341 | PatternBind
@@ -46,61 +44,57 @@ data MatchGroupStyle
4644 | LambdaCase
4745
4846-- | Style of equations in a group.
47+
4948data GroupStyle
5049 = EqualSign
5150 | RightArrow
5251
5352-- | Expression placement. This marks the places where expressions that
5453-- implement handing forms may use them.
54+
5555data Placement
56− = -- | Multi-line layout should cause
57− -- insertion of a newline and indentation
58− -- bump
59− Normal
60− | -- | Expressions that have hanging form
61− -- should use it and avoid bumping one level
62− -- of indentation
63− Hanging
64− deriving (Eq, Show)
56+ = Normal -- ^ Multi-line layout should cause
57+ -- insertion of a newline and indentation
58+ -- bump
59+ | Hanging -- ^ Expressions that have hanging form
60+ -- should use it and avoid bumping one level
61+ -- of indentation
62+ deriving (Eq)
6563
6664p_valDecl :: HsBindLR GhcPs GhcPs -> R ()
6765p_valDecl = \case
68− FunBind NoExtField funId funMatches _ _ -> p_funBind funId funMatches
69− PatBind NoExtField pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
66+ FunBind NoExt funId funMatches _ _ -> p_funBind funId funMatches
67+ PatBind NoExt pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
7068 VarBind {} -> notImplemented "VarBinds" -- introduced by the type checker
7169 AbsBinds {} -> notImplemented "AbsBinds" -- introduced by the type checker
72− PatSynBind NoExtField psb -> p_patSynBind psb
73− XHsBindsLR x -> noExtCon x
70+ PatSynBind NoExt psb -> p_patSynBind psb
71+ XHsBindsLR NoExt -> notImplemented "XHsBindsLR"
7472
75−p_funBind ::
76− Located RdrName ->
77− MatchGroup GhcPs (LHsExpr GhcPs) ->
78− R ()
73+p_funBind
74+ :: Located RdrName
75+ -> MatchGroup GhcPs (LHsExpr GhcPs)
76+ -> R ()
7977p_funBind name = p_matchGroup (Function name)
8078
81−p_matchGroup ::
82− MatchGroupStyle ->
83− MatchGroup GhcPs (LHsExpr GhcPs) ->
84− R ()
79+p_matchGroup
80+ :: MatchGroupStyle
81+ -> MatchGroup GhcPs (LHsExpr GhcPs)
82+ -> R ()
8583p_matchGroup = p_matchGroup' exprPlacement p_hsExpr
8684
87−p_matchGroup' ::
88− Data body =>
89− -- | How to get body placement
90− (body -> Placement) ->
91− -- | How to print body
92− (body -> R ()) ->
93− -- | Style of this group of equations
94− MatchGroupStyle ->
95− -- | Match group
96− MatchGroup GhcPs (Located body) ->
97− R ()
98−p_matchGroup' placer render style MG {..} = do
85+p_matchGroup'
86+ :: Data body
87+ => (body -> Placement) -- ^ How to get body placement
88+ -> (body -> R ()) -- ^ How to print body
89+ -> MatchGroupStyle -- ^ Style of this group of equations
90+ -> MatchGroup GhcPs (Located body) -- ^ Match group
91+ -> R ()
92+p_matchGroup' placer pretty style MG {..} = do
9993 let ob = case style of
10094 Case -> id
10195 LambdaCase -> id
10296 _ -> dontUseBraces
103− -- Since we are forcing braces on 'sepSemi' based on 'ob', we have to
97+ -- NOTE since we are forcing braces on 'sepSemi' based on 'ob', we have to
10498 -- restore the brace state inside the sepsemi.
10599 ub <- bool dontUseBraces useBraces <$> canUseBraces
106100 ob $ sepSemi (located' (ub . p_Match)) (unLoc mg_alts)
@@ -108,14 +102,14 @@ p_matchGroup' placer render style MG {..} = do
108102 p_Match m@Match {..} =
109103 p_match'
110104 placer
111− render
105+ pretty
112106 (adjustMatchGroupStyle m style)
113107 (isInfixMatch m)
114108 (matchStrictness m)
115109 m_pats
116110 m_grhss
117− p_Match (XMatch x) = noExtCon x
118−p_matchGroup' _ _ _ (XMatchGroup x) = noExtCon x
111+ p_Match _ = notImplemented "XMatch"
112+p_matchGroup' _ _ _ (XMatchGroup NoExt) = notImplemented "XMatchGroup"
119113
120114-- | Function id obtained through pattern matching on 'FunBind' should not
121115-- be used to print the actual equations because the different ‘RdrNames’
@@ -123,10 +117,11 @@ p_matchGroup' _ _ _ (XMatchGroup x) = noExtCon x
123117-- and paretheses) associated with them. It is necessary to use per-equation
124118-- names obtained from 'm_ctxt' of 'Match'. This function replaces function
125119-- name inside of 'Function' accordingly.
126−adjustMatchGroupStyle ::
127− Match GhcPs body ->
128− MatchGroupStyle ->
129− MatchGroupStyle
120+
121+adjustMatchGroupStyle
122+ :: Match GhcPs body
123+ -> MatchGroupStyle
124+ -> MatchGroupStyle
130125adjustMatchGroupStyle m = \case
131126 Function _ -> (Function . mc_fun . m_ctxt) m
132127 style -> style
@@ -134,43 +129,31 @@ adjustMatchGroupStyle m = \case
134129matchStrictness :: Match id body -> SrcStrictness
135130matchStrictness match =
136131 case m_ctxt match of
137− FunRhs {mc_strictness = s} -> s
132+ FunRhs{mc_strictness=s} -> s
138133 _ -> NoSrcStrict
139134
140−p_match ::
141− -- | Style of the group
142− MatchGroupStyle ->
143− -- | Is this an infix match?
144− Bool ->
145− -- | Strictness prefix (FunBind)
146− SrcStrictness ->
147− -- | Argument patterns
148− [LPat GhcPs] ->
149− -- | Equations
150− GRHSs GhcPs (LHsExpr GhcPs) ->
151− R ()
135+p_match
136+ :: MatchGroupStyle -- ^ Style of the group
137+ -> Bool -- ^ Is this an infix match?
138+ -> SrcStrictness -- ^ Strictness prefix (FunBind)
139+ -> [LPat GhcPs] -- ^ Argument patterns
140+ -> GRHSs GhcPs (LHsExpr GhcPs) -- ^ Equations
141+ -> R ()
152142p_match = p_match' exprPlacement p_hsExpr
153143
154−p_match' ::
155− Data body =>
156− -- | How to get body placement
157− (body -> Placement) ->
158− -- | How to print body
159− (body -> R ()) ->
160− -- | Style of this group of equations
161− MatchGroupStyle ->
162− -- | Is this an infix match?
163− Bool ->
164− -- | Strictness prefix (FunBind)
165− SrcStrictness ->
166− -- | Argument patterns
167− [LPat GhcPs] ->
168− -- | Equations
169− GRHSs GhcPs (Located body) ->
170− R ()
171−p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
172− -- Normally, since patterns may be placed in a multi-line layout, it is
173− -- necessary to bump indentation for the pattern group so it's more
144+p_match'
145+ :: Data body
146+ => (body -> Placement) -- ^ How to get body placement
147+ -> (body -> R ()) -- ^ How to print body
148+ -> MatchGroupStyle -- ^ Style of this group of equations
149+ -> Bool -- ^ Is this an infix match?
150+ -> SrcStrictness -- ^ Strictness prefix (FunBind)
151+ -> [LPat GhcPs] -- ^ Argument patterns
152+ -> GRHSs GhcPs (Located body) -- ^ Equations
153+ -> R ()
154+p_match' placer pretty style isInfix strictness m_pats m_grhss = do
155+ -- NOTE Normally, since patterns may be placed in a multi-line layout, it
156+ -- is necessary to bump indentation for the pattern group so it's more
174157 -- indented than function name. This in turn means that indentation for
175158 -- the body should also be bumped. Normally this would mean that bodies
176159 -- would start with two indentation steps applied, which is ugly, so we
@@ -180,24 +163,23 @@ p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
180163 NoSrcStrict -> return ()
181164 SrcStrict -> txt "!"
182165 SrcLazy -> txt "~"
183− indentBody <- case NE.nonEmpty m_pats of
184− Nothing ->
185− False <$ case style of
186− Function name -> p_rdrName name
187− _ -> return ()
166+ inci' <- case NE.nonEmpty m_pats of
167+ Nothing -> id <$ case style of
168+ Function name -> p_rdrName name
169+ _ -> return ()
188170 Just ne_pats -> do
189− let combinedSpans = case style of
190− Function name -> combineSrcSpans (getLoc name) patSpans
191− _ -> patSpans
192− patSpans = combineSrcSpans' (getLoc <$> ne_pats)
193− indentBody = not (isOneLineSpan combinedSpans)
171+ let combinedSpans = combineSrcSpans' $
172+ getLoc <$> ne_pats
173+ inci' = if isOneLineSpan combinedSpans
174+ then id
175+ else inci
194176 switchLayout [combinedSpans] $ do
195177 let stdCase = sep breakpoint (located' p_pat) m_pats
196178 case style of
197179 Function name ->
198180 p_infixDefHelper
199181 isInfix
200− indentBody
182+ inci'
201183 (p_rdrName name)
202184 (located' p_pat <$> m_pats)
203185 PatternBind -> stdCase
@@ -212,40 +194,46 @@ p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
212194 when needsSpace space
213195 sitcc stdCase
214196 LambdaCase -> stdCase
215− return indentBody
216− let -- Calculate position of end of patterns. This is useful when we decide
217− -- about putting certain constructions in hanging positions.
218− endOfPats = case NE.nonEmpty m_pats of
219− Nothing -> case style of
220− Function name -> Just (getLoc name)
221− _ -> Nothing
222− Just pats -> (Just . getLoc . NE.last) pats
223− isCase = \case
224− Case -> True
225− LambdaCase -> True
226− _ -> False
197+ return inci'
198+ let
199+ -- Calculate position of end of patterns. This is useful when we decide
200+ -- about putting certain constructions in hanging positions.
201+ endOfPats = case NE.nonEmpty m_pats of
202+ Nothing -> case style of
203+ Function name -> (Just . srcSpanEnd . getLoc) name
204+ _ -> Nothing
205+ Just pats -> (Just . srcSpanEnd . getLoc . NE.last) pats
206+ isCase = \case
207+ Case -> True
208+ LambdaCase -> True
209+ _ -> False
210+ let GRHSs {..} = m_grhss
227211 hasGuards = withGuards grhssGRHSs
228− grhssSpan =
229− combineSrcSpans' $
230− getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
231− patGrhssSpan =
232− maybe
233− grhssSpan
234− (combineSrcSpans grhssSpan . srcLocSpan . srcSpanEnd)
235− endOfPats
212+ unless (length grhssGRHSs > 1) $ do
213+ case style of
214+ Function _ | hasGuards -> return ()
215+ Function _ -> space >> txt "="
216+ PatternBind -> space >> txt "="
217+ s | isCase s && hasGuards -> return ()
218+ _ -> space >> txt "->"
219+ let grhssSpan = combineSrcSpans' $
220+ getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
221+ patGrhssSpan = maybe grhssSpan
222+ (combineSrcSpans grhssSpan . srcLocSpan) endOfPats
236223 placement =
237224 case endOfPats of
238225 Nothing -> blockPlacement placer grhssGRHSs
239226 Just spn ->
240− if onTheSameLine spn grhssSpan
227+ if isOneLineSpan
228+ (mkSrcSpan spn (srcSpanStart grhssSpan))
241229 then blockPlacement placer grhssGRHSs
242230 else Normal
243231 p_body = do
244232 let groupStyle =
245233 if isCase style && hasGuards
246− then RightArrow
247− else EqualSign
248− sep newline (located' (p_grhs' placer render groupStyle)) grhssGRHSs
234+ then RightArrow
235+ else EqualSign
236+ sep newline (located' (p_grhs' placer pretty groupStyle)) grhssGRHSs
249237 p_where = do
250238 let whereIsEmpty = GHC.isEmptyLocalBindsPR (unLoc grhssLocalBinds)
251239 unless (GHC.eqEmptyLocalBinds (unLoc grhssLocalBinds)) $ do
@@ -253,211 +241,187 @@ p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
253241 txt "where"
254242 unless whereIsEmpty breakpoint
255243 inci $ located grhssLocalBinds p_hsLocalBinds
256− inciIf indentBody $ do
257− unless (length grhssGRHSs > 1) $
258− case style of
259− Function _ | hasGuards -> return ()
260− Function _ -> space >> inci equals
261− PatternBind -> space >> inci equals
262− s | isCase s && hasGuards -> return ()
263− _ -> space >> txt "->"
244+ inci' $ do
264245 switchLayout [patGrhssSpan] $
265246 placeHanging placement p_body
266247 inci p_where
267−p_match' _ _ _ _ _ _ (XGRHSs x) = noExtCon x
268248
269249p_grhs :: GroupStyle -> GRHS GhcPs (LHsExpr GhcPs) -> R ()
270250p_grhs = p_grhs' exprPlacement p_hsExpr
271251
272−p_grhs' ::
273− Data body =>
274− -- | How to get body placement
275− (body -> Placement) ->
276− -- | How to print body
277− (body -> R ()) ->
278− GroupStyle ->
279− GRHS GhcPs (Located body) ->
280− R ()
281−p_grhs' placer render style (GRHS NoExtField guards body) =
252+p_grhs'
253+ :: Data body
254+ => (body -> Placement) -- ^ How to get body placement
255+ -> (body -> R ()) -- ^ How to print body
256+ -> GroupStyle
257+ -> GRHS GhcPs (Located body)
258+ -> R ()
259+p_grhs' placer pretty style (GRHS NoExt guards body) =
282260 case guards of
283261 [] -> p_body
284262 xs -> do
285263 txt "|"
286264 space
287− sitcc (sep commaDel (sitcc . located' p_stmt) xs)
265+ sitcc (sep (comma >> breakpoint) (sitcc . located' p_stmt) xs)
288266 space
289− inci $ case style of
290− EqualSign -> equals
291− RightArrow -> txt "->"
267+ txt $ case style of
268+ EqualSign -> "="
269+ RightArrow -> "->"
292270 placeHanging placement p_body
293271 where
294272 placement =
295273 case endOfGuards of
296274 Nothing -> placer (unLoc body)
297275 Just spn ->
298− if onTheSameLine spn (getLoc body)
299− then placer (unLoc body)
300− else Normal
276+ if isOneLineSpan (mkSrcSpan spn (srcSpanStart (getLoc body)))
277+ then placer (unLoc body)
278+ else Normal
301279 endOfGuards =
302280 case NE.nonEmpty guards of
303281 Nothing -> Nothing
304− Just gs -> (Just . getLoc . NE.last) gs
305− p_body = located body render
306−p_grhs' _ _ _ (XGRHS x) = noExtCon x
282+ Just gs -> (Just . srcSpanEnd . getLoc . NE.last) gs
283+ p_body = located body pretty
284+p_grhs' _ _ _ (XGRHS NoExt) = notImplemented "XGRHS"
307285
308286p_hsCmd :: HsCmd GhcPs -> R ()
309287p_hsCmd = \case
310− HsCmdArrApp NoExtField body input arrType _ -> do
288+ HsCmdArrApp NoExt body input arrType _ -> do
311289 located body p_hsExpr
312− breakpoint
313− inci $ do
314− case arrType of
315− HsFirstOrderApp -> txt "-<"
316− HsHigherOrderApp -> txt "-<<"
317− placeHanging (exprPlacement (unLoc input)) $
318− located input p_hsExpr
319− HsCmdArrForm NoExtField form Prefix _ cmds -> banana $ do
290+ space
291+ case arrType of
292+ HsFirstOrderApp -> txt "-<"
293+ HsHigherOrderApp -> txt "-<<"
294+ placeHanging (exprPlacement (unLoc input)) $
295+ located input p_hsExpr
296+ HsCmdArrForm NoExt form Prefix _ cmds -> banana $ sitcc $ do
320297 located form p_hsExpr
321298 unless (null cmds) $ do
322299 breakpoint
323300 inci (sequence_ (intersperse breakpoint (located' p_hsCmdTop <$> cmds)))
324− HsCmdArrForm NoExtField form Infix _ [left, right] -> do
301+ HsCmdArrForm NoExt form Infix _ [left, right] -> do
325302 located left p_hsCmdTop
326303 space
327304 located form p_hsExpr
328305 placeHanging (cmdTopPlacement (unLoc right)) $
329306 located right p_hsCmdTop
330− HsCmdArrForm NoExtField _ Infix _ _ -> notImplemented "HsCmdArrForm"
307+ HsCmdArrForm NoExt _ Infix _ _ -> notImplemented "HsCmdArrForm"
331308 HsCmdApp {} ->
332309 -- XXX Does this ever occur in the syntax tree? It does not seem like it
333310 -- does. Open an issue and ping @yumiova if this ever occurs in output.
334311 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
312+ HsCmdLam NoExt mgroup -> p_matchGroup' cmdPlacement p_hsCmd Lambda mgroup
313+ HsCmdPar NoExt c -> parens N (located c p_hsCmd)
314+ HsCmdCase NoExt e mgroup -> do
315+ txt "case"
316+ space
317+ located e p_hsExpr
318+ space
319+ txt "of"
320+ breakpoint
321+ inci (p_matchGroup' cmdPlacement p_hsCmd Case mgroup)
322+ HsCmdIf NoExt _ if' then' else' -> do
323+ txt "if"
324+ space
325+ located if' p_hsExpr
326+ breakpoint
327+ txt "then"
328+ located then' $ \x -> do
329+ breakpoint
330+ inci (p_hsCmd x)
331+ breakpoint
332+ txt "else"
333+ located else' $ \x -> do
334+ breakpoint
335+ inci (p_hsCmd x)
336+ HsCmdLet NoExt localBinds c -> do
337+ txt "let"
338+ space
339+ sitcc (located localBinds p_hsLocalBinds)
340+ breakpoint
341+ vlayout space (newline >> txt " ")
342+ txt "in"
343+ space
344+ sitcc (located c p_hsCmd)
345+ HsCmdDo NoExt es -> do
344346 txt "do"
345347 newline
346− inci . located es $
347− sitcc . sep newline (sitcc . withSpacing (p_stmt' cmdPlacement p_hsCmd))
348+ inci (located es (sitcc . sep newline (located' (sitcc . p_stmt' p_hsCmd))))
348349 HsCmdWrap {} -> notImplemented "HsCmdWrap"
349− XCmd x -> noExtCon x
350+ XCmd {} -> notImplemented "XCmd"
350351
351352p_hsCmdTop :: HsCmdTop GhcPs -> R ()
352353p_hsCmdTop = \case
353− HsCmdTop NoExtField cmd -> located cmd p_hsCmd
354− XCmdTop x -> noExtCon x
355−
356−-- | Render an expression preserving blank lines between such consecutive
357−-- expressions found in the original source code.
358−withSpacing ::
359− -- | Rendering function
360− (a -> R ()) ->
361− -- | Entity to render
362− Located a ->
363− R ()
364−withSpacing f l = located l $ \x -> do
365− case getLoc l of
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
374− then newline
375− else return ()
376− _ -> return ()
377− f x
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)
354+ HsCmdTop NoExt cmd -> located cmd p_hsCmd
355+ XCmdTop {} -> notImplemented "XHsCmdTop"
384356
385357p_stmt :: Stmt GhcPs (LHsExpr GhcPs) -> R ()
386−p_stmt = p_stmt' exprPlacement p_hsExpr
358+p_stmt = p_stmt' p_hsExpr
387359
388−p_stmt' ::
389− Data body =>
390− -- | Placer
391− (body -> Placement) ->
392− -- | Render
393− (body -> R ()) ->
394− -- | Statement to render
395− Stmt GhcPs (Located body) ->
396− R ()
397−p_stmt' placer render = \case
398− LastStmt NoExtField body _ _ -> located body render
399− BindStmt NoExtField p f _ _ -> do
400− located p p_pat
360+p_stmt'
361+ :: Data body
362+ => (body -> R ())
363+ -> Stmt GhcPs (Located body)
364+ -> R ()
365+p_stmt' pretty = \case
366+ LastStmt NoExt body _ _ -> located body pretty
367+ BindStmt NoExt l f _ _ -> do
368+ located l p_pat
401369 space
402370 txt "<-"
403− let loc = getLoc p
404− placement =
405− case f of
406− L l' x ->
407− if isOneLineSpan
408− (mkSrcSpan (srcSpanEnd loc) (srcSpanStart l'))
409− then placer x
410− else Normal
411− switchLayout [loc, getLoc f] $
412− placeHanging placement (located f render)
371+ breakpoint
372+ inci (located f pretty)
413373 ApplicativeStmt {} -> notImplemented "ApplicativeStmt" -- generated by renamer
414− BodyStmt NoExtField body _ _ -> located body render
415− LetStmt NoExtField binds -> do
374+ BodyStmt NoExt body _ _ -> located body pretty
375+ LetStmt NoExt binds -> do
416376 txt "let"
417377 space
418378 sitcc $ located binds p_hsLocalBinds
419379 ParStmt {} ->
420− -- 'ParStmt' should always be eliminated in 'gatherStmt' already, such
421− -- that it never occurs in 'p_stmt''. Consequently, handling it here
422− -- would be redundant.
380+ -- NOTE 'ParStmt' should always be eliminated in 'gatherStmt' already,
381+ -- such that it never occurs in 'p_stmt''. Consequently, handling it
382+ -- here would be redundant.
423383 notImplemented "ParStmt"
424− TransStmt {..} ->
425− -- 'TransStmt' only needs to account for render printing itself, since
426− -- pretty printing of relevant statements (e.g., in 'trS_stmts') is
427− -- handled through 'gatherStmt'.
384+ TransStmt {..} -> do
385+ -- NOTE 'TransStmt' only needs to account for pretty printing itself,
386+ -- since pretty printing of relevant statements (e.g., in 'trS_stmts')
387+ -- is handled through 'gatherStmt'.
428388 case (trS_form, trS_by) of
429− (ThenForm, Nothing) -> do
389+ (ThenForm, Nothing) -> located trS_using $ \x -> do
430390 txt "then"
431391 breakpoint
432− inci $ located trS_using p_hsExpr
392+ inci (p_hsExpr x)
433393 (ThenForm, Just e) -> do
434− txt "then"
435− breakpoint
436− inci $ located trS_using p_hsExpr
437− breakpoint
438− txt "by"
394+ located trS_using $ \x -> do
395+ txt "then"
396+ breakpoint
397+ inci (p_hsExpr x)
439398 breakpoint
440− inci $ located e p_hsExpr
441− (GroupForm, Nothing) -> do
399+ located e $ \x -> do
400+ txt "by"
401+ breakpoint
402+ inci (p_hsExpr x)
403+ (GroupForm, Nothing) -> located trS_using $ \x -> do
442404 txt "then group using"
443405 breakpoint
444− inci $ located trS_using p_hsExpr
406+ inci (p_hsExpr x)
445407 (GroupForm, Just e) -> do
446− txt "then group by"
447− breakpoint
448− inci $ located e p_hsExpr
449− breakpoint
450− txt "using"
408+ located e $ \x -> do
409+ txt "then group by"
410+ breakpoint
411+ inci (p_hsExpr x)
451412 breakpoint
452− inci $ located trS_using p_hsExpr
413+ located trS_using $ \x -> do
414+ txt "using"
415+ breakpoint
416+ inci (p_hsExpr x)
453417 RecStmt {..} -> do
454418 txt "rec"
455419 space
456− sitcc $ sepSemi (withSpacing (p_stmt' placer render)) recS_stmts
457− XStmtLR c -> noExtCon c
420+ sitcc $ sepSemi (located' (p_stmt' pretty)) recS_stmts
421+ XStmtLR {} -> notImplemented "XStmtLR"
458422
459423gatherStmt :: ExprLStmt GhcPs -> [[ExprLStmt GhcPs]]
460−gatherStmt (L _ (ParStmt NoExtField block _ _)) =
424+gatherStmt (L _ (ParStmt NoExt block _ _)) =
461425 foldr ((<>) . gatherStmtBlock) [] block
462426gatherStmt (L s stmt@TransStmt {..}) =
463427 foldr liftAppend [] ((gatherStmt <$> trS_stmts) <> pure [[L s stmt]])
@@ -466,230 +430,208 @@ gatherStmt stmt = [[stmt]]
466430gatherStmtBlock :: ParStmtBlock GhcPs GhcPs -> [[ExprLStmt GhcPs]]
467431gatherStmtBlock (ParStmtBlock _ stmts _ _) =
468432 foldr (liftAppend . gatherStmt) [] stmts
469−gatherStmtBlock (XParStmtBlock x) = noExtCon x
433+gatherStmtBlock XParStmtBlock {} = notImplemented "XParStmtBlock"
470434
471435p_hsLocalBinds :: HsLocalBindsLR GhcPs GhcPs -> R ()
472436p_hsLocalBinds = \case
473− HsValBinds NoExtField (ValBinds NoExtField bag lsigs) -> do
474− -- When in a single-line layout, there is a chance that the inner
437+ HsValBinds NoExt (ValBinds NoExt bag lsigs) -> do
438+ let ssStart = either
439+ (srcSpanStart . getLoc)
440+ (srcSpanStart . getLoc)
441+ items =
442+ (Left <$> bagToList bag) ++ (Right <$> lsigs)
443+ p_item (Left x) = located x p_valDecl
444+ p_item (Right x) = located x p_sigDecl
445+ -- Assigns 'False' to the last element, 'True' to the rest.
446+ markInit :: [a] -> [(Bool, a)]
447+ markInit [] = []
448+ markInit (x:[]) = [(False, x)]
449+ markInit (x:xs) = (True, x) : markInit xs
450+ -- NOTE When in a single-line layout, there is a chance that the inner
475451 -- elements will also contain semicolons and they will confuse the
476452 -- parser. so we request braces around every element except the last.
477− br <- layoutToBraces <$> getLayout
478− let items =
479− let injectLeft (L l x) = L l (Left x)
480− injectRight (L l x) = L l (Right x)
481− in (injectLeft <$> bagToList bag) ++ (injectRight <$> lsigs)
482− positionToBracing = \case
483− SinglePos -> id
484− FirstPos -> br
485− MiddlePos -> br
486− LastPos -> id
487− p_item' (p, item) =
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"
493− HsIPBinds NoExtField (IPBinds NoExtField xs) ->
453+ br <- vlayout (return useBraces) (return id)
454+ sitcc $ sepSemi
455+ (\(m, i) -> (if m then br else id) $ p_item i)
456+ (markInit $ sortOn ssStart items)
457+ HsValBinds NoExt _ -> notImplemented "HsValBinds"
458+ HsIPBinds NoExt (IPBinds NoExt xs) ->
494459 -- Second argument of IPBind is always Left before type-checking.
495− let p_ipBind (IPBind NoExtField (Left name) expr) = do
460+ let p_ipBind (IPBind NoExt (Left name) expr) = do
496461 atom name
497462 space
498− equals
463+ txt "="
499464 breakpoint
500465 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
466+ p_ipBind _ = notImplemented "XHsIPBinds"
505467 in sepSemi (located' p_ipBind) xs
506− HsIPBinds NoExtField _ -> notImplemented "HsIpBinds"
507− EmptyLocalBinds NoExtField -> return ()
508− XHsLocalBindsLR x -> noExtCon x
468+ HsIPBinds NoExt _ -> notImplemented "HsIpBinds"
469+ EmptyLocalBinds NoExt -> return ()
470+ XHsLocalBindsLR _ -> notImplemented "XHsLocalBindsLR"
509471
510−p_hsRecField ::
511− HsRecField' RdrName (LHsExpr GhcPs) ->
512− R ()
513−p_hsRecField HsRecField {..} = do
472+p_hsRecField
473+ :: HsRecField' RdrName (LHsExpr GhcPs)
474+ -> R ()
475+p_hsRecField = \HsRecField {..} -> do
514476 p_rdrName hsRecFieldLbl
515477 unless hsRecPun $ do
516478 space
517− equals
518− let placement =
519− if onTheSameLine (getLoc hsRecFieldLbl) (getLoc hsRecFieldArg)
520− then exprPlacement (unLoc hsRecFieldArg)
521− else Normal
522− placeHanging placement (located hsRecFieldArg p_hsExpr)
479+ txt "="
480+ let placement = exprPlacement (unLoc hsRecFieldArg)
481+ placeHanging placement $ located hsRecFieldArg p_hsExpr
482+
483+p_hsTupArg :: HsTupArg GhcPs -> R ()
484+p_hsTupArg = \case
485+ Present NoExt x -> located x p_hsExpr
486+ Missing NoExt -> pure ()
487+ XTupArg {} -> notImplemented "XTupArg"
523488
524489p_hsExpr :: HsExpr GhcPs -> R ()
525490p_hsExpr = p_hsExpr' N
526491
527492p_hsExpr' :: BracketStyle -> HsExpr GhcPs -> R ()
528493p_hsExpr' s = \case
529− HsVar NoExtField name -> p_rdrName name
530− HsUnboundVar NoExtField v -> atom (unboundVarOcc v)
531− HsConLikeOut NoExtField _ -> notImplemented "HsConLikeOut"
532− HsRecFld NoExtField x ->
494+ HsVar NoExt name -> p_rdrName name
495+ HsUnboundVar NoExt _ -> notImplemented "HsUnboundVar"
496+ HsConLikeOut NoExt _ -> notImplemented "HsConLikeOut"
497+ HsRecFld NoExt x ->
533498 case x of
534− Unambiguous NoExtField name -> p_rdrName name
535− Ambiguous NoExtField name -> p_rdrName name
536− XAmbiguousFieldOcc xx -> noExtCon xx
537− HsOverLabel NoExtField _ v -> do
499+ Unambiguous NoExt name -> p_rdrName name
500+ Ambiguous NoExt name -> p_rdrName name
501+ XAmbiguousFieldOcc NoExt -> notImplemented "XAmbiguousFieldOcc"
502+ HsOverLabel NoExt _ v -> do
538503 txt "#"
539504 atom v
540− HsIPVar NoExtField (HsIPName name) -> do
505+ HsIPVar NoExt (HsIPName name) -> do
541506 txt "?"
542507 atom name
543− HsOverLit NoExtField v -> atom (ol_val v)
544− HsLit NoExtField lit ->
508+ HsOverLit NoExt v -> atom (ol_val v)
509+ HsLit NoExt lit ->
545510 case lit of
546511 HsString (SourceText stxt) _ -> p_stringLit stxt
547512 HsStringPrim (SourceText stxt) _ -> p_stringLit stxt
548513 r -> atom r
549− HsLam NoExtField mgroup ->
514+ HsLam NoExt mgroup ->
550515 p_matchGroup Lambda mgroup
551− HsLamCase NoExtField mgroup -> do
516+ HsLamCase NoExt mgroup -> do
552517 txt "\\case"
553518 breakpoint
554519 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 =
520+ HsApp NoExt f x -> do
521+ -- We hang only the last function argument. In order to do
522+ -- this, we only call 'placeHanging' on the topmost 'HsApp',
523+ -- and then use 'p_withoutHanging' for the descendants.
524+ let p_withoutHanging (HsApp NoExt f' x') = do
560525 case f' of
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)
567− initSpan =
568− combineSrcSpans' $
569− getLoc f :| [(srcLocSpan . srcSpanStart . getLoc) lastp]
570− -- Hang the last argument only if the initial arguments span one
571− -- line.
572− placement =
573− if isOneLineSpan initSpan
574− then exprPlacement (unLoc lastp)
575− else Normal
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
579− -- one.
580− case placement of
581− 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.
587− doIndent =
588− case func of
589− L _ (HsPar NoExtField _) -> True
590− L _ (HsAppType NoExtField _ _) -> True
591− L _ (HsMultiIf NoExtField _) -> True
592− L spn _ -> isOneLineSpan spn
593− ub <-
594− getLayout <&> \case
595− SingleLine -> useBraces
596− MultiLine -> id
597− ub $ do
598− located func (p_hsExpr' s)
599− breakpoint
600− inciIf doIndent $ sep breakpoint (located' p_hsExpr) initp
601− inciIf doIndent $ do
602− unless (null initp) breakpoint
603− located lastp p_hsExpr
604− Hanging -> do
605− useBraces . switchLayout [initSpan] $ do
606− located func (p_hsExpr' s)
526+ L _ (HsApp _ _ _) -> located f' p_withoutHanging
527+ _ -> located f' (p_hsExpr' s)
607528 breakpoint
608− sep breakpoint (located' p_hsExpr) initp
609− placeHanging placement $
610− located lastp p_hsExpr
611− HsAppType NoExtField e a -> do
529+ inci $ located x' p_hsExpr
530+ p_withoutHanging e = p_hsExpr e
531+ -- Only use the hanging placement if the function spans
532+ -- a single line.
533+ placement =
534+ if isOneLineSpan (getLoc f)
535+ then exprPlacement (unLoc x)
536+ else Normal
537+ -- We only sit when the last expression is not hanging.
538+ -- This is to allow:
539+ -- f = foo bar do
540+ -- baz
541+ sit' = if placement == Normal
542+ then sitcc
543+ else id
544+ sit' $ do
545+ useBraces $ located f p_withoutHanging
546+ placeHanging placement $
547+ located x p_hsExpr
548+ HsAppType a e -> do
612549 located e p_hsExpr
613550 breakpoint
614551 inci $ do
615552 txt "@"
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
620− _ -> return ()
621553 located (hswc_body a) p_hsType
622− OpApp NoExtField x op y -> do
554+ OpApp NoExt x op y -> do
623555 let opTree = OpBranch (exprOpTree x) op (exprOpTree y)
556+ getOpName = \case
557+ HsVar NoExt (L _ a) -> Just a
558+ _ -> Nothing
624559 p_exprOpTree s (reassociateOpTree getOpName opTree)
625− NegApp NoExtField e _ -> do
560+ NegApp NoExt e _ -> do
626561 txt "-"
627562 space
628563 located e p_hsExpr
629− HsPar NoExtField e ->
630− parens s (located e (dontUseBraces . p_hsExpr))
631− SectionL NoExtField x op -> do
564+ HsPar NoExt e -> parens s (located e p_hsExpr)
565+ SectionL NoExt x op -> do
632566 located x p_hsExpr
633567 breakpoint
634568 inci (located op p_hsExpr)
635− SectionR NoExtField op x -> do
569+ SectionR NoExt op x -> do
636570 located op p_hsExpr
637− useRecordDot' <- useRecordDot
638− let isRecordDot' = isRecordDot (unLoc op) (getLoc x)
639− unless (useRecordDot' && isRecordDot') breakpoint
571+ breakpoint
640572 inci (located x p_hsExpr)
641− ExplicitTuple NoExtField args boxity ->
573+ ExplicitTuple NoExt args boxity -> do
642574 let isSection = any (isMissing . unLoc) args
643575 isMissing = \case
644− Missing NoExtField -> True
576+ Missing NoExt -> True
645577 _ -> False
646− p_arg = \case
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' =
578+ let parens' =
652579 case boxity of
653580 Boxed -> parens
654581 Unboxed -> parensHash
655− in if isSection
656− then
657− switchLayout [] . parens' s $
658− sep comma p_larg args
659− else
660− switchLayout (getLoc <$> args) . parens' s $
661− sep commaDel p_larg args
662− ExplicitSum NoExtField tag arity e ->
582+ if isSection
583+ then switchLayout [] . parens' s $
584+ sep comma (located' p_hsTupArg) args
585+ else switchLayout (getLoc <$> args) . parens' s . sitcc $
586+ sep (comma >> breakpoint) (sitcc . located' p_hsTupArg) args
587+ ExplicitSum NoExt tag arity e ->
663588 p_unboxedSum N tag arity (located e p_hsExpr)
664− HsCase NoExtField e mgroup ->
665− p_case exprPlacement p_hsExpr e mgroup
666− HsIf NoExtField _ if' then' else' ->
667− p_if exprPlacement p_hsExpr if' then' else'
668− HsMultiIf NoExtField guards -> do
589+ HsCase NoExt e mgroup -> do
590+ txt "case"
591+ space
592+ located e p_hsExpr
593+ space
594+ txt "of"
595+ breakpoint
596+ inci (p_matchGroup Case mgroup)
597+ HsIf NoExt _ if' then' else' -> do
669598 txt "if"
599+ space
600+ located if' p_hsExpr
670601 breakpoint
671− inci . inci $ sep newline (located' (p_grhs RightArrow)) guards
672− HsLet NoExtField localBinds e ->
673− p_let p_hsExpr localBinds e
674− HsDo NoExtField ctx es -> do
602+ inci $ do
603+ txt "then"
604+ located then' $ \x ->
605+ placeHanging (exprPlacement x) (p_hsExpr x)
606+ breakpoint
607+ txt "else"
608+ located else' $ \x ->
609+ placeHanging (exprPlacement x) (p_hsExpr x)
610+ HsMultiIf NoExt guards -> do
611+ txt "if"
612+ breakpoint
613+ inci . sitcc $ sep newline (located' (p_grhs RightArrow)) guards
614+ HsLet NoExt localBinds e -> sitcc $ do
615+ txt "let"
616+ space
617+ dontUseBraces $ sitcc (located localBinds p_hsLocalBinds)
618+ vlayout space (newline >> txt " ")
619+ txt "in"
620+ space
621+ sitcc (located e p_hsExpr)
622+ HsDo NoExt ctx es -> do
675623 let doBody header = do
676624 txt header
677625 breakpoint
678− ub <- layoutToBraces <$> getLayout
679− inci $
680− sepSemi
681− (ub . withSpacing (p_stmt' exprPlacement (p_hsExpr' S)))
682− (unLoc es)
683− compBody = brackets N . located es $ \xs -> do
684− let p_parBody =
685− sep
686− (breakpoint >> txt "|" >> space)
687− p_seqBody
688− p_seqBody =
689− sitcc
690− . sep
691− commaDel
692− (located' (sitcc . p_stmt))
626+ ub <- vlayout (return useBraces) (return id)
627+ inci $ sepSemi (located' (ub . p_stmt' (p_hsExpr' S))) (unLoc es)
628+ compBody = brackets N $ located es $ \xs -> do
629+ let p_parBody = sep
630+ (breakpoint >> txt "| ")
631+ p_seqBody
632+ p_seqBody = sitcc . sep
633+ (comma >> breakpoint)
634+ (located' (sitcc . p_stmt))
693635 stmts = init xs
694636 yield = last xs
695637 lists = foldr (liftAppend . gatherStmt) [] stmts
@@ -703,100 +645,92 @@ p_hsExpr' s = \case
703645 MDoExpr -> doBody "mdo"
704646 ListComp -> compBody
705647 MonadComp -> notImplemented "MonadComp"
706− ArrowExpr -> notImplemented "ArrowExpr"
648+ ArrowExpr -> notImplemented "ArrowExpr"
707649 GhciStmtCtxt -> notImplemented "GhciStmtCtxt"
708650 PatGuard _ -> notImplemented "PatGuard"
709651 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
710652 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
711653 ExplicitList _ _ xs ->
712− brackets s $
713− sep commaDel (sitcc . located' p_hsExpr) xs
654+ brackets s . sitcc $
655+ sep (comma >> breakpoint) (sitcc . located' p_hsExpr) xs
714656 RecordCon {..} -> do
715657 located rcon_con_name atom
716658 breakpoint
717659 let HsRecFields {..} = rcon_flds
718− updName f =
719− (f :: HsRecField GhcPs (LHsExpr GhcPs))
720− { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
721− FieldOcc _ n -> n
722− XFieldOcc x -> noExtCon x
723− }
660+ updName f = f {
661+ hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
662+ FieldOcc _ n -> n
663+ XFieldOcc _ -> notImplemented "XFieldOcc"
664+ }
724665 fields = located' (p_hsRecField . updName) <$> rec_flds
725666 dotdot =
726667 case rec_dotdot of
727668 Just {} -> [txt ".."]
728669 Nothing -> []
729− inci . braces N $
730− sep commaDel sitcc (fields <> dotdot)
670+ inci . braces N . sitcc $
671+ sep (comma >> breakpoint) sitcc (fields <> dotdot)
731672 RecordUpd {..} -> do
732673 located rupd_expr p_hsExpr
733− useRecordDot' <- useRecordDot
734− let mrs sp = case getLoc sp of
735− RealSrcSpan r -> Just r
736− _ -> Nothing
737− let isPluginForm =
738− ((1 +) . srcSpanEndCol <$> mrs rupd_expr)
739− == (srcSpanStartCol <$> mrs (head rupd_flds))
740− unless (useRecordDot' && isPluginForm) breakpoint
741− let updName f =
742− (f :: HsRecUpdField GhcPs)
743− { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
744− Ambiguous _ n -> n
745− Unambiguous _ n -> n
746− XAmbiguousFieldOcc x -> noExtCon x
747− }
748− inci . braces N $
674+ breakpoint
675+ let updName f = f {
676+ hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
677+ Ambiguous _ n -> n
678+ Unambiguous _ n -> n
679+ XAmbiguousFieldOcc _ -> notImplemented "XAmbiguousFieldOcc"
680+ }
681+ inci . braces N . sitcc $
749682 sep
750− commaDel
683+ (comma >> breakpoint)
751684 (sitcc . located' (p_hsRecField . updName))
752685 rupd_flds
753− ExprWithTySig NoExtField x HsWC {hswc_body = HsIB {..}} -> sitcc $ do
686+ ExprWithTySig affix x -> sitcc $ do
754687 located x p_hsExpr
755− space
756− txt "::"
757688 breakpoint
758− inci $ 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 ->
689+ inci $ do
690+ txt "::"
691+ space
692+ let HsWC {..} = affix
693+ HsIB {..} = hswc_body
694+ located hsib_body p_hsType
695+ ArithSeq NoExt _ x -> do
762696 case x of
763− From from -> brackets s $ do
697+ From from -> brackets s . sitcc $ do
764698 located from p_hsExpr
765699 breakpoint
766700 txt ".."
767− FromThen from next -> brackets s $ do
768− sep commaDel (located' p_hsExpr) [from, next]
701+ FromThen from next -> brackets s . sitcc $ do
702+ sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
769703 breakpoint
770704 txt ".."
771− FromTo from to -> brackets s $ do
705+ FromTo from to -> brackets s . sitcc $ do
772706 located from p_hsExpr
773707 breakpoint
774708 txt ".."
775709 space
776710 located to p_hsExpr
777− FromThenTo from next to -> brackets s $ do
778− sep commaDel (located' p_hsExpr) [from, next]
711+ FromThenTo from next to -> brackets s . sitcc $ do
712+ sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
779713 breakpoint
780714 txt ".."
781715 space
782716 located to p_hsExpr
783− HsSCC NoExtField _ name x -> do
717+ HsSCC NoExt _ name x -> do
784718 txt "{-# SCC "
785719 atom name
786720 txt " #-}"
787721 breakpoint
788722 located x p_hsExpr
789− HsCoreAnn NoExtField _ value x -> do
723+ HsCoreAnn NoExt _ value x -> do
790724 txt "{-# CORE "
791725 atom value
792726 txt " #-}"
793727 breakpoint
794728 located x p_hsExpr
795− HsBracket NoExtField x -> p_hsBracket x
729+ HsBracket NoExt x -> p_hsBracket x
796730 HsRnBracketOut {} -> notImplemented "HsRnBracketOut"
797731 HsTcBracketOut {} -> notImplemented "HsTcBracketOut"
798− HsSpliceE NoExtField splice -> p_hsSplice splice
799− HsProc NoExtField p e -> do
732+ HsSpliceE NoExt splice -> p_hsSplice splice
733+ HsProc NoExt p e -> do
800734 txt "proc"
801735 located p $ \x -> do
802736 breakpoint
@@ -805,46 +739,65 @@ p_hsExpr' s = \case
805739 txt "->"
806740 placeHanging (cmdTopPlacement (unLoc e)) $
807741 located e p_hsCmdTop
808− HsStatic _ e -> do
742+ HsStatic _ e -> do
809743 txt "static"
810744 breakpoint
811745 inci (located e p_hsExpr)
746+ HsArrApp NoExt body input arrType cond ->
747+ p_hsCmd (HsCmdArrApp NoExt body input arrType cond)
748+ HsArrForm NoExt form mfixity cmds ->
749+ p_hsCmd (HsCmdArrForm NoExt form Prefix mfixity cmds)
812750 HsTick {} -> notImplemented "HsTick"
813751 HsBinTick {} -> notImplemented "HsBinTick"
814752 HsTickPragma {} -> notImplemented "HsTickPragma"
753+ -- These four constructs should never appear in correct programs.
754+ -- See: https://github.com/tweag/ormolu/issues/343
755+ EWildPat NoExt -> txt "_"
756+ EAsPat NoExt n p -> do
757+ p_rdrName n
758+ txt "@"
759+ located p p_hsExpr
760+ EViewPat NoExt p e -> do
761+ located p p_hsExpr
762+ space
763+ txt "->"
764+ breakpoint
765+ inci (located e p_hsExpr)
766+ ELazyPat NoExt p -> do
767+ txt "~"
768+ located p p_hsExpr
815769 HsWrap {} -> notImplemented "HsWrap"
816− XExpr x -> noExtCon x
770+ XExpr {} -> notImplemented "XExpr"
817771
818772p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
819773p_patSynBind PSB {..} = do
820− let rhs = do
821− space
822− case psb_dir of
823− Unidirectional -> do
824− txt "<-"
825− breakpoint
826− located psb_def p_pat
827− ImplicitBidirectional -> do
828− equals
829− breakpoint
830− located psb_def p_pat
831− ExplicitBidirectional mgroup -> do
832− txt "<-"
833− breakpoint
834− located psb_def p_pat
835− newline
836− txt "where"
837− newline
838− inci (p_matchGroup (Function psb_id) mgroup)
774+ let rhs = case psb_dir of
775+ Unidirectional -> do
776+ txt "<-"
777+ space
778+ located psb_def p_pat
779+ ImplicitBidirectional -> do
780+ txt "="
781+ space
782+ located psb_def p_pat
783+ ExplicitBidirectional mgroup -> do
784+ txt "<-"
785+ space
786+ located psb_def p_pat
787+ newline
788+ txt "where"
789+ newline
790+ inci (p_matchGroup (Function psb_id) mgroup)
839791 txt "pattern"
840792 case psb_args of
841793 PrefixCon xs -> do
842794 space
843795 p_rdrName psb_id
844− inci $ do
796+ inci $ do
845797 switchLayout (getLoc <$> xs) $ do
846798 unless (null xs) breakpoint
847799 sitcc (sep breakpoint p_rdrName xs)
800+ breakpoint
848801 rhs
849802 RecCon xs -> do
850803 space
@@ -852,8 +805,9 @@ p_patSynBind PSB {..} = do
852805 inci $ do
853806 switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
854807 unless (null xs) breakpoint
855− braces N $
856− sep commaDel (p_rdrName . recordPatSynPatVar) xs
808+ braces N . sitcc $
809+ sep (comma >> breakpoint) (p_rdrName . recordPatSynPatVar) xs
810+ breakpoint
857811 rhs
858812 InfixCon l r -> do
859813 switchLayout [getLoc l, getLoc r] $ do
@@ -864,99 +818,36 @@ p_patSynBind PSB {..} = do
864818 p_rdrName psb_id
865819 space
866820 p_rdrName r
867− inci rhs
868−p_patSynBind (XPatSynBind x) = noExtCon x
869−
870−p_case ::
871− Data body =>
872− -- | Placer
873− (body -> Placement) ->
874− -- | Render
875− (body -> R ()) ->
876− -- | Expression
877− LHsExpr GhcPs ->
878− -- | Match group
879− MatchGroup GhcPs (Located body) ->
880− R ()
881−p_case placer render e mgroup = do
882− txt "case"
883− space
884− located e p_hsExpr
885− space
886− txt "of"
887− breakpoint
888− inci (p_matchGroup' placer render Case mgroup)
889−
890−p_if ::
891− Data body =>
892− -- | Placer
893− (body -> Placement) ->
894− -- | Render
895− (body -> R ()) ->
896− -- | If
897− LHsExpr GhcPs ->
898− -- | Then
899− Located body ->
900− -- | Else
901− Located body ->
902− R ()
903−p_if placer render if' then' else' = do
904− txt "if"
905− space
906− located if' p_hsExpr
907− breakpoint
908− inci $ do
909− txt "then"
910− space
911− located then' $ \x ->
912− placeHanging (placer x) (render x)
913− breakpoint
914− txt "else"
915− space
916− located else' $ \x ->
917− placeHanging (placer x) (render x)
918−
919−p_let ::
920− Data body =>
921− -- | Render
922− (body -> R ()) ->
923− Located (HsLocalBindsLR GhcPs GhcPs) ->
924− Located body ->
925− R ()
926−p_let render localBinds e = sitcc $ do
927− txt "let"
928− space
929− dontUseBraces $ sitcc (located localBinds p_hsLocalBinds)
930− vlayout space (newline >> txt " ")
931− txt "in"
932− space
933− sitcc (located e render)
821+ inci $ do
822+ breakpoint
823+ rhs
824+p_patSynBind (XPatSynBind NoExt) = notImplemented "XPatSynBind"
934825
935826p_pat :: Pat GhcPs -> R ()
936827p_pat = \case
937− WildPat NoExtField -> txt "_"
938− VarPat NoExtField name -> p_rdrName name
939− LazyPat NoExtField pat -> do
828+ WildPat NoExt -> txt "_"
829+ VarPat NoExt name -> p_rdrName name
830+ LazyPat NoExt pat -> do
940831 txt "~"
941832 located pat p_pat
942− AsPat NoExtField name pat -> do
833+ AsPat NoExt name pat -> do
943834 p_rdrName name
944835 txt "@"
945836 located pat p_pat
946− ParPat NoExtField pat ->
837+ ParPat NoExt pat ->
947838 located pat (parens S . p_pat)
948− BangPat NoExtField pat -> do
839+ BangPat NoExt pat -> do
949840 txt "!"
950841 located pat p_pat
951− ListPat NoExtField pats ->
952− brackets S $ sep commaDel (located' p_pat) pats
953− TuplePat NoExtField pats boxing -> do
954− let parens' =
842+ ListPat NoExt pats -> do
843+ brackets S . sitcc $ sep (comma >> breakpoint) (located' p_pat) pats
844+ TuplePat NoExt pats boxing -> do
845+ let f =
955846 case boxing of
956847 Boxed -> parens S
957848 Unboxed -> parensHash S
958− parens' $ sep commaDel (sitcc . located' p_pat) pats
959− SumPat NoExtField pat tag arity ->
849+ f . sitcc $ sep (comma >> breakpoint) (sitcc . located' p_pat) pats
850+ SumPat NoExt pat tag arity ->
960851 p_unboxedSum S tag arity (located pat p_pat)
961852 ConPatIn pat details ->
962853 case details of
@@ -971,40 +862,38 @@ p_pat = \case
971862 let f = \case
972863 Nothing -> txt ".."
973864 Just x -> located x p_pat_hsRecField
974− inci . braces N . sep commaDel f $
865+ inci . braces N . sitcc . sep (comma >> breakpoint) f $
975866 case dotdot of
976867 Nothing -> Just <$> fields
977− Just (L _ n) -> (Just <$> take n fields) ++ [Nothing]
978− InfixCon l r -> do
979− switchLayout [getLoc l, getLoc r] $ do
980− located l p_pat
981− breakpoint
982− inci $ do
983− p_rdrName pat
984− space
985− located r p_pat
868+ Just n -> (Just <$> take n fields) ++ [Nothing]
869+ InfixCon x y -> do
870+ located x p_pat
871+ space
872+ p_rdrName pat
873+ breakpoint
874+ inci (located y p_pat)
986875 ConPatOut {} -> notImplemented "ConPatOut" -- presumably created by renamer?
987− ViewPat NoExtField expr pat -> sitcc $ do
876+ ViewPat NoExt expr pat -> sitcc $ do
988877 located expr p_hsExpr
989878 space
990879 txt "->"
991880 breakpoint
992881 inci (located pat p_pat)
993− SplicePat NoExtField splice -> p_hsSplice splice
994− LitPat NoExtField p -> atom p
995− NPat NoExtField v _ _ -> located v (atom . ol_val)
996− NPlusKPat NoExtField n k _ _ _ -> sitcc $ do
882+ SplicePat NoExt splice -> p_hsSplice splice
883+ LitPat NoExt p -> atom p
884+ NPat NoExt v _ _ -> located v (atom . ol_val)
885+ NPlusKPat NoExt n k _ _ _ -> sitcc $ do
997886 p_rdrName n
998887 breakpoint
999888 inci $ do
1000889 txt "+"
1001890 space
1002891 located k (atom . ol_val)
1003− SigPat NoExtField pat hswc -> do
892+ SigPat hswc pat -> do
1004893 located pat p_pat
1005894 p_typeAscription hswc
1006895 CoPat {} -> notImplemented "CoPat" -- apparently created at some later stage
1007− XPat x -> noExtCon x
896+ XPat NoExt -> notImplemented "XPat"
1008897
1009898p_pat_hsRecField :: HsRecField' (FieldOcc GhcPs) (LPat GhcPs) -> R ()
1010899p_pat_hsRecField HsRecField {..} = do
@@ -1012,7 +901,7 @@ p_pat_hsRecField HsRecField {..} = do
1012901 p_rdrName (rdrNameFieldOcc x)
1013902 unless hsRecPun $ do
1014903 space
1015− equals
904+ txt "="
1016905 breakpoint
1017906 inci (located hsRecFieldArg p_pat)
1018907
@@ -1021,40 +910,38 @@ p_unboxedSum s tag arity m = do
1021910 let before = tag - 1
1022911 after = arity - before - 1
1023912 args = replicate before Nothing <> [Just m] <> replicate after Nothing
1024− f x =
913+ f (x,i) = do
914+ let isFirst = i == 0
915+ isLast = i == arity - 1
1025916 case x :: Maybe (R ()) of
1026917 Nothing ->
1027− space
918+ unless (isFirst || isLast) space
1028919 Just m' -> do
1029− space
920+ unless isFirst space
1030921 m'
1031− space
1032− parensHash s $ sep (txt "|") f args
922+ unless isLast space
923+ parensHash s $ sep (txt "|") f (zip args [0..])
1033924
1034925p_hsSplice :: HsSplice GhcPs -> R ()
1035926p_hsSplice = \case
1036− HsTypedSplice NoExtField deco _ expr -> p_hsSpliceTH True expr deco
1037− HsUntypedSplice NoExtField deco _ expr -> p_hsSpliceTH False expr deco
1038− HsQuasiQuote NoExtField _ quoterName srcSpan str -> do
927+ HsTypedSplice NoExt deco _ expr -> p_hsSpliceTH True expr deco
928+ HsUntypedSplice NoExt deco _ expr -> p_hsSpliceTH False expr deco
929+ HsQuasiQuote NoExt _ quoterName srcSpan str -> do
1039930 txt "["
1040931 p_rdrName (L srcSpan quoterName)
1041932 txt "|"
1042− -- QuasiQuoters often rely on precise custom strings. We cannot do any
1043− -- formatting here without potentially breaking someone's code.
933+ -- NOTE QuasiQuoters often rely on precise custom strings. We cannot do
934+ -- any formatting here without potentially breaking someone's code.
1044935 atom str
1045936 txt "|]"
1046937 HsSpliced {} -> notImplemented "HsSpliced"
1047− HsSplicedT {} -> notImplemented "HsSplicedT"
1048− XSplice x -> noExtCon x
938+ XSplice {} -> notImplemented "XSplice"
1049939
1050−p_hsSpliceTH ::
1051− -- | Typed splice?
1052− Bool ->
1053− -- | Splice expression
1054− LHsExpr GhcPs ->
1055− -- | Splice decoration
1056− SpliceDecoration ->
1057− R ()
940+p_hsSpliceTH
941+ :: Bool -- ^ Typed splice?
942+ -> LHsExpr GhcPs -- ^ Splice expression
943+ -> SpliceDecoration -- ^ Splice decoration
944+ -> R ()
1058945p_hsSpliceTH isTyped expr = \case
1059946 HasParens -> do
1060947 txt decoSymbol
@@ -1069,17 +956,17 @@ p_hsSpliceTH isTyped expr = \case
1069956
1070957p_hsBracket :: HsBracket GhcPs -> R ()
1071958p_hsBracket = \case
1072− ExpBr NoExtField expr -> do
959+ ExpBr NoExt expr -> do
1073960 anns <- getEnclosingAnns
1074961 let name = case anns of
1075− AnnOpenEQ : _ -> ""
962+ AnnOpenEQ:_ -> ""
1076963 _ -> "e"
1077964 quote name (located expr p_hsExpr)
1078− PatBr NoExtField pat -> located pat (quote "p" . p_pat)
1079− DecBrL NoExtField decls -> quote "d" (p_hsDecls Free decls)
1080− DecBrG NoExtField _ -> notImplemented "DecBrG" -- result of renamer
1081− TypBr NoExtField ty -> quote "t" (located ty p_hsType)
1082− VarBr NoExtField isSingleQuote name -> do
965+ PatBr NoExt pat -> quote "p" (located pat p_pat)
966+ DecBrL NoExt decls -> quote "d" (p_hsDecls Free decls)
967+ DecBrG NoExt _ -> notImplemented "DecBrG" -- result of renamer
968+ TypBr NoExt ty -> quote "t" (located ty p_hsType)
969+ VarBr NoExt isSingleQuote name -> do
1083970 txt (bool "''" "'" isSingleQuote)
1084971 -- HACK As you can see we use 'noLoc' here to be able to pass name into
1085972 -- 'p_rdrName' since the latter expects a "located" thing. The problem
@@ -1087,20 +974,19 @@ p_hsBracket = \case
1087974 -- turn makes it impossible to detect if there are parentheses around
1088975 -- it, etc. So we have to add parentheses manually assuming they are
1089976 -- necessary for all operators.
1090− let isOperator =
1091− all
1092− (\i -> isPunctuation i || isSymbol i)
1093− (showOutputable (rdrNameOcc name))
1094− && not (doesNotNeedExtraParens name)
977+ let isOperator = all
978+ (\i -> isPunctuation i || isSymbol i)
979+ (showOutputable (rdrNameOcc name))
980+ && not (doesNotNeedExtraParens name)
1095981 wrapper = if isOperator then parens N else id
1096982 wrapper $ p_rdrName (noLoc name)
1097− TExpBr NoExtField expr -> do
983+ TExpBr NoExt expr -> do
1098984 txt "[||"
1099985 breakpoint'
1100986 located expr p_hsExpr
1101987 breakpoint'
1102988 txt "||]"
1103− XBracket x -> noExtCon x
989+ XBracket {} -> notImplemented "XBracket"
1104990 where
1105991 quote :: Text -> R () -> R ()
1106992 quote name body = do
@@ -1124,54 +1010,50 @@ p_stringLit src =
11241010 multiLine =
11251011 sitcc $ sep breakpoint (txt . Text.pack) (backslashes s)
11261012 in vlayout singleLine multiLine
1127− where
1128− -- Split a string on gaps (backslash delimited whitespaces)
1129− --
1130− -- > splitGaps "bar\\ \\fo\\&o" == ["bar", "fo\\&o"]
1131− splitGaps :: String -> [String]
1132− splitGaps "" = []
1133− splitGaps s =
1134− let -- A backslash and a whitespace starts a "gap"
1135− p (Just '\\', _, _) = True
1136− p (_, '\\', Just c) | ghcSpace c = False
1137− p _ = True
1138− in case span p (zipPrevNext s) of
1139− (l, r) ->
1140− let -- drop the initial '\', any amount of 'ghcSpace', and another '\'
1013+ where
1014+ -- Split a string on gaps (backslash delimited whitespaces)
1015+ --
1016+ -- > splitGaps "bar\\ \\fo\\&o" == ["bar", "fo\\&o"]
1017+ splitGaps :: String -> [String]
1018+ splitGaps "" = []
1019+ splitGaps s =
1020+ let -- A backslash and a whitespace starts a "gap"
1021+ p (Just '\\', _, _) = True
1022+ p (_, '\\', Just c) | ghcSpace c = False
1023+ p _ = True
1024+ in case span p (zipPrevNext s) of
1025+ (l, r) ->
1026+ let -- drop the initial '\', any amount of 'ghcSpace', and another '\'
11411027 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
1148− --
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)]
1155− zipPrevNext xs =
1156− let z =
1157− zip
1158− (zip (Nothing : map Just xs) xs)
1159− (map Just (tail xs) ++ repeat Nothing)
1160− in map (\((p, x), n) -> (p, x, n)) z
1161− orig (_, x, _) = x
1028+ in map orig l : splitGaps r'
1029+
1030+ -- GHC's definition of whitespaces in strings
1031+ -- See: https://gitlab.haskell.org/ghc/ghc/blob/86753475/compiler/parser/Lexer.x#L1653
1032+ ghcSpace :: Char -> Bool
1033+ ghcSpace c = c <= '\x7f' && is_space c
1034+
1035+ -- Add backslashes to the inner side of the strings
1036+ --
1037+ -- > backslashes ["a", "b", "c"] == ["a\\", "\\b\\", "\\c"]
1038+ backslashes :: [String] -> [String]
1039+ backslashes (x:y:xs) = (x ++ "\\") : backslashes (('\\' : y) : xs)
1040+ backslashes xs = xs
1041+
1042+ -- Attaches previous and next items to each list element
1043+ zipPrevNext :: [a] -> [(Maybe a, a, Maybe a)]
1044+ zipPrevNext xs =
1045+ let z = zip (zip (Nothing : map Just xs) xs)
1046+ (map Just (tail xs) ++ repeat Nothing)
1047+ in map (\((p, x), n) -> (p, x, n)) z
1048+
1049+ orig (_, x, _) = x
11621050
11631051----------------------------------------------------------------------------
11641052-- Helpers
11651053
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
1171− MultiLine -> id
1172−
11731054-- | Append each element in both lists with semigroups. If one list is shorter
11741055-- than the other, return the rest of the longer list unchanged.
1056+
11751057liftAppend :: Semigroup a => [a] -> [a] -> [a]
11761058liftAppend [] [] = []
11771059liftAppend [] (y : ys) = y : ys
@@ -1179,13 +1061,14 @@ liftAppend (x : xs) [] = x : xs
11791061liftAppend (x : xs) (y : ys) = x <> y : liftAppend xs ys
11801062
11811063getGRHSSpan :: GRHS GhcPs (Located body) -> SrcSpan
1182−getGRHSSpan (GRHS NoExtField guards body) =
1064+getGRHSSpan (GRHS NoExt guards body) =
11831065 combineSrcSpans' $ getLoc body :| map getLoc guards
1184−getGRHSSpan (XGRHS x) = noExtCon x
1066+getGRHSSpan (XGRHS NoExt) = notImplemented "XGRHS"
11851067
11861068-- | Place a thing that may have a hanging form. This function handles how
11871069-- to separate it from preceding expressions and whether to bump indentation
11881070-- depending on what sort of expression we have.
1071+
11891072placeHanging :: Placement -> R () -> R ()
11901073placeHanging placement m =
11911074 case placement of
@@ -1198,165 +1081,102 @@ placeHanging placement m =
11981081
11991082-- | Check if given block contains single expression which has a hanging
12001083-- form.
1201−blockPlacement ::
1202− (body -> Placement) ->
1203− [LGRHS GhcPs (Located body)] ->
1204− Placement
1205−blockPlacement placer [L _ (GRHS NoExtField _ (L _ x))] = placer x
1084+
1085+blockPlacement
1086+ :: (body -> Placement)
1087+ -> [LGRHS GhcPs (Located body)]
1088+ -> Placement
1089+blockPlacement placer [(L _ (GRHS NoExt _ (L _ x)))] = placer x
12061090blockPlacement _ _ = Normal
12071091
12081092-- | Check if given command has a hanging form.
1093+
12091094cmdPlacement :: HsCmd GhcPs -> Placement
12101095cmdPlacement = \case
1211− HsCmdLam NoExtField _ -> Hanging
1212− HsCmdCase NoExtField _ _ -> Hanging
1213− HsCmdDo NoExtField _ -> Hanging
1096+ HsCmdLam NoExt _ -> Hanging
1097+ HsCmdCase NoExt _ _ -> Hanging
1098+ HsCmdDo NoExt _ -> Hanging
12141099 _ -> Normal
12151100
12161101cmdTopPlacement :: HsCmdTop GhcPs -> Placement
12171102cmdTopPlacement = \case
1218− HsCmdTop NoExtField (L _ x) -> cmdPlacement x
1219− XCmdTop x -> noExtCon x
1103+ HsCmdTop NoExt (L _ x) -> cmdPlacement x
1104+ XCmdTop {} -> notImplemented "XCmdTop"
12201105
12211106-- | Check if given expression has a hanging form.
1107+
12221108exprPlacement :: HsExpr GhcPs -> Placement
12231109exprPlacement = \case
12241110 -- 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)) ->
1228− Hanging
1111+ HsLam NoExt mg -> case mg of
1112+ MG _ (L _ [L _ (Match NoExt _ (x:xs) _)]) _
1113+ | isOneLineSpan (combineSrcSpans' $ fmap getLoc (x :| xs))
1114+ -> Hanging
12291115 _ -> Normal
1230− HsLamCase NoExtField _ -> Hanging
1231− HsCase NoExtField _ _ -> Hanging
1232− HsDo NoExtField DoExpr _ -> Hanging
1233− HsDo NoExtField MDoExpr _ -> Hanging
1234− OpApp NoExtField _ op y ->
1235− case (fmap getOpNameStr . getOpName . unLoc) op of
1236− Just "$" -> exprPlacement (unLoc y)
1237− _ -> Normal
1238− HsApp NoExtField _ y -> exprPlacement (unLoc y)
1239− HsProc NoExtField p _ ->
1116+ HsLamCase NoExt _ -> Hanging
1117+ HsCase NoExt _ _ -> Hanging
1118+ HsDo NoExt DoExpr _ -> Hanging
1119+ HsDo NoExt MDoExpr _ -> Hanging
1120+ RecordCon NoExt _ _ -> Hanging
1121+ -- If the rightmost expression in an operator chain is hanging, make the
1122+ -- whole block hanging; so that we can use the common @f = foo $ do@
1123+ -- style.
1124+ OpApp NoExt _ _ y -> exprPlacement (unLoc y)
1125+ -- Same thing for function applications (usually with -XBlockArguments)
1126+ HsApp NoExt _ y -> exprPlacement (unLoc y)
1127+ HsProc NoExt (L s _) _ ->
12401128 -- Indentation breaks if pattern is longer than one line and left
12411129 -- hanging. Consequently, only apply hanging when it is safe.
1242− if isOneLineSpan (getLoc p)
1243− then Hanging
1244− else Normal
1130+ if isOneLineSpan s
1131+ then Hanging
1132+ else Normal
12451133 _ -> Normal
12461134
12471135withGuards :: [LGRHS GhcPs (Located body)] -> Bool
12481136withGuards = any (checkOne . unLoc)
12491137 where
12501138 checkOne :: GRHS GhcPs (Located body) -> Bool
1251− checkOne (GRHS NoExtField [] _) = False
1139+ checkOne (GRHS NoExt [] _) = False
12521140 checkOne _ = True
12531141
12541142exprOpTree :: LHsExpr GhcPs -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs)
1255−exprOpTree (L _ (OpApp NoExtField x op y)) = OpBranch (exprOpTree x) op (exprOpTree y)
1143+exprOpTree (L _ (OpApp NoExt x op y)) = OpBranch (exprOpTree x) op (exprOpTree y)
12561144exprOpTree n = OpNode n
12571145
1258−getOpName :: HsExpr GhcPs -> Maybe RdrName
1259−getOpName = \case
1260− HsVar NoExtField (L _ a) -> Just a
1261− _ -> Nothing
1262−
1263−getOpNameStr :: RdrName -> String
1264−getOpNameStr = occNameString . rdrNameOcc
1265−
1266−p_exprOpTree ::
1267− -- | Bracket style to use
1268− BracketStyle ->
1269− OpTree (LHsExpr GhcPs) (LHsExpr GhcPs) ->
1270− R ()
1146+p_exprOpTree :: BracketStyle -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs) -> R ()
12711147p_exprOpTree s (OpNode x) = located x (p_hsExpr' s)
12721148p_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
1275− -- placement.
1149+ -- NOTE If the beginning of the first argument and the second argument
1150+ -- are on the same line, and the second argument has a hanging form, use
1151+ -- hanging placement.
12761152 let placement =
12771153 if isOneLineSpan
1278− (mkSrcSpan (srcSpanStart (opTreeLoc x)) (srcSpanStart (opTreeLoc y)))
1154+ (mkSrcSpan (srcSpanStart (opTreeLoc x)) (srcSpanStart (opTreeLoc y)))
12791155 then case y of
1280− OpNode (L _ n) -> exprPlacement n
1281− _ -> Normal
1156+ OpNode (L _ n) -> exprPlacement n
1157+ _ -> Normal
12821158 else Normal
1283− -- Distinguish holes used in infix notation.
1284− -- eg. '1 _foo 2' and '1 `_foo` 2'
12851159 opWrapper = case unLoc op of
1286− HsUnboundVar NoExtField _ -> backticks
1160+ EWildPat NoExt -> backticks
12871161 _ -> id
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)
1298− lhs =
1299− switchLayout [opTreeLoc x] $
1300− p_exprOpTree s 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
1307− isDoBlock = \case
1308− OpNode (L _ HsDo {}) -> True
1309− _ -> False
1310− useRecordDot' <- useRecordDot
1311− if
1312− | gotColon -> do
1313− lhs
1314− space
1315− p_op
1316− case placement of
1317− Hanging -> do
1318− space
1319− p_y
1320− Normal -> do
1321− breakpoint
1322− inciIf (isDoBlock y) p_y
1323− | gotDollar
1324− && isOneLineSpan (opTreeLoc x)
1325− && placement == Normal -> do
1326− useBraces lhs
1327− space
1328− p_op
1329− breakpoint
1330− inci p_y
1331− | useRecordDot' && gotRecordDot -> do
1332− lhs
1333− when isSection space
1334− p_op
1335− p_y
1336− | otherwise -> do
1337− ub lhs
1338− placeHanging placement $ do
1339− p_op
1340− space
1341− p_y
1342−
1343−-- | Return 'True' if given expression is a record-dot operator expression.
1344−isRecordDot ::
1345− -- | Operator expression
1346− HsExpr GhcPs ->
1347− -- | Span of the expression on the right-hand side of the operator
1348− SrcSpan ->
1349− Bool
1350−isRecordDot op (RealSrcSpan ySpan) = case op of
1351− HsVar NoExtField (L (RealSrcSpan opSpan) opName) ->
1352− (getOpNameStr opName == ".") && (srcSpanEndCol opSpan == srcSpanStartCol ySpan)
1353− _ -> False
1354−isRecordDot _ _ = False
1162+ ub <- vlayout
1163+ (return useBraces)
1164+ (return $ case placement of
1165+ Hanging -> useBraces
1166+ Normal -> dontUseBraces)
1167+ switchLayout [opTreeLoc x] $
1168+ ub $ p_exprOpTree s x
1169+ placeHanging placement $ do
1170+ located op (opWrapper . p_hsExpr)
1171+ space
1172+ switchLayout [opTreeLoc y] $
1173+ p_exprOpTree N y
13551174
13561175-- | Get annotations for the enclosing element.
1176+
13571177getEnclosingAnns :: R [AnnKeywordId]
13581178getEnclosingAnns = do
13591179 e <- getEnclosingSpan (const True)
13601180 case e of
13611181 Nothing -> return []
1362− Just e' -> getAnns (RealSrcSpan e')
1182+ Just e' -> getAnns (RealSrcSpan e')