@@ -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,26 @@ 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)
28−import qualified Data.Text as Text
2924import GHC
30−import OccName (occNameString)
25+import OccName (mkVarOcc)
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 (RdrName (..))
33+import RdrName (rdrNameOcc)
34+import SrcLoc (combineSrcSpans, isOneLineSpan)
35+import qualified Data.List.NonEmpty as NE
36+import qualified Data.Text as Text
37+import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
3938
4039-- | Style of a group of equations.
40+
4141data MatchGroupStyle
4242 = Function (Located RdrName)
4343 | PatternBind
@@ -46,61 +46,57 @@ data MatchGroupStyle
4646 | LambdaCase
4747
4848-- | Style of equations in a group.
49+
4950data GroupStyle
5051 = EqualSign
5152 | RightArrow
5253
5354-- | Expression placement. This marks the places where expressions that
5455-- implement handing forms may use them.
56+
5557data 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)
58+ = Normal -- ^ Multi-line layout should cause
59+ -- insertion of a newline and indentation
60+ -- bump
61+ | Hanging -- ^ Expressions that have hanging form
62+ -- should use it and avoid bumping one level
63+ -- of indentation
64+ deriving (Eq)
6565
6666p_valDecl :: HsBindLR GhcPs GhcPs -> R ()
6767p_valDecl = \case
68− FunBind NoExtField funId funMatches _ _ -> p_funBind funId funMatches
69− PatBind NoExtField pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
68+ FunBind NoExt funId funMatches _ _ -> p_funBind funId funMatches
69+ PatBind NoExt pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
7070 VarBind {} -> notImplemented "VarBinds" -- introduced by the type checker
7171 AbsBinds {} -> notImplemented "AbsBinds" -- introduced by the type checker
72− PatSynBind NoExtField psb -> p_patSynBind psb
73− XHsBindsLR x -> noExtCon x
72+ PatSynBind NoExt psb -> p_patSynBind psb
73+ XHsBindsLR NoExt -> notImplemented "XHsBindsLR"
7474
75−p_funBind ::
76− Located RdrName ->
77− MatchGroup GhcPs (LHsExpr GhcPs) ->
78− R ()
75+p_funBind
76+ :: Located RdrName
77+ -> MatchGroup GhcPs (LHsExpr GhcPs)
78+ -> R ()
7979p_funBind name = p_matchGroup (Function name)
8080
81−p_matchGroup ::
82− MatchGroupStyle ->
83− MatchGroup GhcPs (LHsExpr GhcPs) ->
84− R ()
81+p_matchGroup
82+ :: MatchGroupStyle
83+ -> MatchGroup GhcPs (LHsExpr GhcPs)
84+ -> R ()
8585p_matchGroup = p_matchGroup' exprPlacement p_hsExpr
8686
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
87+p_matchGroup'
88+ :: Data body
89+ => (body -> Placement) -- ^ How to get body placement
90+ -> (body -> R ()) -- ^ How to print body
91+ -> MatchGroupStyle -- ^ Style of this group of equations
92+ -> MatchGroup GhcPs (Located body) -- ^ Match group
93+ -> R ()
94+p_matchGroup' placer pretty style MG {..} = do
9995 let ob = case style of
10096 Case -> id
10197 LambdaCase -> id
10298 _ -> dontUseBraces
103− -- Since we are forcing braces on 'sepSemi' based on 'ob', we have to
99+ -- NOTE since we are forcing braces on 'sepSemi' based on 'ob', we have to
104100 -- restore the brace state inside the sepsemi.
105101 ub <- bool dontUseBraces useBraces <$> canUseBraces
106102 ob $ sepSemi (located' (ub . p_Match)) (unLoc mg_alts)
@@ -108,14 +104,14 @@ p_matchGroup' placer render style MG {..} = do
108104 p_Match m@Match {..} =
109105 p_match'
110106 placer
111− render
107+ pretty
112108 (adjustMatchGroupStyle m style)
113109 (isInfixMatch m)
114110 (matchStrictness m)
115111 m_pats
116112 m_grhss
117− p_Match (XMatch x) = noExtCon x
118−p_matchGroup' _ _ _ (XMatchGroup x) = noExtCon x
113+ p_Match _ = notImplemented "XMatch"
114+p_matchGroup' _ _ _ (XMatchGroup NoExt) = notImplemented "XMatchGroup"
119115
120116-- | Function id obtained through pattern matching on 'FunBind' should not
121117-- be used to print the actual equations because the different ‘RdrNames’
@@ -123,10 +119,11 @@ p_matchGroup' _ _ _ (XMatchGroup x) = noExtCon x
123119-- and paretheses) associated with them. It is necessary to use per-equation
124120-- names obtained from 'm_ctxt' of 'Match'. This function replaces function
125121-- name inside of 'Function' accordingly.
126−adjustMatchGroupStyle ::
127− Match GhcPs body ->
128− MatchGroupStyle ->
129− MatchGroupStyle
122+
123+adjustMatchGroupStyle
124+ :: Match GhcPs body
125+ -> MatchGroupStyle
126+ -> MatchGroupStyle
130127adjustMatchGroupStyle m = \case
131128 Function _ -> (Function . mc_fun . m_ctxt) m
132129 style -> style
@@ -134,43 +131,31 @@ adjustMatchGroupStyle m = \case
134131matchStrictness :: Match id body -> SrcStrictness
135132matchStrictness match =
136133 case m_ctxt match of
137− FunRhs {mc_strictness = s} -> s
134+ FunRhs{mc_strictness=s} -> s
138135 _ -> NoSrcStrict
139136
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 ()
137+p_match
138+ :: MatchGroupStyle -- ^ Style of the group
139+ -> Bool -- ^ Is this an infix match?
140+ -> SrcStrictness -- ^ Strictness prefix (FunBind)
141+ -> [LPat GhcPs] -- ^ Argument patterns
142+ -> GRHSs GhcPs (LHsExpr GhcPs) -- ^ Equations
143+ -> R ()
152144p_match = p_match' exprPlacement p_hsExpr
153145
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
146+p_match'
147+ :: Data body
148+ => (body -> Placement) -- ^ How to get body placement
149+ -> (body -> R ()) -- ^ How to print body
150+ -> MatchGroupStyle -- ^ Style of this group of equations
151+ -> Bool -- ^ Is this an infix match?
152+ -> SrcStrictness -- ^ Strictness prefix (FunBind)
153+ -> [LPat GhcPs] -- ^ Argument patterns
154+ -> GRHSs GhcPs (Located body) -- ^ Equations
155+ -> R ()
156+p_match' placer pretty style isInfix strictness m_pats m_grhss = do
157+ -- NOTE Normally, since patterns may be placed in a multi-line layout, it
158+ -- is necessary to bump indentation for the pattern group so it's more
174159 -- indented than function name. This in turn means that indentation for
175160 -- the body should also be bumped. Normally this would mean that bodies
176161 -- would start with two indentation steps applied, which is ugly, so we
@@ -180,24 +165,23 @@ p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
180165 NoSrcStrict -> return ()
181166 SrcStrict -> txt "!"
182167 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 ()
168+ inci' <- case NE.nonEmpty m_pats of
169+ Nothing -> id <$ case style of
170+ Function name -> p_rdrName name
171+ _ -> return ()
188172 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)
173+ let combinedSpans = combineSrcSpans' $
174+ getLoc <$> ne_pats
175+ inci' = if isOneLineSpan combinedSpans
176+ then id
177+ else inci
194178 switchLayout [combinedSpans] $ do
195179 let stdCase = sep breakpoint (located' p_pat) m_pats
196180 case style of
197181 Function name ->
198182 p_infixDefHelper
199183 isInfix
200− indentBody
184+ inci'
201185 (p_rdrName name)
202186 (located' p_pat <$> m_pats)
203187 PatternBind -> stdCase
@@ -212,40 +196,46 @@ p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
212196 when needsSpace space
213197 sitcc stdCase
214198 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
199+ return inci'
200+ let
201+ -- Calculate position of end of patterns. This is useful when we decide
202+ -- about putting certain constructions in hanging positions.
203+ endOfPats = case NE.nonEmpty m_pats of
204+ Nothing -> case style of
205+ Function name -> (Just . srcSpanEnd . getLoc) name
206+ _ -> Nothing
207+ Just pats -> (Just . srcSpanEnd . getLoc . NE.last) pats
208+ isCase = \case
209+ Case -> True
210+ LambdaCase -> True
211+ _ -> False
212+ let GRHSs {..} = m_grhss
227213 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
214+ unless (length grhssGRHSs > 1) $ do
215+ case style of
216+ Function _ | hasGuards -> return ()
217+ Function _ -> space >> txt "="
218+ PatternBind -> space >> txt "="
219+ s | isCase s && hasGuards -> return ()
220+ _ -> space >> txt "->"
221+ let grhssSpan = combineSrcSpans' $
222+ getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
223+ patGrhssSpan = maybe grhssSpan
224+ (combineSrcSpans grhssSpan . srcLocSpan) endOfPats
236225 placement =
237226 case endOfPats of
238227 Nothing -> blockPlacement placer grhssGRHSs
239228 Just spn ->
240− if onTheSameLine spn grhssSpan
229+ if isOneLineSpan
230+ (mkSrcSpan spn (srcSpanStart grhssSpan))
241231 then blockPlacement placer grhssGRHSs
242232 else Normal
243233 p_body = do
244234 let groupStyle =
245235 if isCase style && hasGuards
246− then RightArrow
247− else EqualSign
248− sep newline (located' (p_grhs' placer render groupStyle)) grhssGRHSs
236+ then RightArrow
237+ else EqualSign
238+ sep newline (located' (p_grhs' placer pretty groupStyle)) grhssGRHSs
249239 p_where = do
250240 let whereIsEmpty = GHC.isEmptyLocalBindsPR (unLoc grhssLocalBinds)
251241 unless (GHC.eqEmptyLocalBinds (unLoc grhssLocalBinds)) $ do
@@ -253,178 +243,150 @@ p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
253243 txt "where"
254244 unless whereIsEmpty breakpoint
255245 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 "->"
246+ inci' $ do
264247 switchLayout [patGrhssSpan] $
265248 placeHanging placement p_body
266249 inci p_where
267−p_match' _ _ _ _ _ _ (XGRHSs x) = noExtCon x
268250
269251p_grhs :: GroupStyle -> GRHS GhcPs (LHsExpr GhcPs) -> R ()
270252p_grhs = p_grhs' exprPlacement p_hsExpr
271253
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) =
254+p_grhs'
255+ :: Data body
256+ => (body -> Placement) -- ^ How to get body placement
257+ -> (body -> R ()) -- ^ How to print body
258+ -> GroupStyle
259+ -> GRHS GhcPs (Located body)
260+ -> R ()
261+p_grhs' placer pretty style (GRHS NoExt guards body) =
282262 case guards of
283263 [] -> p_body
284264 xs -> do
285265 txt "|"
286266 space
287− sitcc (sep commaDel (sitcc . located' p_stmt) xs)
267+ sitcc (sep (comma >> breakpoint) (sitcc . located' p_stmt) xs)
288268 space
289− inci $ case style of
290− EqualSign -> equals
291− RightArrow -> txt "->"
269+ txt $ case style of
270+ EqualSign -> "="
271+ RightArrow -> "->"
292272 placeHanging placement p_body
293273 where
294274 placement =
295275 case endOfGuards of
296276 Nothing -> placer (unLoc body)
297277 Just spn ->
298− if onTheSameLine spn (getLoc body)
299− then placer (unLoc body)
300− else Normal
278+ if isOneLineSpan (mkSrcSpan spn (srcSpanStart (getLoc body)))
279+ then placer (unLoc body)
280+ else Normal
301281 endOfGuards =
302282 case NE.nonEmpty guards of
303283 Nothing -> Nothing
304− Just gs -> (Just . getLoc . NE.last) gs
305− p_body = located body render
306−p_grhs' _ _ _ (XGRHS x) = noExtCon x
284+ Just gs -> (Just . srcSpanEnd . getLoc . NE.last) gs
285+ p_body = located body pretty
286+p_grhs' _ _ _ (XGRHS NoExt) = notImplemented "XGRHS"
307287
308288p_hsCmd :: HsCmd GhcPs -> R ()
309289p_hsCmd = \case
310− HsCmdArrApp NoExtField body input arrType _ -> do
290+ HsCmdArrApp NoExt body input arrType _ -> do
311291 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
292+ space
293+ case arrType of
294+ HsFirstOrderApp -> txt "-<"
295+ HsHigherOrderApp -> txt "-<<"
296+ placeHanging (exprPlacement (unLoc input)) $
297+ located input p_hsExpr
298+ HsCmdArrForm NoExt form Prefix _ cmds -> banana $ sitcc $ do
320299 located form p_hsExpr
321300 unless (null cmds) $ do
322301 breakpoint
323302 inci (sequence_ (intersperse breakpoint (located' p_hsCmdTop <$> cmds)))
324− HsCmdArrForm NoExtField form Infix _ [left, right] -> do
303+ HsCmdArrForm NoExt form Infix _ [left, right] -> do
325304 located left p_hsCmdTop
326305 space
327306 located form p_hsExpr
328307 placeHanging (cmdTopPlacement (unLoc right)) $
329308 located right p_hsCmdTop
330− HsCmdArrForm NoExtField _ Infix _ _ -> notImplemented "HsCmdArrForm"
309+ HsCmdArrForm NoExt _ Infix _ _ -> notImplemented "HsCmdArrForm"
331310 HsCmdApp {} ->
332311 -- XXX Does this ever occur in the syntax tree? It does not seem like it
333312 -- does. Open an issue and ping @yumiova if this ever occurs in output.
334313 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
314+ HsCmdLam NoExt mgroup -> p_matchGroup' cmdPlacement p_hsCmd Lambda mgroup
315+ HsCmdPar NoExt c -> parens N (located c p_hsCmd)
316+ HsCmdCase NoExt e mgroup -> do
317+ txt "case"
318+ space
319+ located e p_hsExpr
320+ space
321+ txt "of"
322+ breakpoint
323+ inci (p_matchGroup' cmdPlacement p_hsCmd Case mgroup)
324+ HsCmdIf NoExt _ if' then' else' -> do
325+ txt "if"
326+ space
327+ located if' p_hsExpr
328+ breakpoint
329+ txt "then"
330+ located then' $ \x -> do
331+ breakpoint
332+ inci (p_hsCmd x)
333+ breakpoint
334+ txt "else"
335+ located else' $ \x -> do
336+ breakpoint
337+ inci (p_hsCmd x)
338+ HsCmdLet NoExt localBinds c -> do
339+ txt "let"
340+ space
341+ sitcc (located localBinds p_hsLocalBinds)
342+ breakpoint
343+ vlayout space (newline >> txt " ")
344+ txt "in"
345+ space
346+ sitcc (located c p_hsCmd)
347+ HsCmdDo NoExt es -> do
344348 txt "do"
345349 newline
346− inci . located es $
347− sitcc . sep newline (sitcc . withSpacing (p_stmt' cmdPlacement p_hsCmd))
350+ inci (located es (sitcc . sep newline (located' (sitcc . p_stmt' p_hsCmd))))
348351 HsCmdWrap {} -> notImplemented "HsCmdWrap"
349− XCmd x -> noExtCon x
352+ XCmd {} -> notImplemented "XCmd"
350353
351354p_hsCmdTop :: HsCmdTop GhcPs -> R ()
352355p_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)
356+ HsCmdTop NoExt cmd -> located cmd p_hsCmd
357+ XCmdTop {} -> notImplemented "XHsCmdTop"
384358
385359p_stmt :: Stmt GhcPs (LHsExpr GhcPs) -> R ()
386−p_stmt = p_stmt' exprPlacement p_hsExpr
387−
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 = p_stmt' p_hsExpr
361+
362+p_stmt'
363+ :: Data body
364+ => (body -> R ())
365+ -> Stmt GhcPs (Located body)
366+ -> R ()
367+p_stmt' pretty = \case
368+ LastStmt NoExt body _ _ -> located body pretty
369+ BindStmt NoExt l f _ _ -> do
370+ located l p_pat
401371 space
402372 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)
373+ breakpoint
374+ inci (located f pretty)
413375 ApplicativeStmt {} -> notImplemented "ApplicativeStmt" -- generated by renamer
414− BodyStmt NoExtField body _ _ -> located body render
415− LetStmt NoExtField binds -> do
376+ BodyStmt NoExt body _ _ -> located body pretty
377+ LetStmt NoExt binds -> do
416378 txt "let"
417379 space
418380 sitcc $ located binds p_hsLocalBinds
419381 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.
382+ -- NOTE 'ParStmt' should always be eliminated in 'gatherStmt' already,
383+ -- such that it never occurs in 'p_stmt''. Consequently, handling it
384+ -- here would be redundant.
423385 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'.
386+ TransStmt {..} -> do
387+ -- NOTE 'TransStmt' only needs to account for pretty printing itself,
388+ -- since pretty printing of relevant statements (e.g., in 'trS_stmts')
389+ -- is handled through 'gatherStmt'.
428390 case (trS_form, trS_by) of
429391 (ThenForm, Nothing) -> do
430392 txt "then"
@@ -453,11 +415,11 @@ p_stmt' placer render = \case
453415 RecStmt {..} -> do
454416 txt "rec"
455417 space
456− sitcc $ sepSemi (withSpacing (p_stmt' placer render)) recS_stmts
457− XStmtLR c -> noExtCon c
418+ sitcc $ sepSemi (located' (p_stmt' pretty)) recS_stmts
419+ XStmtLR {} -> notImplemented "XStmtLR"
458420
459421gatherStmt :: ExprLStmt GhcPs -> [[ExprLStmt GhcPs]]
460−gatherStmt (L _ (ParStmt NoExtField block _ _)) =
422+gatherStmt (L _ (ParStmt NoExt block _ _)) =
461423 foldr ((<>) . gatherStmtBlock) [] block
462424gatherStmt (L s stmt@TransStmt {..}) =
463425 foldr liftAppend [] ((gatherStmt <$> trS_stmts) <> pure [[L s stmt]])
@@ -466,230 +428,205 @@ gatherStmt stmt = [[stmt]]
466428gatherStmtBlock :: ParStmtBlock GhcPs GhcPs -> [[ExprLStmt GhcPs]]
467429gatherStmtBlock (ParStmtBlock _ stmts _ _) =
468430 foldr (liftAppend . gatherStmt) [] stmts
469−gatherStmtBlock (XParStmtBlock x) = noExtCon x
431+gatherStmtBlock XParStmtBlock {} = notImplemented "XParStmtBlock"
470432
471433p_hsLocalBinds :: HsLocalBindsLR GhcPs GhcPs -> R ()
472434p_hsLocalBinds = \case
473− HsValBinds NoExtField (ValBinds NoExtField bag lsigs) -> do
474− -- When in a single-line layout, there is a chance that the inner
435+ HsValBinds NoExt (ValBinds NoExt bag lsigs) -> do
436+ let ssStart = either
437+ (srcSpanStart . getLoc)
438+ (srcSpanStart . getLoc)
439+ items =
440+ (Left <$> bagToList bag) ++ (Right <$> lsigs)
441+ p_item (Left x) = located x p_valDecl
442+ p_item (Right x) = located x p_sigDecl
443+ -- Assigns 'False' to the last element, 'True' to the rest.
444+ markInit :: [a] -> [(Bool, a)]
445+ markInit [] = []
446+ markInit (x:[]) = [(False, x)]
447+ markInit (x:xs) = (True, x) : markInit xs
448+ -- NOTE When in a single-line layout, there is a chance that the inner
475449 -- elements will also contain semicolons and they will confuse the
476450 -- parser. so we request braces around every element except the last.
477451 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) ->
452+ sitcc $ sepSemi
453+ (\(m, i) -> (if m then br else id) $ p_item i)
454+ (markInit $ sortOn ssStart items)
455+ HsValBinds NoExt _ -> notImplemented "HsValBinds"
456+ HsIPBinds NoExt (IPBinds NoExt xs) ->
494457 -- Second argument of IPBind is always Left before type-checking.
495− let p_ipBind (IPBind NoExtField (Left name) expr) = do
458+ let p_ipBind (IPBind NoExt (Left name) expr) = do
496459 atom name
497460 space
498− equals
461+ txt "="
499462 breakpoint
500463 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
464+ p_ipBind _ = notImplemented "XHsIPBinds"
505465 in sepSemi (located' p_ipBind) xs
506− HsIPBinds NoExtField _ -> notImplemented "HsIpBinds"
507− EmptyLocalBinds NoExtField -> return ()
508− XHsLocalBindsLR x -> noExtCon x
509−
510−p_hsRecField ::
511− HsRecField' RdrName (LHsExpr GhcPs) ->
512− R ()
513−p_hsRecField HsRecField {..} = do
466+ HsIPBinds NoExt _ -> notImplemented "HsIpBinds"
467+ EmptyLocalBinds NoExt -> return ()
468+ XHsLocalBindsLR _ -> notImplemented "XHsLocalBindsLR"
469+
470+p_hsRecField
471+ :: HsRecField' RdrName (LHsExpr GhcPs)
472+ -> R ()
473+p_hsRecField = \HsRecField {..} -> do
514474 p_rdrName hsRecFieldLbl
515475 unless hsRecPun $ do
516476 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)
477+ txt "="
478+ let placement = exprPlacement (unLoc hsRecFieldArg)
479+ placeHanging placement $ located hsRecFieldArg p_hsExpr
480+
481+p_hsTupArg :: HsTupArg GhcPs -> R ()
482+p_hsTupArg = \case
483+ Present NoExt x -> located x p_hsExpr
484+ Missing NoExt -> pure ()
485+ XTupArg {} -> notImplemented "XTupArg"
523486
524487p_hsExpr :: HsExpr GhcPs -> R ()
525488p_hsExpr = p_hsExpr' N
526489
527490p_hsExpr' :: BracketStyle -> HsExpr GhcPs -> R ()
528491p_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 ->
492+ HsVar NoExt name -> p_rdrName name
493+ HsUnboundVar NoExt _ -> notImplemented "HsUnboundVar"
494+ HsConLikeOut NoExt _ -> notImplemented "HsConLikeOut"
495+ HsRecFld NoExt x ->
533496 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
497+ Unambiguous NoExt name -> p_rdrName name
498+ Ambiguous NoExt name -> p_rdrName name
499+ XAmbiguousFieldOcc NoExt -> notImplemented "XAmbiguousFieldOcc"
500+ HsOverLabel NoExt _ v -> do
538501 txt "#"
539502 atom v
540− HsIPVar NoExtField (HsIPName name) -> do
503+ HsIPVar NoExt (HsIPName name) -> do
541504 txt "?"
542505 atom name
543− HsOverLit NoExtField v -> atom (ol_val v)
544− HsLit NoExtField lit ->
506+ HsOverLit NoExt v -> atom (ol_val v)
507+ HsLit NoExt lit ->
545508 case lit of
546509 HsString (SourceText stxt) _ -> p_stringLit stxt
547510 HsStringPrim (SourceText stxt) _ -> p_stringLit stxt
548511 r -> atom r
549− HsLam NoExtField mgroup ->
512+ HsLam NoExt mgroup ->
550513 p_matchGroup Lambda mgroup
551− HsLamCase NoExtField mgroup -> do
514+ HsLamCase NoExt mgroup -> do
552515 txt "\\case"
553516 breakpoint
554517 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 =
518+ HsApp NoExt f x -> do
519+ -- We hang only the last function argument. In order to do
520+ -- this, we only call 'placeHanging' on the topmost 'HsApp',
521+ -- and then use 'p_withoutHanging' for the descendants.
522+ let p_withoutHanging (HsApp NoExt f' x') = do
560523 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)
524+ L _ (HsApp _ _ _) -> located f' p_withoutHanging
525+ _ -> located f' (p_hsExpr' s)
599526 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)
607− breakpoint
608− sep breakpoint (located' p_hsExpr) initp
609− placeHanging placement $
610− located lastp p_hsExpr
611− HsAppType NoExtField e a -> do
527+ inci $ located x' p_hsExpr
528+ p_withoutHanging e = p_hsExpr e
529+ -- Only use the hanging placement if the function spans
530+ -- a single line.
531+ placement =
532+ if isOneLineSpan (getLoc f)
533+ then exprPlacement (unLoc x)
534+ else Normal
535+ -- We only sit when the last expression is not hanging.
536+ -- This is to allow:
537+ -- f = foo bar do
538+ -- baz
539+ sit' = if placement == Normal
540+ then sitcc
541+ else id
542+ sit' $ do
543+ useBraces $ located f p_withoutHanging
544+ placeHanging placement $
545+ located x p_hsExpr
546+ HsAppType a e -> do
612547 located e p_hsExpr
613548 breakpoint
614549 inci $ do
615550 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 ()
621551 located (hswc_body a) p_hsType
622− OpApp NoExtField x op y -> do
552+ OpApp NoExt x op y -> do
623553 let opTree = OpBranch (exprOpTree x) op (exprOpTree y)
624− p_exprOpTree s (reassociateOpTree getOpName opTree)
625− NegApp NoExtField e _ -> do
554+ p_exprOpTree True s (reassociateOpTree getOpName opTree)
555+ NegApp NoExt e _ -> do
626556 txt "-"
627557 space
628558 located e p_hsExpr
629− HsPar NoExtField e ->
630− parens s (located e (dontUseBraces . p_hsExpr))
631− SectionL NoExtField x op -> do
559+ HsPar NoExt e -> parens s (located e p_hsExpr)
560+ SectionL NoExt x op -> do
632561 located x p_hsExpr
633562 breakpoint
634563 inci (located op p_hsExpr)
635− SectionR NoExtField op x -> do
564+ SectionR NoExt op x -> do
636565 located op p_hsExpr
637− useRecordDot' <- useRecordDot
638− let isRecordDot' = isRecordDot (unLoc op) (getLoc x)
639− unless (useRecordDot' && isRecordDot') breakpoint
566+ breakpoint
640567 inci (located x p_hsExpr)
641− ExplicitTuple NoExtField args boxity ->
568+ ExplicitTuple NoExt args boxity -> do
642569 let isSection = any (isMissing . unLoc) args
643570 isMissing = \case
644− Missing NoExtField -> True
571+ Missing NoExt -> True
645572 _ -> 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' =
573+ let parens' =
652574 case boxity of
653575 Boxed -> parens
654576 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 ->
577+ if isSection
578+ then switchLayout [] . parens' s $
579+ sep comma (located' p_hsTupArg) args
580+ else switchLayout (getLoc <$> args) . parens' s . sitcc $
581+ sep (comma >> breakpoint) (sitcc . located' p_hsTupArg) args
582+ ExplicitSum NoExt tag arity e ->
663583 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
584+ HsCase NoExt e mgroup -> do
585+ txt "case"
586+ space
587+ located e p_hsExpr
588+ space
589+ txt "of"
590+ breakpoint
591+ inci (p_matchGroup Case mgroup)
592+ HsIf NoExt _ if' then' else' -> do
669593 txt "if"
594+ space
595+ located if' p_hsExpr
670596 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
597+ inci $ do
598+ txt "then"
599+ located then' $ \x ->
600+ placeHanging (exprPlacement x) (p_hsExpr x)
601+ breakpoint
602+ txt "else"
603+ located else' $ \x ->
604+ placeHanging (exprPlacement x) (p_hsExpr x)
605+ HsMultiIf NoExt guards -> do
606+ txt "if"
607+ breakpoint
608+ inci . sitcc $ sep newline (located' (p_grhs RightArrow)) guards
609+ HsLet NoExt localBinds e -> sitcc $ do
610+ txt "let"
611+ space
612+ dontUseBraces $ sitcc (located localBinds p_hsLocalBinds)
613+ vlayout space (newline >> txt " ")
614+ txt "in"
615+ space
616+ sitcc (located e p_hsExpr)
617+ HsDo NoExt ctx es -> do
675618 let doBody header = do
676619 txt header
677620 breakpoint
678621 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))
622+ inci $ sepSemi (located' (ub . p_stmt' (p_hsExpr' S))) (unLoc es)
623+ compBody = brackets N $ located es $ \xs -> do
624+ let p_parBody = sep
625+ (breakpoint >> txt "| ")
626+ p_seqBody
627+ p_seqBody = sitcc . sep
628+ (comma >> breakpoint)
629+ (located' (sitcc . p_stmt))
693630 stmts = init xs
694631 yield = last xs
695632 lists = foldr (liftAppend . gatherStmt) [] stmts
@@ -703,100 +640,92 @@ p_hsExpr' s = \case
703640 MDoExpr -> doBody "mdo"
704641 ListComp -> compBody
705642 MonadComp -> notImplemented "MonadComp"
706− ArrowExpr -> notImplemented "ArrowExpr"
643+ ArrowExpr -> notImplemented "ArrowExpr"
707644 GhciStmtCtxt -> notImplemented "GhciStmtCtxt"
708645 PatGuard _ -> notImplemented "PatGuard"
709646 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
710647 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
711648 ExplicitList _ _ xs ->
712− brackets s $
713− sep commaDel (sitcc . located' p_hsExpr) xs
649+ brackets s . sitcc $
650+ sep (comma >> breakpoint) (sitcc . located' p_hsExpr) xs
714651 RecordCon {..} -> do
715652 located rcon_con_name atom
716653 breakpoint
717654 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− }
655+ updName f = f {
656+ hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
657+ FieldOcc _ n -> n
658+ XFieldOcc _ -> notImplemented "XFieldOcc"
659+ }
724660 fields = located' (p_hsRecField . updName) <$> rec_flds
725661 dotdot =
726662 case rec_dotdot of
727663 Just {} -> [txt ".."]
728664 Nothing -> []
729− inci . braces N $
730− sep commaDel sitcc (fields <> dotdot)
665+ inci . braces N . sitcc $
666+ sep (comma >> breakpoint) sitcc (fields <> dotdot)
731667 RecordUpd {..} -> do
732668 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 $
669+ breakpoint
670+ let updName f = f {
671+ hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
672+ Ambiguous _ n -> n
673+ Unambiguous _ n -> n
674+ XAmbiguousFieldOcc _ -> notImplemented "XAmbiguousFieldOcc"
675+ }
676+ inci . braces N . sitcc $
749677 sep
750− commaDel
678+ (comma >> breakpoint)
751679 (sitcc . located' (p_hsRecField . updName))
752680 rupd_flds
753− ExprWithTySig NoExtField x HsWC {hswc_body = HsIB {..}} -> sitcc $ do
681+ ExprWithTySig affix x -> sitcc $ do
754682 located x p_hsExpr
755683 space
756684 txt "::"
757685 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 ->
686+ inci $ do
687+ let HsWC {..} = affix
688+ HsIB {..} = hswc_body
689+ located hsib_body p_hsType
690+ ArithSeq NoExt _ x -> do
762691 case x of
763− From from -> brackets s $ do
692+ From from -> brackets s . sitcc $ do
764693 located from p_hsExpr
765694 breakpoint
766695 txt ".."
767− FromThen from next -> brackets s $ do
768− sep commaDel (located' p_hsExpr) [from, next]
696+ FromThen from next -> brackets s . sitcc $ do
697+ sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
769698 breakpoint
770699 txt ".."
771− FromTo from to -> brackets s $ do
700+ FromTo from to -> brackets s . sitcc $ do
772701 located from p_hsExpr
773702 breakpoint
774703 txt ".."
775704 space
776705 located to p_hsExpr
777− FromThenTo from next to -> brackets s $ do
778− sep commaDel (located' p_hsExpr) [from, next]
706+ FromThenTo from next to -> brackets s . sitcc $ do
707+ sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
779708 breakpoint
780709 txt ".."
781710 space
782711 located to p_hsExpr
783− HsSCC NoExtField _ name x -> do
712+ HsSCC NoExt _ name x -> do
784713 txt "{-# SCC "
785714 atom name
786715 txt " #-}"
787716 breakpoint
788717 located x p_hsExpr
789− HsCoreAnn NoExtField _ value x -> do
718+ HsCoreAnn NoExt _ value x -> do
790719 txt "{-# CORE "
791720 atom value
792721 txt " #-}"
793722 breakpoint
794723 located x p_hsExpr
795− HsBracket NoExtField x -> p_hsBracket x
724+ HsBracket NoExt x -> p_hsBracket x
796725 HsRnBracketOut {} -> notImplemented "HsRnBracketOut"
797726 HsTcBracketOut {} -> notImplemented "HsTcBracketOut"
798− HsSpliceE NoExtField splice -> p_hsSplice splice
799− HsProc NoExtField p e -> do
727+ HsSpliceE NoExt splice -> p_hsSplice splice
728+ HsProc NoExt p e -> do
800729 txt "proc"
801730 located p $ \x -> do
802731 breakpoint
@@ -805,15 +734,35 @@ p_hsExpr' s = \case
805734 txt "->"
806735 placeHanging (cmdTopPlacement (unLoc e)) $
807736 located e p_hsCmdTop
808− HsStatic _ e -> do
737+ HsStatic _ e -> do
809738 txt "static"
810739 breakpoint
811740 inci (located e p_hsExpr)
741+ HsArrApp NoExt body input arrType cond ->
742+ p_hsCmd (HsCmdArrApp NoExt body input arrType cond)
743+ HsArrForm NoExt form mfixity cmds ->
744+ p_hsCmd (HsCmdArrForm NoExt form Prefix mfixity cmds)
812745 HsTick {} -> notImplemented "HsTick"
813746 HsBinTick {} -> notImplemented "HsBinTick"
814747 HsTickPragma {} -> notImplemented "HsTickPragma"
748+ -- These four constructs should never appear in correct programs.
749+ -- See: https://github.com/tweag/ormolu/issues/343
750+ EWildPat NoExt -> txt "_"
751+ EAsPat NoExt n p -> do
752+ p_rdrName n
753+ txt "@"
754+ located p p_hsExpr
755+ EViewPat NoExt p e -> do
756+ located p p_hsExpr
757+ space
758+ txt "->"
759+ breakpoint
760+ inci (located e p_hsExpr)
761+ ELazyPat NoExt p -> do
762+ txt "~"
763+ located p p_hsExpr
815764 HsWrap {} -> notImplemented "HsWrap"
816− XExpr x -> noExtCon x
765+ XExpr {} -> notImplemented "XExpr"
817766
818767p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
819768p_patSynBind PSB {..} = do
@@ -824,8 +773,8 @@ p_patSynBind PSB {..} = do
824773 txt "<-"
825774 breakpoint
826775 located psb_def p_pat
827− ImplicitBidirectional -> do
828− equals
776+ ImplicitBidirectional -> do
777+ txt "="
829778 breakpoint
830779 located psb_def p_pat
831780 ExplicitBidirectional mgroup -> do
@@ -841,7 +790,7 @@ p_patSynBind PSB {..} = do
841790 PrefixCon xs -> do
842791 space
843792 p_rdrName psb_id
844− inci $ do
793+ inci $ do
845794 switchLayout (getLoc <$> xs) $ do
846795 unless (null xs) breakpoint
847796 sitcc (sep breakpoint p_rdrName xs)
@@ -852,8 +801,8 @@ p_patSynBind PSB {..} = do
852801 inci $ do
853802 switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
854803 unless (null xs) breakpoint
855− braces N $
856− sep commaDel (p_rdrName . recordPatSynPatVar) xs
804+ braces N . sitcc $
805+ sep (comma >> breakpoint) (p_rdrName . recordPatSynPatVar) xs
857806 rhs
858807 InfixCon l r -> do
859808 switchLayout [getLoc l, getLoc r] $ do
@@ -865,98 +814,33 @@ p_patSynBind PSB {..} = do
865814 space
866815 p_rdrName r
867816 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)
817+p_patSynBind (XPatSynBind NoExt) = notImplemented "XPatSynBind"
934818
935819p_pat :: Pat GhcPs -> R ()
936820p_pat = \case
937− WildPat NoExtField -> txt "_"
938− VarPat NoExtField name -> p_rdrName name
939− LazyPat NoExtField pat -> do
821+ WildPat NoExt -> txt "_"
822+ VarPat NoExt name -> p_rdrName name
823+ LazyPat NoExt pat -> do
940824 txt "~"
941825 located pat p_pat
942− AsPat NoExtField name pat -> do
826+ AsPat NoExt name pat -> do
943827 p_rdrName name
944828 txt "@"
945829 located pat p_pat
946− ParPat NoExtField pat ->
830+ ParPat NoExt pat ->
947831 located pat (parens S . p_pat)
948− BangPat NoExtField pat -> do
832+ BangPat NoExt pat -> do
949833 txt "!"
950834 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' =
835+ ListPat NoExt pats -> do
836+ brackets S . sitcc $ sep (comma >> breakpoint) (located' p_pat) pats
837+ TuplePat NoExt pats boxing -> do
838+ let f =
955839 case boxing of
956840 Boxed -> parens S
957841 Unboxed -> parensHash S
958− parens' $ sep commaDel (sitcc . located' p_pat) pats
959− SumPat NoExtField pat tag arity ->
842+ f . sitcc $ sep (comma >> breakpoint) (sitcc . located' p_pat) pats
843+ SumPat NoExt pat tag arity ->
960844 p_unboxedSum S tag arity (located pat p_pat)
961845 ConPatIn pat details ->
962846 case details of
@@ -971,40 +855,38 @@ p_pat = \case
971855 let f = \case
972856 Nothing -> txt ".."
973857 Just x -> located x p_pat_hsRecField
974− inci . braces N . sep commaDel f $
858+ inci . braces N . sitcc . sep (comma >> breakpoint) f $
975859 case dotdot of
976860 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
861+ Just n -> (Just <$> take n fields) ++ [Nothing]
862+ InfixCon x y -> do
863+ located x p_pat
864+ space
865+ p_rdrName pat
866+ breakpoint
867+ inci (located y p_pat)
986868 ConPatOut {} -> notImplemented "ConPatOut" -- presumably created by renamer?
987− ViewPat NoExtField expr pat -> sitcc $ do
869+ ViewPat NoExt expr pat -> sitcc $ do
988870 located expr p_hsExpr
989871 space
990872 txt "->"
991873 breakpoint
992874 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
875+ SplicePat NoExt splice -> p_hsSplice splice
876+ LitPat NoExt p -> atom p
877+ NPat NoExt v _ _ -> located v (atom . ol_val)
878+ NPlusKPat NoExt n k _ _ _ -> sitcc $ do
997879 p_rdrName n
998880 breakpoint
999881 inci $ do
1000882 txt "+"
1001883 space
1002884 located k (atom . ol_val)
1003− SigPat NoExtField pat hswc -> do
885+ SigPat hswc pat -> do
1004886 located pat p_pat
1005887 p_typeAscription hswc
1006888 CoPat {} -> notImplemented "CoPat" -- apparently created at some later stage
1007− XPat x -> noExtCon x
889+ XPat NoExt -> notImplemented "XPat"
1008890
1009891p_pat_hsRecField :: HsRecField' (FieldOcc GhcPs) (LPat GhcPs) -> R ()
1010892p_pat_hsRecField HsRecField {..} = do
@@ -1012,7 +894,7 @@ p_pat_hsRecField HsRecField {..} = do
1012894 p_rdrName (rdrNameFieldOcc x)
1013895 unless hsRecPun $ do
1014896 space
1015− equals
897+ txt "="
1016898 breakpoint
1017899 inci (located hsRecFieldArg p_pat)
1018900
@@ -1021,40 +903,38 @@ p_unboxedSum s tag arity m = do
1021903 let before = tag - 1
1022904 after = arity - before - 1
1023905 args = replicate before Nothing <> [Just m] <> replicate after Nothing
1024− f x =
906+ f (x,i) = do
907+ let isFirst = i == 0
908+ isLast = i == arity - 1
1025909 case x :: Maybe (R ()) of
1026910 Nothing ->
1027− space
911+ unless (isFirst || isLast) space
1028912 Just m' -> do
1029− space
913+ unless isFirst space
1030914 m'
1031− space
1032− parensHash s $ sep (txt "|") f args
915+ unless isLast space
916+ parensHash s $ sep (txt "|") f (zip args [0..])
1033917
1034918p_hsSplice :: HsSplice GhcPs -> R ()
1035919p_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
920+ HsTypedSplice NoExt deco _ expr -> p_hsSpliceTH True expr deco
921+ HsUntypedSplice NoExt deco _ expr -> p_hsSpliceTH False expr deco
922+ HsQuasiQuote NoExt _ quoterName srcSpan str -> do
1039923 txt "["
1040924 p_rdrName (L srcSpan quoterName)
1041925 txt "|"
1042− -- QuasiQuoters often rely on precise custom strings. We cannot do any
1043− -- formatting here without potentially breaking someone's code.
926+ -- NOTE QuasiQuoters often rely on precise custom strings. We cannot do
927+ -- any formatting here without potentially breaking someone's code.
1044928 atom str
1045929 txt "|]"
1046930 HsSpliced {} -> notImplemented "HsSpliced"
1047− HsSplicedT {} -> notImplemented "HsSplicedT"
1048− XSplice x -> noExtCon x
1049−
1050−p_hsSpliceTH ::
1051− -- | Typed splice?
1052− Bool ->
1053− -- | Splice expression
1054− LHsExpr GhcPs ->
1055− -- | Splice decoration
1056− SpliceDecoration ->
1057− R ()
931+ XSplice {} -> notImplemented "XSplice"
932+
933+p_hsSpliceTH
934+ :: Bool -- ^ Typed splice?
935+ -> LHsExpr GhcPs -- ^ Splice expression
936+ -> SpliceDecoration -- ^ Splice decoration
937+ -> R ()
1058938p_hsSpliceTH isTyped expr = \case
1059939 HasParens -> do
1060940 txt decoSymbol
@@ -1069,17 +949,17 @@ p_hsSpliceTH isTyped expr = \case
1069949
1070950p_hsBracket :: HsBracket GhcPs -> R ()
1071951p_hsBracket = \case
1072− ExpBr NoExtField expr -> do
952+ ExpBr NoExt expr -> do
1073953 anns <- getEnclosingAnns
1074954 let name = case anns of
1075− AnnOpenEQ : _ -> ""
955+ AnnOpenEQ:_ -> ""
1076956 _ -> "e"
1077957 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
958+ PatBr NoExt pat -> quote "p" (located pat p_pat)
959+ DecBrL NoExt decls -> quote "d" (p_hsDecls Free decls)
960+ DecBrG NoExt _ -> notImplemented "DecBrG" -- result of renamer
961+ TypBr NoExt ty -> quote "t" (located ty p_hsType)
962+ VarBr NoExt isSingleQuote name -> do
1083963 txt (bool "''" "'" isSingleQuote)
1084964 -- HACK As you can see we use 'noLoc' here to be able to pass name into
1085965 -- 'p_rdrName' since the latter expects a "located" thing. The problem
@@ -1087,20 +967,19 @@ p_hsBracket = \case
1087967 -- turn makes it impossible to detect if there are parentheses around
1088968 -- it, etc. So we have to add parentheses manually assuming they are
1089969 -- necessary for all operators.
1090− let isOperator =
1091− all
1092− (\i -> isPunctuation i || isSymbol i)
1093− (showOutputable (rdrNameOcc name))
1094− && not (doesNotNeedExtraParens name)
970+ let isOperator = all
971+ (\i -> isPunctuation i || isSymbol i)
972+ (showOutputable (rdrNameOcc name))
973+ && not (doesNotNeedExtraParens name)
1095974 wrapper = if isOperator then parens N else id
1096975 wrapper $ p_rdrName (noLoc name)
1097− TExpBr NoExtField expr -> do
976+ TExpBr NoExt expr -> do
1098977 txt "[||"
1099978 breakpoint'
1100979 located expr p_hsExpr
1101980 breakpoint'
1102981 txt "||]"
1103− XBracket x -> noExtCon x
982+ XBracket {} -> notImplemented "XBracket"
1104983 where
1105984 quote :: Text -> R () -> R ()
1106985 quote name body = do
@@ -1124,47 +1003,50 @@ p_stringLit src =
11241003 multiLine =
11251004 sitcc $ sep breakpoint (txt . Text.pack) (backslashes s)
11261005 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 '\'
1006+ where
1007+ -- Split a string on gaps (backslash delimited whitespaces)
1008+ --
1009+ -- > splitGaps "bar\\ \\fo\\&o" == ["bar", "fo\\&o"]
1010+ splitGaps :: String -> [String]
1011+ splitGaps "" = []
1012+ splitGaps s =
1013+ let -- A backslash and a whitespace starts a "gap"
1014+ p (Just '\\', _, _) = True
1015+ p (_, '\\', Just c) | ghcSpace c = False
1016+ p _ = True
1017+ in case span p (zipPrevNext s) of
1018+ (l, r) ->
1019+ let -- drop the initial '\', any amount of 'ghcSpace', and another '\'
11411020 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
1021+ in map orig l : splitGaps r'
1022+
1023+ -- GHC's definition of whitespaces in strings
1024+ -- See: https://gitlab.haskell.org/ghc/ghc/blob/86753475/compiler/parser/Lexer.x#L1653
1025+ ghcSpace :: Char -> Bool
1026+ ghcSpace c = c <= '\x7f' && is_space c
1027+
1028+ -- Add backslashes to the inner side of the strings
1029+ --
1030+ -- > backslashes ["a", "b", "c"] == ["a\\", "\\b\\", "\\c"]
1031+ backslashes :: [String] -> [String]
1032+ backslashes (x:y:xs) = (x ++ "\\") : backslashes (('\\' : y) : xs)
1033+ backslashes xs = xs
1034+
1035+ -- Attaches previous and next items to each list element
1036+ zipPrevNext :: [a] -> [(Maybe a, a, Maybe a)]
1037+ zipPrevNext xs =
1038+ let z = zip (zip (Nothing : map Just xs) xs)
1039+ (map Just (tail xs) ++ repeat Nothing)
1040+ in map (\((p, x), n) -> (p, x, n)) z
1041+
1042+ orig (_, x, _) = x
11621043
11631044----------------------------------------------------------------------------
11641045-- Helpers
11651046
11661047-- | Return the wrapping function controlling the use of braces according to
11671048-- the current layout.
1049+
11681050layoutToBraces :: Layout -> R () -> R ()
11691051layoutToBraces = \case
11701052 SingleLine -> useBraces
@@ -1172,6 +1054,7 @@ layoutToBraces = \case
11721054
11731055-- | Append each element in both lists with semigroups. If one list is shorter
11741056-- than the other, return the rest of the longer list unchanged.
1057+
11751058liftAppend :: Semigroup a => [a] -> [a] -> [a]
11761059liftAppend [] [] = []
11771060liftAppend [] (y : ys) = y : ys
@@ -1179,13 +1062,14 @@ liftAppend (x : xs) [] = x : xs
11791062liftAppend (x : xs) (y : ys) = x <> y : liftAppend xs ys
11801063
11811064getGRHSSpan :: GRHS GhcPs (Located body) -> SrcSpan
1182−getGRHSSpan (GRHS NoExtField guards body) =
1065+getGRHSSpan (GRHS NoExt guards body) =
11831066 combineSrcSpans' $ getLoc body :| map getLoc guards
1184−getGRHSSpan (XGRHS x) = noExtCon x
1067+getGRHSSpan (XGRHS NoExt) = notImplemented "XGRHS"
11851068
11861069-- | Place a thing that may have a hanging form. This function handles how
11871070-- to separate it from preceding expressions and whether to bump indentation
11881071-- depending on what sort of expression we have.
1072+
11891073placeHanging :: Placement -> R () -> R ()
11901074placeHanging placement m =
11911075 case placement of
@@ -1198,92 +1082,92 @@ placeHanging placement m =
11981082
11991083-- | Check if given block contains single expression which has a hanging
12001084-- form.
1201−blockPlacement ::
1202− (body -> Placement) ->
1203− [LGRHS GhcPs (Located body)] ->
1204− Placement
1205−blockPlacement placer [L _ (GRHS NoExtField _ (L _ x))] = placer x
1085+
1086+blockPlacement
1087+ :: (body -> Placement)
1088+ -> [LGRHS GhcPs (Located body)]
1089+ -> Placement
1090+blockPlacement placer [(L _ (GRHS NoExt _ (L _ x)))] = placer x
12061091blockPlacement _ _ = Normal
12071092
12081093-- | Check if given command has a hanging form.
1094+
12091095cmdPlacement :: HsCmd GhcPs -> Placement
12101096cmdPlacement = \case
1211− HsCmdLam NoExtField _ -> Hanging
1212− HsCmdCase NoExtField _ _ -> Hanging
1213− HsCmdDo NoExtField _ -> Hanging
1097+ HsCmdLam NoExt _ -> Hanging
1098+ HsCmdCase NoExt _ _ -> Hanging
1099+ HsCmdDo NoExt _ -> Hanging
12141100 _ -> Normal
12151101
12161102cmdTopPlacement :: HsCmdTop GhcPs -> Placement
12171103cmdTopPlacement = \case
1218− HsCmdTop NoExtField (L _ x) -> cmdPlacement x
1219− XCmdTop x -> noExtCon x
1104+ HsCmdTop NoExt (L _ x) -> cmdPlacement x
1105+ XCmdTop {} -> notImplemented "XCmdTop"
12201106
12211107-- | Check if given expression has a hanging form.
1108+
12221109exprPlacement :: HsExpr GhcPs -> Placement
12231110exprPlacement = \case
12241111 -- 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
1112+ HsLam NoExt mg -> case mg of
1113+ MG _ (L _ [L _ (Match NoExt _ (x:xs) _)]) _
1114+ | isOneLineSpan (combineSrcSpans' $ fmap getLoc (x :| xs))
1115+ -> Hanging
12291116 _ -> 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 _ ->
1117+ HsLamCase NoExt _ -> Hanging
1118+ HsCase NoExt _ _ -> Hanging
1119+ HsDo NoExt DoExpr _ -> Hanging
1120+ HsDo NoExt MDoExpr _ -> Hanging
1121+ RecordCon NoExt _ _ -> Hanging
1122+ -- If the rightmost expression in an operator chain is hanging, make the
1123+ -- whole block hanging; so that we can use the common @f = foo $ do@
1124+ -- style.
1125+ OpApp NoExt _ _ y -> exprPlacement (unLoc y)
1126+ -- Same thing for function applications (usually with -XBlockArguments)
1127+ HsApp NoExt _ y -> exprPlacement (unLoc y)
1128+ HsProc NoExt (L s _) _ ->
12401129 -- Indentation breaks if pattern is longer than one line and left
12411130 -- hanging. Consequently, only apply hanging when it is safe.
1242− if isOneLineSpan (getLoc p)
1243− then Hanging
1244− else Normal
1131+ if isOneLineSpan s
1132+ then Hanging
1133+ else Normal
12451134 _ -> Normal
12461135
12471136withGuards :: [LGRHS GhcPs (Located body)] -> Bool
12481137withGuards = any (checkOne . unLoc)
12491138 where
12501139 checkOne :: GRHS GhcPs (Located body) -> Bool
1251− checkOne (GRHS NoExtField [] _) = False
1140+ checkOne (GRHS NoExt [] _) = False
12521141 checkOne _ = True
12531142
12541143exprOpTree :: LHsExpr GhcPs -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs)
1255−exprOpTree (L _ (OpApp NoExtField x op y)) = OpBranch (exprOpTree x) op (exprOpTree y)
1144+exprOpTree (L _ (OpApp NoExt x op y)) = OpBranch (exprOpTree x) op (exprOpTree y)
12561145exprOpTree n = OpNode n
12571146
12581147getOpName :: HsExpr GhcPs -> Maybe RdrName
12591148getOpName = \case
1260− HsVar NoExtField (L _ a) -> Just a
1149+ HsVar NoExt (L _ a) -> Just a
12611150 _ -> Nothing
12621151
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 ()
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
1275− -- placement.
1152+p_exprOpTree
1153+ :: Bool -- ^ Can use special handling of dollar?
1154+ -> BracketStyle -- ^ Bracket style to use
1155+ -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs)
1156+ -> R ()
1157+p_exprOpTree _ s (OpNode x) = located x (p_hsExpr' s)
1158+p_exprOpTree isDollarSpecial s (OpBranch x op y) = do
1159+ -- NOTE If the beginning of the first argument and the second argument
1160+ -- are on the same line, and the second argument has a hanging form, use
1161+ -- hanging placement.
12761162 let placement =
12771163 if isOneLineSpan
1278− (mkSrcSpan (srcSpanStart (opTreeLoc x)) (srcSpanStart (opTreeLoc y)))
1164+ (mkSrcSpan (srcSpanStart (opTreeLoc x)) (srcSpanStart (opTreeLoc y)))
12791165 then case y of
1280− OpNode (L _ n) -> exprPlacement n
1281− _ -> Normal
1166+ OpNode (L _ n) -> exprPlacement n
1167+ _ -> Normal
12821168 else Normal
1283− -- Distinguish holes used in infix notation.
1284− -- eg. '1 _foo 2' and '1 `_foo` 2'
12851169 opWrapper = case unLoc op of
1286− HsUnboundVar NoExtField _ -> backticks
1170+ EWildPat NoExt -> backticks
12871171 _ -> id
12881172 layout <- getLayout
12891173 let ub = case layout of
@@ -1291,72 +1175,30 @@ p_exprOpTree s (OpBranch x op y) = do
12911175 MultiLine -> case placement of
12921176 Hanging -> useBraces
12931177 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
1178+ gotDollar = case getOpName (unLoc op) of
1179+ Just rname -> mkVarOcc "$" == (rdrNameOcc rname)
13091180 _ -> False
1310− useRecordDot' <- useRecordDot
1311− if
1312− | gotColon -> do
1313− lhs
1314− space
1181+ switchLayout [opTreeLoc x] $
1182+ ub $ p_exprOpTree (not gotDollar) s x
1183+ let p_op = located op (opWrapper . p_hsExpr)
1184+ p_y = switchLayout [opTreeLoc y] (p_exprOpTree True N y)
1185+ if isDollarSpecial && gotDollar && placement == Normal && isOneLineSpan (opTreeLoc x)
1186+ then do
1187+ space
1188+ p_op
1189+ breakpoint
1190+ inci p_y
1191+ else
1192+ placeHanging placement $ do
13151193 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
13271194 space
1328− p_op
1329− breakpoint
1330− inci p_y
1331− | useRecordDot' && gotRecordDot -> do
1332− lhs
1333− when isSection space
1334− p_op
13351195 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
13551196
13561197-- | Get annotations for the enclosing element.
1198+
13571199getEnclosingAnns :: R [AnnKeywordId]
13581200getEnclosingAnns = do
13591201 e <- getEnclosingSpan (const True)
13601202 case e of
13611203 Nothing -> return []
1362− Just e' -> getAnns (RealSrcSpan e')
1204+ Just e' -> getAnns (RealSrcSpan e')