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