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