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