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