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