@@ -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,26 +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)
28+import qualified Data.Text as Text
25−import OccName (mkVarOcc)
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 (RdrName (..))
33−import RdrName (rdrNameOcc)
34−import SrcLoc (combineSrcSpans, isOneLineSpan)
35−import qualified Data.List.NonEmpty as NE
36−import qualified Data.Text as Text
37−import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
39-- | Style of a group of equations.
40-- | Style of a group of equations.
41data MatchGroupStyle
41data MatchGroupStyle
42 = Function (Located RdrName)
42 = Function (Located RdrName)
43 | PatternBind
43 | PatternBind
@@ -46,57 +46,61 @@ data MatchGroupStyle
46 | LambdaCase
46 | LambdaCase
48-- | Style of equations in a group.
48-- | Style of equations in a group.
50data GroupStyle
49data GroupStyle
51 = EqualSign
50 = EqualSign
52 | RightArrow
51 | RightArrow
54-- | Expression placement. This marks the places where expressions that
53-- | Expression placement. This marks the places where expressions that
55-- implement handing forms may use them.
54-- implement handing forms may use them.
57data Placement
55data Placement
58− = Normal -- ^ Multi-line layout should cause
56+ = -- | Multi-line layout should cause
59− -- insertion of a newline and indentation
57+ -- insertion of a newline and indentation
61− | Hanging -- ^ Expressions that have hanging form
60+ | -- | Expressions that have hanging form
62− -- should use it and avoid bumping one level
61+ -- should use it and avoid bumping one level
63− -- of indentation
62+ -- of indentation
64− deriving (Eq)
64+ deriving (Eq, Show)
66p_valDecl :: HsBindLR GhcPs GhcPs -> R ()
66p_valDecl :: HsBindLR GhcPs GhcPs -> R ()
67p_valDecl = \case
67p_valDecl = \case
68− FunBind NoExt funId funMatches _ _ -> p_funBind funId funMatches
68+ FunBind NoExtField funId funMatches _ _ -> p_funBind funId funMatches
69− PatBind NoExt pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
69+ PatBind NoExtField pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
70 VarBind {} -> notImplemented "VarBinds" -- introduced by the type checker
70 VarBind {} -> notImplemented "VarBinds" -- introduced by the type checker
71 AbsBinds {} -> notImplemented "AbsBinds" -- introduced by the type checker
71 AbsBinds {} -> notImplemented "AbsBinds" -- introduced by the type checker
72− PatSynBind NoExt psb -> p_patSynBind psb
72+ PatSynBind NoExtField psb -> p_patSynBind psb
73− XHsBindsLR NoExt -> notImplemented "XHsBindsLR"
73+ XHsBindsLR x -> noExtCon x
75−p_funBind
75+p_funBind ::
76− :: Located RdrName
76+ Located RdrName ->
77− -> MatchGroup GhcPs (LHsExpr GhcPs)
77+ MatchGroup GhcPs (LHsExpr GhcPs) ->
79p_funBind name = p_matchGroup (Function name)
79p_funBind name = p_matchGroup (Function name)
81−p_matchGroup
81+p_matchGroup ::
82− :: MatchGroupStyle
82+ MatchGroupStyle ->
83− -> MatchGroup GhcPs (LHsExpr GhcPs)
83+ MatchGroup GhcPs (LHsExpr GhcPs) ->
85p_matchGroup = p_matchGroup' exprPlacement p_hsExpr
85p_matchGroup = p_matchGroup' exprPlacement p_hsExpr
87−p_matchGroup'
87+p_matchGroup' ::
88− :: Data body
88+ Data body =>
89− => (body -> Placement) -- ^ How to get body placement
89+ -- | How to get body placement
90+ (body -> Placement) ->
90− -> (body -> R ()) -- ^ How to print body
91+ -- | How to print body
91− -> MatchGroupStyle -- ^ Style of this group of equations
93+ -- | Style of this group of equations
92− -> MatchGroup GhcPs (Located body) -- ^ Match group
96+ MatchGroup GhcPs (Located body) ->
94−p_matchGroup' placer pretty style MG {..} = do
98+p_matchGroup' placer render style MG {..} = do
95 let ob = case style of
99 let ob = case style of
96 Case -> id
100 Case -> id
97 LambdaCase -> id
101 LambdaCase -> id
98 _ -> dontUseBraces
102 _ -> dontUseBraces
99− -- 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
100 -- restore the brace state inside the sepsemi.
104 -- restore the brace state inside the sepsemi.
101 ub <- bool dontUseBraces useBraces <$> canUseBraces
105 ub <- bool dontUseBraces useBraces <$> canUseBraces
102 ob $ sepSemi (located' (ub . p_Match)) (unLoc mg_alts)
106 ob $ sepSemi (located' (ub . p_Match)) (unLoc mg_alts)
@@ -104,14 +108,14 @@ p_matchGroup' placer pretty style MG {..} = do
104 p_Match m@Match {..} =
108 p_Match m@Match {..} =
108 (adjustMatchGroupStyle m style)
112 (adjustMatchGroupStyle m style)
109 (isInfixMatch m)
113 (isInfixMatch m)
110 (matchStrictness m)
114 (matchStrictness m)
113− p_Match _ = notImplemented "XMatch"
117+ p_Match (XMatch x) = noExtCon x
114−p_matchGroup' _ _ _ (XMatchGroup NoExt) = notImplemented "XMatchGroup"
118+p_matchGroup' _ _ _ (XMatchGroup x) = noExtCon x
116-- | Function id obtained through pattern matching on 'FunBind' should not
120-- | Function id obtained through pattern matching on 'FunBind' should not
117-- be used to print the actual equations because the different ‘RdrNames’
121-- be used to print the actual equations because the different ‘RdrNames’
@@ -119,11 +123,10 @@ p_matchGroup' _ _ _ (XMatchGroup NoExt) = notImplemented "XMatchGroup"
119-- 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
120-- names obtained from 'm_ctxt' of 'Match'. This function replaces function
124-- names obtained from 'm_ctxt' of 'Match'. This function replaces function
121-- name inside of 'Function' accordingly.
125-- name inside of 'Function' accordingly.
123−adjustMatchGroupStyle
126+adjustMatchGroupStyle ::
124− :: Match GhcPs body
127+ Match GhcPs body ->
125− -> MatchGroupStyle
128+ MatchGroupStyle ->
126− -> MatchGroupStyle
129+ MatchGroupStyle
127adjustMatchGroupStyle m = \case
130adjustMatchGroupStyle m = \case
128 Function _ -> (Function . mc_fun . m_ctxt) m
131 Function _ -> (Function . mc_fun . m_ctxt) m
129 style -> style
132 style -> style
@@ -131,31 +134,43 @@ adjustMatchGroupStyle m = \case
131matchStrictness :: Match id body -> SrcStrictness
134matchStrictness :: Match id body -> SrcStrictness
132matchStrictness match =
135matchStrictness match =
133 case m_ctxt match of
136 case m_ctxt match of
134− FunRhs{mc_strictness=s} -> s
137+ FunRhs {mc_strictness = s} -> s
135 _ -> NoSrcStrict
138 _ -> NoSrcStrict
137−p_match
140+p_match ::
138− :: MatchGroupStyle -- ^ Style of the group
141+ -- | Style of the group
139− -> Bool -- ^ Is this an infix match?
143+ -- | Is this an infix match?
140− -> SrcStrictness -- ^ Strictness prefix (FunBind)
145+ -- | Strictness prefix (FunBind)
147+ -- | Argument patterns
141− -> [LPat GhcPs] -- ^ Argument patterns
148+ [LPat GhcPs] ->
142− -> GRHSs GhcPs (LHsExpr GhcPs) -- ^ Equations
150+ GRHSs GhcPs (LHsExpr GhcPs) ->
144p_match = p_match' exprPlacement p_hsExpr
152p_match = p_match' exprPlacement p_hsExpr
146−p_match'
154+p_match' ::
147− :: Data body
155+ Data body =>
148− => (body -> Placement) -- ^ How to get body placement
156+ -- | How to get body placement
157+ (body -> Placement) ->
149− -> (body -> R ()) -- ^ How to print body
158+ -- | How to print body
150− -> MatchGroupStyle -- ^ Style of this group of equations
160+ -- | Style of this group of equations
151− -> Bool -- ^ Is this an infix match?
162+ -- | Is this an infix match?
152− -> SrcStrictness -- ^ Strictness prefix (FunBind)
164+ -- | Strictness prefix (FunBind)
166+ -- | Argument patterns
153− -> [LPat GhcPs] -- ^ Argument patterns
167+ [LPat GhcPs] ->
154− -> GRHSs GhcPs (Located body) -- ^ Equations
169+ GRHSs GhcPs (Located body) ->
156−p_match' placer pretty style isInfix strictness m_pats m_grhss = do
171+p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
157− -- 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
158− -- 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
159 -- indented than function name. This in turn means that indentation for
174 -- indented than function name. This in turn means that indentation for
160 -- 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
161 -- 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
@@ -165,23 +180,24 @@ p_match' placer pretty style isInfix strictness m_pats m_grhss = do
165 NoSrcStrict -> return ()
180 NoSrcStrict -> return ()
166 SrcStrict -> txt "!"
181 SrcStrict -> txt "!"
167 SrcLazy -> txt "~"
182 SrcLazy -> txt "~"
168− inci' <- case NE.nonEmpty m_pats of
183+ indentBody <- case NE.nonEmpty m_pats of
169− Nothing -> id <$ case style of
185+ False <$ case style of
170− Function name -> p_rdrName name
186+ Function name -> p_rdrName name
171− _ -> return ()
187+ _ -> return ()
172 Just ne_pats -> do
188 Just ne_pats -> do
173− let combinedSpans = combineSrcSpans' $
189+ let combinedSpans = case style of
190+ Function name -> combineSrcSpans (getLoc name) patSpans
174− getLoc <$> ne_pats
192+ patSpans = combineSrcSpans' (getLoc <$> ne_pats)
175− inci' = if isOneLineSpan combinedSpans
193+ indentBody = not (isOneLineSpan combinedSpans)
178 switchLayout [combinedSpans] $ do
194 switchLayout [combinedSpans] $ do
179 let stdCase = sep breakpoint (located' p_pat) m_pats
195 let stdCase = sep breakpoint (located' p_pat) m_pats
180 case style of
196 case style of
181 Function name ->
197 Function name ->
182 p_infixDefHelper
198 p_infixDefHelper
184− inci'
200+ indentBody
185 (p_rdrName name)
201 (p_rdrName name)
186 (located' p_pat <$> m_pats)
202 (located' p_pat <$> m_pats)
187 PatternBind -> stdCase
203 PatternBind -> stdCase
@@ -196,46 +212,40 @@ p_match' placer pretty style isInfix strictness m_pats m_grhss = do
196 when needsSpace space
212 when needsSpace space
197 sitcc stdCase
213 sitcc stdCase
198 LambdaCase -> stdCase
214 LambdaCase -> stdCase
199− return inci'
215+ return indentBody
201− -- 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
202− -- about putting certain constructions in hanging positions.
217+ -- about putting certain constructions in hanging positions.
203− endOfPats = case NE.nonEmpty m_pats of
218+ endOfPats = case NE.nonEmpty m_pats of
204− Nothing -> case style of
219+ Nothing -> case style of
205− Function name -> (Just . srcSpanEnd . getLoc) name
220+ Function name -> Just (getLoc name)
206− _ -> Nothing
221+ _ -> Nothing
207− Just pats -> (Just . srcSpanEnd . getLoc . NE.last) pats
222+ Just pats -> (Just . getLoc . NE.last) pats
208− isCase = \case
223+ isCase = \case
209− Case -> True
224+ Case -> True
210− LambdaCase -> True
225+ LambdaCase -> True
211− _ -> False
226+ _ -> False
212− let GRHSs {..} = m_grhss
213 hasGuards = withGuards grhssGRHSs
227 hasGuards = withGuards grhssGRHSs
214− unless (length grhssGRHSs > 1) $ do
228+ grhssSpan =
216− Function _ | hasGuards -> return ()
217− Function _ -> space >> txt "="
218− PatternBind -> space >> txt "="
219− s | isCase s && hasGuards -> return ()
220− _ -> space >> txt "->"
221− let grhssSpan = combineSrcSpans' $
229+ combineSrcSpans' $
222− getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
230+ getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
223− patGrhssSpan = maybe grhssSpan
231+ patGrhssSpan =
224− (combineSrcSpans grhssSpan . srcLocSpan) endOfPats
234+ (combineSrcSpans grhssSpan . srcLocSpan . srcSpanEnd)
225 placement =
236 placement =
226 case endOfPats of
237 case endOfPats of
227 Nothing -> blockPlacement placer grhssGRHSs
238 Nothing -> blockPlacement placer grhssGRHSs
228 Just spn ->
239 Just spn ->
230− (mkSrcSpan spn (srcSpanStart grhssSpan))
240+ if onTheSameLine spn grhssSpan
231 then blockPlacement placer grhssGRHSs
241 then blockPlacement placer grhssGRHSs
232 else Normal
242 else Normal
233 p_body = do
243 p_body = do
234 let groupStyle =
244 let groupStyle =
235 if isCase style && hasGuards
245 if isCase style && hasGuards
236− then RightArrow
246+ then RightArrow
237− else EqualSign
247+ else EqualSign
238− sep newline (located' (p_grhs' placer pretty groupStyle)) grhssGRHSs
248+ sep newline (located' (p_grhs' placer render groupStyle)) grhssGRHSs
239 p_where = do
249 p_where = do
240 let whereIsEmpty = GHC.isEmptyLocalBindsPR (unLoc grhssLocalBinds)
250 let whereIsEmpty = GHC.isEmptyLocalBindsPR (unLoc grhssLocalBinds)
241 unless (GHC.eqEmptyLocalBinds (unLoc grhssLocalBinds)) $ do
251 unless (GHC.eqEmptyLocalBinds (unLoc grhssLocalBinds)) $ do
@@ -243,150 +253,178 @@ p_match' placer pretty style isInfix strictness m_pats m_grhss = do
243 txt "where"
253 txt "where"
244 unless whereIsEmpty breakpoint
254 unless whereIsEmpty breakpoint
245 inci $ located grhssLocalBinds p_hsLocalBinds
255 inci $ located grhssLocalBinds p_hsLocalBinds
246− 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 "->"
247 switchLayout [patGrhssSpan] $
264 switchLayout [patGrhssSpan] $
248 placeHanging placement p_body
265 placeHanging placement p_body
249 inci p_where
266 inci p_where
267+p_match' _ _ _ _ _ _ (XGRHSs x) = noExtCon x
251p_grhs :: GroupStyle -> GRHS GhcPs (LHsExpr GhcPs) -> R ()
269p_grhs :: GroupStyle -> GRHS GhcPs (LHsExpr GhcPs) -> R ()
252p_grhs = p_grhs' exprPlacement p_hsExpr
270p_grhs = p_grhs' exprPlacement p_hsExpr
254−p_grhs'
272+p_grhs' ::
255− :: Data body
273+ Data body =>
256− => (body -> Placement) -- ^ How to get body placement
274+ -- | How to get body placement
275+ (body -> Placement) ->
257− -> (body -> R ()) -- ^ How to print body
276+ -- | How to print body
258− -> GroupStyle
278+ GroupStyle ->
259− -> GRHS GhcPs (Located body)
279+ GRHS GhcPs (Located body) ->
261−p_grhs' placer pretty style (GRHS NoExt guards body) =
281+p_grhs' placer render style (GRHS NoExtField guards body) =
262 case guards of
282 case guards of
263 [] -> p_body
283 [] -> p_body
267− sitcc (sep (comma >> breakpoint) (sitcc . located' p_stmt) xs)
287+ sitcc (sep commaDel (sitcc . located' p_stmt) xs)
269− txt $ case style of
289+ inci $ case style of
270− EqualSign -> "="
290+ EqualSign -> equals
271− RightArrow -> "->"
291+ RightArrow -> txt "->"
272 placeHanging placement p_body
292 placeHanging placement p_body
274 placement =
294 placement =
275 case endOfGuards of
295 case endOfGuards of
276 Nothing -> placer (unLoc body)
296 Nothing -> placer (unLoc body)
277 Just spn ->
297 Just spn ->
278− if isOneLineSpan (mkSrcSpan spn (srcSpanStart (getLoc body)))
298+ if onTheSameLine spn (getLoc body)
279− then placer (unLoc body)
299+ then placer (unLoc body)
280− else Normal
300+ else Normal
281 endOfGuards =
301 endOfGuards =
282 case NE.nonEmpty guards of
302 case NE.nonEmpty guards of
283 Nothing -> Nothing
303 Nothing -> Nothing
284− Just gs -> (Just . srcSpanEnd . getLoc . NE.last) gs
304+ Just gs -> (Just . getLoc . NE.last) gs
285− p_body = located body pretty
305+ p_body = located body render
286−p_grhs' _ _ _ (XGRHS NoExt) = notImplemented "XGRHS"
306+p_grhs' _ _ _ (XGRHS x) = noExtCon x
288p_hsCmd :: HsCmd GhcPs -> R ()
308p_hsCmd :: HsCmd GhcPs -> R ()
289p_hsCmd = \case
309p_hsCmd = \case
290− HsCmdArrApp NoExt body input arrType _ -> do
310+ HsCmdArrApp NoExtField body input arrType _ -> do
291 located body p_hsExpr
311 located body p_hsExpr
292− space
312+ breakpoint
293− case arrType of
314+ case arrType of
294− HsFirstOrderApp -> txt "-<"
315+ HsFirstOrderApp -> txt "-<"
295− HsHigherOrderApp -> txt "-<<"
316+ HsHigherOrderApp -> txt "-<<"
296− placeHanging (exprPlacement (unLoc input)) $
317+ placeHanging (exprPlacement (unLoc input)) $
297− located input p_hsExpr
318+ located input p_hsExpr
298− HsCmdArrForm NoExt form Prefix _ cmds -> banana $ sitcc $ do
319+ HsCmdArrForm NoExtField form Prefix _ cmds -> banana $ do
299 located form p_hsExpr
320 located form p_hsExpr
300 unless (null cmds) $ do
321 unless (null cmds) $ do
301 breakpoint
322 breakpoint
302 inci (sequence_ (intersperse breakpoint (located' p_hsCmdTop <$> cmds)))
323 inci (sequence_ (intersperse breakpoint (located' p_hsCmdTop <$> cmds)))
303− HsCmdArrForm NoExt form Infix _ [left, right] -> do
324+ HsCmdArrForm NoExtField form Infix _ [left, right] -> do
304 located left p_hsCmdTop
325 located left p_hsCmdTop
306 located form p_hsExpr
327 located form p_hsExpr
307 placeHanging (cmdTopPlacement (unLoc right)) $
328 placeHanging (cmdTopPlacement (unLoc right)) $
308 located right p_hsCmdTop
329 located right p_hsCmdTop
309− HsCmdArrForm NoExt _ Infix _ _ -> notImplemented "HsCmdArrForm"
330+ HsCmdArrForm NoExtField _ Infix _ _ -> notImplemented "HsCmdArrForm"
310 HsCmdApp {} ->
331 HsCmdApp {} ->
311 -- 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
312 -- 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.
313 notImplemented "HsCmdApp"
334 notImplemented "HsCmdApp"
314− HsCmdLam NoExt mgroup -> p_matchGroup' cmdPlacement p_hsCmd Lambda mgroup
335+ HsCmdLam NoExtField mgroup -> p_matchGroup' cmdPlacement p_hsCmd Lambda mgroup
315− HsCmdPar NoExt c -> parens N (located c p_hsCmd)
336+ HsCmdPar NoExtField c -> parens N (located c p_hsCmd)
316− HsCmdCase NoExt e mgroup -> do
337+ HsCmdCase NoExtField e mgroup ->
323− inci (p_matchGroup' cmdPlacement p_hsCmd Case mgroup)
338+ p_case cmdPlacement p_hsCmd e mgroup
324− HsCmdIf NoExt _ if' then' else' -> do
339+ HsCmdIf NoExtField _ if' then' else' ->
325− txt "if"
340+ p_if cmdPlacement p_hsCmd if' then' else'
327− located if' p_hsExpr
330− located then' $ \x -> do
335− located else' $ \x -> do
338− HsCmdLet NoExt localBinds c -> do
341+ HsCmdLet NoExtField localBinds c ->
339− txt "let"
342+ p_let p_hsCmd localBinds c
341− sitcc (located localBinds p_hsLocalBinds)
343− vlayout space (newline >> txt " ")
346− sitcc (located c p_hsCmd)
347− HsCmdDo NoExt es -> do
343+ HsCmdDo NoExtField es -> do
350− inci (located es (sitcc . sep newline (located' (sitcc . p_stmt' p_hsCmd))))
347+ sitcc . sep newline (sitcc . withSpacing (p_stmt' cmdPlacement p_hsCmd))
351 HsCmdWrap {} -> notImplemented "HsCmdWrap"
348 HsCmdWrap {} -> notImplemented "HsCmdWrap"
352− XCmd {} -> notImplemented "XCmd"
349+ XCmd x -> noExtCon x
354p_hsCmdTop :: HsCmdTop GhcPs -> R ()
351p_hsCmdTop :: HsCmdTop GhcPs -> R ()
355p_hsCmdTop = \case
352p_hsCmdTop = \case
356− HsCmdTop NoExt cmd -> located cmd p_hsCmd
353+ HsCmdTop NoExtField cmd -> located cmd p_hsCmd
357− 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)
359p_stmt :: Stmt GhcPs (LHsExpr GhcPs) -> R ()
385p_stmt :: Stmt GhcPs (LHsExpr GhcPs) -> R ()
360−p_stmt = p_stmt' p_hsExpr
386+p_stmt = p_stmt' exprPlacement p_hsExpr
362−p_stmt'
388+p_stmt' ::
363− :: Data body
389+ Data body =>
364− => (body -> R ())
391+ (body -> Placement) ->
394+ -- | Statement to render
365− -> Stmt GhcPs (Located body)
395+ Stmt GhcPs (Located body) ->
367−p_stmt' pretty = \case
397+p_stmt' placer render = \case
368− LastStmt NoExt body _ _ -> located body pretty
398+ LastStmt NoExtField body _ _ -> located body render
369− BindStmt NoExt l f _ _ -> do
399+ BindStmt NoExtField p f _ _ -> do
370− located l p_pat
400+ located p p_pat
373− breakpoint
403+ let loc = getLoc p
374− inci (located f pretty)
404+ placement =
408+ (mkSrcSpan (srcSpanEnd loc) (srcSpanStart l'))
411+ switchLayout [loc, getLoc f] $
412+ placeHanging placement (located f render)
375 ApplicativeStmt {} -> notImplemented "ApplicativeStmt" -- generated by renamer
413 ApplicativeStmt {} -> notImplemented "ApplicativeStmt" -- generated by renamer
376− BodyStmt NoExt body _ _ -> located body pretty
414+ BodyStmt NoExtField body _ _ -> located body render
377− LetStmt NoExt binds -> do
415+ LetStmt NoExtField binds -> do
378 txt "let"
416 txt "let"
380 sitcc $ located binds p_hsLocalBinds
418 sitcc $ located binds p_hsLocalBinds
381 ParStmt {} ->
419 ParStmt {} ->
382− -- NOTE 'ParStmt' should always be eliminated in 'gatherStmt' already,
420+ -- 'ParStmt' should always be eliminated in 'gatherStmt' already, such
383− -- such that it never occurs in 'p_stmt''. Consequently, handling it
421+ -- that it never occurs in 'p_stmt''. Consequently, handling it here
384− -- here would be redundant.
422+ -- would be redundant.
385 notImplemented "ParStmt"
423 notImplemented "ParStmt"
386− TransStmt {..} -> do
424+ TransStmt {..} ->
387− -- NOTE 'TransStmt' only needs to account for pretty printing itself,
425+ -- 'TransStmt' only needs to account for render printing itself, since
388− -- since pretty printing of relevant statements (e.g., in 'trS_stmts')
426+ -- pretty printing of relevant statements (e.g., in 'trS_stmts') is
389− -- is handled through 'gatherStmt'.
427+ -- handled through 'gatherStmt'.
390 case (trS_form, trS_by) of
428 case (trS_form, trS_by) of
391 (ThenForm, Nothing) -> do
429 (ThenForm, Nothing) -> do
392 txt "then"
430 txt "then"
@@ -415,11 +453,11 @@ p_stmt' pretty = \case
415 RecStmt {..} -> do
453 RecStmt {..} -> do
416 txt "rec"
454 txt "rec"
418− sitcc $ sepSemi (located' (p_stmt' pretty)) recS_stmts
456+ sitcc $ sepSemi (withSpacing (p_stmt' placer render)) recS_stmts
419− XStmtLR {} -> notImplemented "XStmtLR"
457+ XStmtLR c -> noExtCon c
421gatherStmt :: ExprLStmt GhcPs -> [[ExprLStmt GhcPs]]
459gatherStmt :: ExprLStmt GhcPs -> [[ExprLStmt GhcPs]]
422−gatherStmt (L _ (ParStmt NoExt block _ _)) =
460+gatherStmt (L _ (ParStmt NoExtField block _ _)) =
423 foldr ((<>) . gatherStmtBlock) [] block
461 foldr ((<>) . gatherStmtBlock) [] block
424gatherStmt (L s stmt@TransStmt {..}) =
462gatherStmt (L s stmt@TransStmt {..}) =
425 foldr liftAppend [] ((gatherStmt <$> trS_stmts) <> pure [[L s stmt]])
463 foldr liftAppend [] ((gatherStmt <$> trS_stmts) <> pure [[L s stmt]])
@@ -428,205 +466,230 @@ gatherStmt stmt = [[stmt]]
428gatherStmtBlock :: ParStmtBlock GhcPs GhcPs -> [[ExprLStmt GhcPs]]
466gatherStmtBlock :: ParStmtBlock GhcPs GhcPs -> [[ExprLStmt GhcPs]]
429gatherStmtBlock (ParStmtBlock _ stmts _ _) =
467gatherStmtBlock (ParStmtBlock _ stmts _ _) =
430 foldr (liftAppend . gatherStmt) [] stmts
468 foldr (liftAppend . gatherStmt) [] stmts
431−gatherStmtBlock XParStmtBlock {} = notImplemented "XParStmtBlock"
469+gatherStmtBlock (XParStmtBlock x) = noExtCon x
433p_hsLocalBinds :: HsLocalBindsLR GhcPs GhcPs -> R ()
471p_hsLocalBinds :: HsLocalBindsLR GhcPs GhcPs -> R ()
434p_hsLocalBinds = \case
472p_hsLocalBinds = \case
435− HsValBinds NoExt (ValBinds NoExt bag lsigs) -> do
473+ HsValBinds NoExtField (ValBinds NoExtField bag lsigs) -> do
436− let ssStart = either
437− (srcSpanStart . getLoc)
438− (srcSpanStart . getLoc)
440− (Left <$> bagToList bag) ++ (Right <$> lsigs)
441− p_item (Left x) = located x p_valDecl
442− p_item (Right x) = located x p_sigDecl
443− -- Assigns 'False' to the last element, 'True' to the rest.
444− markInit :: [a] -> [(Bool, a)]
446− markInit (x:[]) = [(False, x)]
447− markInit (x:xs) = (True, x) : markInit xs
448− -- 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
449 -- elements will also contain semicolons and they will confuse the
475 -- elements will also contain semicolons and they will confuse the
450 -- parser. so we request braces around every element except the last.
476 -- parser. so we request braces around every element except the last.
451 br <- layoutToBraces <$> getLayout
477 br <- layoutToBraces <$> getLayout
452− sitcc $ sepSemi
478+ let items =
453− (\(m, i) -> (if m then br else id) $ p_item i)
479+ let injectLeft (L l x) = L l (Left x)
454− (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)
455− HsValBinds NoExt _ -> notImplemented "HsValBinds"
492+ HsValBinds NoExtField _ -> notImplemented "HsValBinds"
456− HsIPBinds NoExt (IPBinds NoExt xs) ->
493+ HsIPBinds NoExtField (IPBinds NoExtField xs) ->
457 -- Second argument of IPBind is always Left before type-checking.
494 -- Second argument of IPBind is always Left before type-checking.
458− let p_ipBind (IPBind NoExt (Left name) expr) = do
495+ let p_ipBind (IPBind NoExtField (Left name) expr) = do
459 atom name
496 atom name
462 breakpoint
499 breakpoint
463 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
464− p_ipBind _ = notImplemented "XHsIPBinds"
503+ notImplemented "IPBind _ (Right _) _"
504+ p_ipBind (XIPBind x) = noExtCon x
465 in sepSemi (located' p_ipBind) xs
505 in sepSemi (located' p_ipBind) xs
466− HsIPBinds NoExt _ -> notImplemented "HsIpBinds"
506+ HsIPBinds NoExtField _ -> notImplemented "HsIpBinds"
467− EmptyLocalBinds NoExt -> return ()
507+ EmptyLocalBinds NoExtField -> return ()
468− XHsLocalBindsLR _ -> notImplemented "XHsLocalBindsLR"
508+ XHsLocalBindsLR x -> noExtCon x
470−p_hsRecField
510+p_hsRecField ::
471− :: HsRecField' RdrName (LHsExpr GhcPs)
511+ HsRecField' RdrName (LHsExpr GhcPs) ->
473−p_hsRecField = \HsRecField {..} -> do
513+p_hsRecField HsRecField {..} = do
474 p_rdrName hsRecFieldLbl
514 p_rdrName hsRecFieldLbl
475 unless hsRecPun $ do
515 unless hsRecPun $ do
519+ if onTheSameLine (getLoc hsRecFieldLbl) (getLoc hsRecFieldArg)
478− let placement = exprPlacement (unLoc hsRecFieldArg)
520+ then exprPlacement (unLoc hsRecFieldArg)
479− placeHanging placement $ located hsRecFieldArg p_hsExpr
522+ placeHanging placement (located hsRecFieldArg p_hsExpr)
481−p_hsTupArg :: HsTupArg GhcPs -> R ()
483− Present NoExt x -> located x p_hsExpr
484− Missing NoExt -> pure ()
485− XTupArg {} -> notImplemented "XTupArg"
487p_hsExpr :: HsExpr GhcPs -> R ()
524p_hsExpr :: HsExpr GhcPs -> R ()
488p_hsExpr = p_hsExpr' N
525p_hsExpr = p_hsExpr' N
490p_hsExpr' :: BracketStyle -> HsExpr GhcPs -> R ()
527p_hsExpr' :: BracketStyle -> HsExpr GhcPs -> R ()
491p_hsExpr' s = \case
528p_hsExpr' s = \case
492− HsVar NoExt name -> p_rdrName name
529+ HsVar NoExtField name -> p_rdrName name
493− HsUnboundVar NoExt _ -> notImplemented "HsUnboundVar"
530+ HsUnboundVar NoExtField v -> atom (unboundVarOcc v)
494− HsConLikeOut NoExt _ -> notImplemented "HsConLikeOut"
531+ HsConLikeOut NoExtField _ -> notImplemented "HsConLikeOut"
495− HsRecFld NoExt x ->
532+ HsRecFld NoExtField x ->
496 case x of
533 case x of
497− Unambiguous NoExt name -> p_rdrName name
534+ Unambiguous NoExtField name -> p_rdrName name
498− Ambiguous NoExt name -> p_rdrName name
535+ Ambiguous NoExtField name -> p_rdrName name
499− XAmbiguousFieldOcc NoExt -> notImplemented "XAmbiguousFieldOcc"
536+ XAmbiguousFieldOcc xx -> noExtCon xx
500− HsOverLabel NoExt _ v -> do
537+ HsOverLabel NoExtField _ v -> do
503− HsIPVar NoExt (HsIPName name) -> do
540+ HsIPVar NoExtField (HsIPName name) -> do
505 atom name
542 atom name
506− HsOverLit NoExt v -> atom (ol_val v)
543+ HsOverLit NoExtField v -> atom (ol_val v)
507− HsLit NoExt lit ->
544+ HsLit NoExtField lit ->
508 case lit of
545 case lit of
509 HsString (SourceText stxt) _ -> p_stringLit stxt
546 HsString (SourceText stxt) _ -> p_stringLit stxt
510 HsStringPrim (SourceText stxt) _ -> p_stringLit stxt
547 HsStringPrim (SourceText stxt) _ -> p_stringLit stxt
511 r -> atom r
548 r -> atom r
512− HsLam NoExt mgroup ->
549+ HsLam NoExtField mgroup ->
513 p_matchGroup Lambda mgroup
550 p_matchGroup Lambda mgroup
514− HsLamCase NoExt mgroup -> do
551+ HsLamCase NoExtField mgroup -> do
515 txt "\\case"
552 txt "\\case"
516 breakpoint
553 breakpoint
517 inci (p_matchGroup LambdaCase mgroup)
554 inci (p_matchGroup LambdaCase mgroup)
518− HsApp NoExt f x -> do
555+ HsApp NoExtField f x -> do
519− -- We hang only the last function argument. In order to do
556+ let -- In order to format function applications with multiple parameters
520− -- this, we only call 'placeHanging' on the topmost 'HsApp',
557+ -- nicer, traverse the AST to gather the function and all the
521− -- and then use 'p_withoutHanging' for the descendants.
558+ -- parameters together.
522− let p_withoutHanging (HsApp NoExt f' x') = do
559+ gatherArgs f' knownArgs =
523 case f' of
560 case f' of
524− L _ (HsApp _ _ _) -> located f' p_withoutHanging
561+ L _ (HsApp _ l r) -> gatherArgs l (r <| knownArgs)
525− _ -> located f' (p_hsExpr' s)
562+ _ -> (f', knownArgs)
526− breakpoint
563+ (func, args) = gatherArgs f (x :| [])
527− inci $ located x' p_hsExpr
564+ -- We need to handle the last argument specially if it is a
528− p_withoutHanging e = p_hsExpr e
565+ -- hanging construct, so separate it from the rest.
529− -- 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
530− -- a single line.
571+ -- line.
531 placement =
572 placement =
532− if isOneLineSpan (getLoc f)
573+ if isOneLineSpan initSpan
533− then exprPlacement (unLoc x)
574+ then exprPlacement (unLoc lastp)
534− else Normal
575+ else Normal
535− -- We only sit when the last expression is not hanging.
576+ -- If the last argument is not hanging, just separate every argument as
536− -- This is to allow:
577+ -- usual. If it is hanging, print the initial arguments and hang the
537− -- f = foo bar do
578+ -- last one. Also, use braces around the every argument except the last
539− sit' = if placement == Normal
580+ case placement of
540− then sitcc
581+ Normal -> do
541− else id
582+ let -- Usually we want to bump indentation for arguments for the
542− sit' $ do
583+ -- sake of readability. However, when the function itself is a
543− 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
544− placeHanging placement $
609+ placeHanging placement $
545− located x p_hsExpr
610+ located lastp p_hsExpr
546− HsAppType a e -> do
611+ HsAppType NoExtField e a -> do
547 located e p_hsExpr
612 located e p_hsExpr
548 breakpoint
613 breakpoint
549 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
551 located (hswc_body a) p_hsType
621 located (hswc_body a) p_hsType
552− OpApp NoExt x op y -> do
622+ OpApp NoExtField x op y -> do
553 let opTree = OpBranch (exprOpTree x) op (exprOpTree y)
623 let opTree = OpBranch (exprOpTree x) op (exprOpTree y)
554− p_exprOpTree True s (reassociateOpTree getOpName opTree)
624+ p_exprOpTree s (reassociateOpTree getOpName opTree)
555− NegApp NoExt e _ -> do
625+ NegApp NoExtField e _ -> do
558 located e p_hsExpr
628 located e p_hsExpr
629+ HsPar NoExtField e ->
559− HsPar NoExt e -> parens s (located e p_hsExpr)
630+ parens s (located e (dontUseBraces . p_hsExpr))
560− SectionL NoExt x op -> do
631+ SectionL NoExtField x op -> do
561 located x p_hsExpr
632 located x p_hsExpr
562 breakpoint
633 breakpoint
563 inci (located op p_hsExpr)
634 inci (located op p_hsExpr)
564− SectionR NoExt op x -> do
635+ SectionR NoExtField op x -> do
565 located op p_hsExpr
636 located op p_hsExpr
637+ useRecordDot' <- useRecordDot
638+ let isRecordDot' = isRecordDot (unLoc op) (getLoc x)
566− breakpoint
639+ unless (useRecordDot' && isRecordDot') breakpoint
567 inci (located x p_hsExpr)
640 inci (located x p_hsExpr)
568− ExplicitTuple NoExt args boxity -> do
641+ ExplicitTuple NoExtField args boxity ->
569 let isSection = any (isMissing . unLoc) args
642 let isSection = any (isMissing . unLoc) args
570 isMissing = \case
643 isMissing = \case
571− Missing NoExt -> True
644+ Missing NoExtField -> True
572 _ -> 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
573− let parens' =
651+ parens' =
574 case boxity of
652 case boxity of
575 Boxed -> parens
653 Boxed -> parens
576 Unboxed -> parensHash
654 Unboxed -> parensHash
577− if isSection
655+ in if isSection
578− then switchLayout [] . parens' s $
657+ switchLayout [] . parens' s $
579− sep comma (located' p_hsTupArg) args
658+ sep comma p_larg args
580− else switchLayout (getLoc <$> args) . parens' s . sitcc $
660+ switchLayout (getLoc <$> args) . parens' s $
581− sep (comma >> breakpoint) (sitcc . located' p_hsTupArg) args
661+ sep commaDel p_larg args
582− ExplicitSum NoExt tag arity e ->
662+ ExplicitSum NoExtField tag arity e ->
583 p_unboxedSum N tag arity (located e p_hsExpr)
663 p_unboxedSum N tag arity (located e p_hsExpr)
584− HsCase NoExt e mgroup -> do
664+ HsCase NoExtField e mgroup ->
585− txt "case"
665+ p_case exprPlacement p_hsExpr e mgroup
591− inci (p_matchGroup Case mgroup)
592− 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
595− located if' p_hsExpr
596 breakpoint
670 breakpoint
599− located then' $ \x ->
600− placeHanging (exprPlacement x) (p_hsExpr x)
603− located else' $ \x ->
604− placeHanging (exprPlacement x) (p_hsExpr x)
605− HsMultiIf NoExt guards -> do
608− inci . sitcc $ sep newline (located' (p_grhs RightArrow)) guards
671+ inci . inci $ sep newline (located' (p_grhs RightArrow)) guards
609− HsLet NoExt localBinds e -> sitcc $ do
672+ HsLet NoExtField localBinds e ->
610− txt "let"
673+ p_let p_hsExpr localBinds e
612− dontUseBraces $ sitcc (located localBinds p_hsLocalBinds)
613− vlayout space (newline >> txt " ")
616− sitcc (located e p_hsExpr)
617− HsDo NoExt ctx es -> do
674+ HsDo NoExtField ctx es -> do
618 let doBody header = do
675 let doBody header = do
619 txt header
676 txt header
620 breakpoint
677 breakpoint
621 ub <- layoutToBraces <$> getLayout
678 ub <- layoutToBraces <$> getLayout
622− inci $ sepSemi (located' (ub . p_stmt' (p_hsExpr' S))) (unLoc es)
679+ inci $
623− compBody = brackets N $ located es $ \xs -> do
680+ sepSemi
624− let p_parBody = sep
681+ (ub . withSpacing (p_stmt' exprPlacement (p_hsExpr' S)))
625− (breakpoint >> txt "| ")
682+ (unLoc es)
626− p_seqBody
683+ compBody = brackets N . located es $ \xs -> do
627− p_seqBody = sitcc . sep
684+ let p_parBody =
628− (comma >> breakpoint)
685+ sep
629− (located' (sitcc . p_stmt))
686+ (breakpoint >> txt "|" >> space)
692+ (located' (sitcc . p_stmt))
630 stmts = init xs
693 stmts = init xs
631 yield = last xs
694 yield = last xs
632 lists = foldr (liftAppend . gatherStmt) [] stmts
695 lists = foldr (liftAppend . gatherStmt) [] stmts
@@ -640,92 +703,100 @@ p_hsExpr' s = \case
640 MDoExpr -> doBody "mdo"
703 MDoExpr -> doBody "mdo"
641 ListComp -> compBody
704 ListComp -> compBody
642 MonadComp -> notImplemented "MonadComp"
705 MonadComp -> notImplemented "MonadComp"
643− ArrowExpr -> notImplemented "ArrowExpr"
706+ ArrowExpr -> notImplemented "ArrowExpr"
644 GhciStmtCtxt -> notImplemented "GhciStmtCtxt"
707 GhciStmtCtxt -> notImplemented "GhciStmtCtxt"
645 PatGuard _ -> notImplemented "PatGuard"
708 PatGuard _ -> notImplemented "PatGuard"
646 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
709 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
647 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
710 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
648 ExplicitList _ _ xs ->
711 ExplicitList _ _ xs ->
649− brackets s . sitcc $
712+ brackets s $
650− 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 =
656− hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
719+ (f :: HsRecField GhcPs (LHsExpr GhcPs))
657− FieldOcc _ n -> n
720+ { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
658− XFieldOcc _ -> notImplemented "XFieldOcc"
721+ FieldOcc _ n -> n
659− }
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 N . sitcc $
729+ inci . braces N $
666− sep (comma >> breakpoint) sitcc (fields <> dotdot)
730+ sep commaDel sitcc (fields <> dotdot)
667 RecordUpd {..} -> do
731 RecordUpd {..} -> do
668 located rupd_expr p_hsExpr
732 located rupd_expr p_hsExpr
669− breakpoint
733+ useRecordDot' <- useRecordDot
670− let updName f = f {
734+ let mrs sp = case getLoc sp of
671− hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
735+ RealSrcSpan r -> Just r
672− Ambiguous _ n -> n
736+ _ -> Nothing
673− Unambiguous _ n -> n
737+ let isPluginForm =
674− XAmbiguousFieldOcc _ -> notImplemented "XAmbiguousFieldOcc"
738+ ((1 +) . srcSpanEndCol <$> mrs rupd_expr)
675− }
739+ == (srcSpanStartCol <$> mrs (head rupd_flds))
676− inci . braces N . sitcc $
740+ unless (useRecordDot' && isPluginForm) breakpoint
742+ (f :: HsRecUpdField GhcPs)
743+ { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
745+ Unambiguous _ n -> n
746+ XAmbiguousFieldOcc x -> noExtCon x
678− (comma >> breakpoint)
750+ commaDel
679 (sitcc . located' (p_hsRecField . updName))
751 (sitcc . located' (p_hsRecField . updName))
680 rupd_flds
752 rupd_flds
681− ExprWithTySig affix x -> sitcc $ do
753+ ExprWithTySig NoExtField x HsWC {hswc_body = HsIB {..}} -> sitcc $ do
682 located x p_hsExpr
754 located x p_hsExpr
685 breakpoint
757 breakpoint
686− inci $ do
758+ inci $ located hsib_body p_hsType
687− let HsWC {..} = affix
759+ ExprWithTySig NoExtField _ HsWC {hswc_body = XHsImplicitBndrs x} -> noExtCon x
688− HsIB {..} = hswc_body
760+ ExprWithTySig NoExtField _ (XHsWildCardBndrs x) -> noExtCon x
689− located hsib_body p_hsType
761+ ArithSeq NoExtField _ x ->
690− ArithSeq NoExt _ x -> do
691 case x of
762 case x of
692− From from -> brackets s . sitcc $ do
763+ From from -> brackets s $ do
693 located from p_hsExpr
764 located from p_hsExpr
694 breakpoint
765 breakpoint
696− FromThen from next -> brackets s . sitcc $ do
767+ FromThen from next -> brackets s $ do
697− sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
768+ sep commaDel (located' p_hsExpr) [from, next]
698 breakpoint
769 breakpoint
700− FromTo from to -> brackets s . sitcc $ do
771+ FromTo from to -> brackets s $ do
701 located from p_hsExpr
772 located from p_hsExpr
702 breakpoint
773 breakpoint
705 located to p_hsExpr
776 located to p_hsExpr
706− FromThenTo from next to -> brackets s . sitcc $ do
777+ FromThenTo from next to -> brackets s $ do
707− sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
778+ sep commaDel (located' p_hsExpr) [from, next]
708 breakpoint
779 breakpoint
711 located to p_hsExpr
782 located to p_hsExpr
712− HsSCC NoExt _ name x -> do
783+ HsSCC NoExtField _ name x -> do
713 txt "{-# SCC "
784 txt "{-# SCC "
714 atom name
785 atom name
715 txt " #-}"
786 txt " #-}"
716 breakpoint
787 breakpoint
717 located x p_hsExpr
788 located x p_hsExpr
718− HsCoreAnn NoExt _ value x -> do
789+ HsCoreAnn NoExtField _ value x -> do
719 txt "{-# CORE "
790 txt "{-# CORE "
720 atom value
791 atom value
721 txt " #-}"
792 txt " #-}"
722 breakpoint
793 breakpoint
723 located x p_hsExpr
794 located x p_hsExpr
724− HsBracket NoExt x -> p_hsBracket x
795+ HsBracket NoExtField x -> p_hsBracket x
725 HsRnBracketOut {} -> notImplemented "HsRnBracketOut"
796 HsRnBracketOut {} -> notImplemented "HsRnBracketOut"
726 HsTcBracketOut {} -> notImplemented "HsTcBracketOut"
797 HsTcBracketOut {} -> notImplemented "HsTcBracketOut"
727− HsSpliceE NoExt splice -> p_hsSplice splice
798+ HsSpliceE NoExtField splice -> p_hsSplice splice
728− HsProc NoExt p e -> do
799+ HsProc NoExtField p e -> do
729 txt "proc"
800 txt "proc"
730 located p $ \x -> do
801 located p $ \x -> do
731 breakpoint
802 breakpoint
@@ -734,35 +805,15 @@ p_hsExpr' s = \case
735 placeHanging (cmdTopPlacement (unLoc e)) $
806 placeHanging (cmdTopPlacement (unLoc e)) $
736 located e p_hsCmdTop
807 located e p_hsCmdTop
737− HsStatic _ e -> do
808+ HsStatic _ e -> do
738 txt "static"
809 txt "static"
739 breakpoint
810 breakpoint
740 inci (located e p_hsExpr)
811 inci (located e p_hsExpr)
741− HsArrApp NoExt body input arrType cond ->
742− p_hsCmd (HsCmdArrApp NoExt body input arrType cond)
743− HsArrForm NoExt form mfixity cmds ->
744− p_hsCmd (HsCmdArrForm NoExt form Prefix mfixity cmds)
745 HsTick {} -> notImplemented "HsTick"
812 HsTick {} -> notImplemented "HsTick"
746 HsBinTick {} -> notImplemented "HsBinTick"
813 HsBinTick {} -> notImplemented "HsBinTick"
747 HsTickPragma {} -> notImplemented "HsTickPragma"
814 HsTickPragma {} -> notImplemented "HsTickPragma"
748− -- These four constructs should never appear in correct programs.
749− -- See: https://github.com/tweag/ormolu/issues/343
750− EWildPat NoExt -> txt "_"
751− EAsPat NoExt n p -> do
755− EViewPat NoExt p e -> do
760− inci (located e p_hsExpr)
761− ELazyPat NoExt p -> do
764 HsWrap {} -> notImplemented "HsWrap"
815 HsWrap {} -> notImplemented "HsWrap"
765− XExpr {} -> notImplemented "XExpr"
816+ XExpr x -> noExtCon x
767p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
818p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
768p_patSynBind PSB {..} = do
819p_patSynBind PSB {..} = do
@@ -773,8 +824,8 @@ p_patSynBind PSB {..} = do
774 breakpoint
825 breakpoint
775 located psb_def p_pat
826 located psb_def p_pat
776− ImplicitBidirectional -> do
827+ ImplicitBidirectional -> do
778 breakpoint
829 breakpoint
779 located psb_def p_pat
830 located psb_def p_pat
780 ExplicitBidirectional mgroup -> do
831 ExplicitBidirectional mgroup -> do
@@ -790,7 +841,7 @@ p_patSynBind PSB {..} = do
790 PrefixCon xs -> do
841 PrefixCon xs -> do
792 p_rdrName psb_id
843 p_rdrName psb_id
793− inci $ do
844+ inci $ do
794 switchLayout (getLoc <$> xs) $ do
845 switchLayout (getLoc <$> xs) $ do
795 unless (null xs) breakpoint
846 unless (null xs) breakpoint
796 sitcc (sep breakpoint p_rdrName xs)
847 sitcc (sep breakpoint p_rdrName xs)
@@ -801,8 +852,8 @@ p_patSynBind PSB {..} = do
801 inci $ do
852 inci $ do
802 switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
853 switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
803 unless (null xs) breakpoint
854 unless (null xs) breakpoint
804− braces N . sitcc $
855+ braces N $
805− sep (comma >> breakpoint) (p_rdrName . recordPatSynPatVar) xs
856+ sep commaDel (p_rdrName . recordPatSynPatVar) xs
807 InfixCon l r -> do
858 InfixCon l r -> do
808 switchLayout [getLoc l, getLoc r] $ do
859 switchLayout [getLoc l, getLoc r] $ do
@@ -814,33 +865,98 @@ p_patSynBind PSB {..} = do
815 p_rdrName r
866 p_rdrName r
817−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)
819p_pat :: Pat GhcPs -> R ()
935p_pat :: Pat GhcPs -> R ()
820p_pat = \case
936p_pat = \case
821− WildPat NoExt -> txt "_"
937+ WildPat NoExtField -> txt "_"
822− VarPat NoExt name -> p_rdrName name
938+ VarPat NoExtField name -> p_rdrName name
823− LazyPat NoExt pat -> do
939+ LazyPat NoExtField pat -> do
825 located pat p_pat
941 located pat p_pat
826− AsPat NoExt name pat -> do
942+ AsPat NoExtField name pat -> do
827 p_rdrName name
943 p_rdrName name
829 located pat p_pat
945 located pat p_pat
830− ParPat NoExt pat ->
946+ ParPat NoExtField pat ->
831 located pat (parens S . p_pat)
947 located pat (parens S . p_pat)
832− BangPat NoExt pat -> do
948+ BangPat NoExtField pat -> do
834 located pat p_pat
950 located pat p_pat
835− ListPat NoExt pats -> do
951+ ListPat NoExtField pats ->
836− brackets S . sitcc $ sep (comma >> breakpoint) (located' p_pat) pats
952+ brackets S $ sep commaDel (located' p_pat) pats
837− TuplePat NoExt pats boxing -> do
953+ TuplePat NoExtField pats boxing -> do
838− let f =
954+ let parens' =
839 case boxing of
955 case boxing of
840 Boxed -> parens S
956 Boxed -> parens S
841 Unboxed -> parensHash S
957 Unboxed -> parensHash S
842− f . sitcc $ sep (comma >> breakpoint) (sitcc . located' p_pat) pats
958+ parens' $ sep commaDel (sitcc . located' p_pat) pats
843− SumPat NoExt pat tag arity ->
959+ SumPat NoExtField pat tag arity ->
844 p_unboxedSum S tag arity (located pat p_pat)
960 p_unboxedSum S tag arity (located pat p_pat)
845 ConPatIn pat details ->
961 ConPatIn pat details ->
846 case details of
962 case details of
@@ -855,38 +971,40 @@ p_pat = \case
855 let f = \case
971 let f = \case
856 Nothing -> txt ".."
972 Nothing -> txt ".."
857 Just x -> located x p_pat_hsRecField
973 Just x -> located x p_pat_hsRecField
858− inci . braces N . sitcc . sep (comma >> breakpoint) f $
974+ inci . braces N . sep commaDel f $
859 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
863− located x p_pat
979+ switchLayout [getLoc l, getLoc r] $ do
864− space
980+ located l p_pat
865− p_rdrName pat
981+ breakpoint
866− breakpoint
982+ inci $ do
867− inci (located y p_pat)
983+ p_rdrName 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,7 +1012,7 @@ 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)
@@ -903,38 +1021,40 @@ 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 s $ 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"
932−
1048+ XSplice x -> noExtCon x
934− :: Bool -- ^ Typed splice?
1050+p_hsSpliceTH ::
935− -> LHsExpr GhcPs -- ^ Splice expression
1051+ -- | Typed splice?
936− -> SpliceDecoration -- ^ Splice decoration
1052+ Bool ->
937− -> R ()
1053+ -- | Splice expression
1055+ -- | 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
@@ -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)
1091+ all
972− (showOutputable (rdrNameOcc name))
1092+ (\i -> isPunctuation i || isSymbol i)
973− && not (doesNotNeedExtraParens name)
1093+ (showOutputable (rdrNameOcc name))
1094+ && not (doesNotNeedExtraParens name)
974 wrapper = if isOperator then parens N 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,47 @@ 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'
1022−
1143+ -- GHC's definition of whitespaces in strings
1023− -- GHC's definition of whitespaces in strings
1144+ -- See: https://gitlab.haskell.org/ghc/ghc/blob/86753475/compiler/parser/Lexer.x#L1653
1024− -- See: https://gitlab.haskell.org/ghc/ghc/blob/86753475/compiler/parser/Lexer.x#L1653
1145+ ghcSpace :: Char -> Bool
1025− ghcSpace :: Char -> Bool
1146+ ghcSpace c = c <= '\x7f' && is_space c
1026− ghcSpace c = c <= '\x7f' && is_space c
1147+ -- Add backslashes to the inner side of the strings
1028− -- Add backslashes to the inner side of the strings
1149+ -- > backslashes ["a", "b", "c"] == ["a\\", "\\b\\", "\\c"]
1029− --
1150+ backslashes :: [String] -> [String]
1030− -- > backslashes ["a", "b", "c"] == ["a\\", "\\b\\", "\\c"]
1151+ backslashes (x : y : xs) = (x ++ "\\") : backslashes (('\\' : y) : xs)
1031− backslashes :: [String] -> [String]
1152+ backslashes xs = xs
1032− backslashes (x:y:xs) = (x ++ "\\") : backslashes (('\\' : y) : xs)
1153+ -- Attaches previous and next items to each list element
1033− backslashes xs = xs
1154+ zipPrevNext :: [a] -> [(Maybe a, a, Maybe a)]
1034−
1155+ zipPrevNext xs =
1035− -- Attaches previous and next items to each list element
1156+ let z =
1036− zipPrevNext :: [a] -> [(Maybe a, a, Maybe a)]
1157+ zip
1037− zipPrevNext xs =
1158+ (zip (Nothing : map Just xs) xs)
1038− let z = zip (zip (Nothing : map Just xs) xs)
1159+ (map Just (tail xs) ++ repeat Nothing)
1039− (map Just (tail xs) ++ repeat Nothing)
1160+ in map (\((p, x), n) -> (p, x, n)) z
1040− in map (\((p, x), n) -> (p, x, n)) z
1161+ orig (_, x, _) = x
1044----------------------------------------------------------------------------
1163----------------------------------------------------------------------------
1045-- Helpers
1164-- Helpers
1047-- | Return the wrapping function controlling the use of braces according to
1166-- | Return the wrapping function controlling the use of braces according to
1048-- the current layout.
1167-- the current layout.
1050layoutToBraces :: Layout -> R () -> R ()
1168layoutToBraces :: Layout -> R () -> R ()
1051layoutToBraces = \case
1169layoutToBraces = \case
1052 SingleLine -> useBraces
1170 SingleLine -> useBraces
@@ -1054,7 +1172,6 @@ layoutToBraces = \case
1055-- | 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
1056-- than the other, return the rest of the longer list unchanged.
1174-- than the other, return the rest of the longer list unchanged.
1058liftAppend :: Semigroup a => [a] -> [a] -> [a]
1175liftAppend :: Semigroup a => [a] -> [a] -> [a]
1059liftAppend [] [] = []
1176liftAppend [] [] = []
1060liftAppend [] (y : ys) = y : ys
1177liftAppend [] (y : ys) = y : ys
@@ -1062,14 +1179,13 @@ liftAppend (x : xs) [] = x : xs
1062liftAppend (x : xs) (y : ys) = x <> y : liftAppend xs ys
1179liftAppend (x : xs) (y : ys) = x <> y : liftAppend xs ys
1064getGRHSSpan :: GRHS GhcPs (Located body) -> SrcSpan
1181getGRHSSpan :: GRHS GhcPs (Located body) -> SrcSpan
1065−getGRHSSpan (GRHS NoExt guards body) =
1182+getGRHSSpan (GRHS NoExtField guards body) =
1066 combineSrcSpans' $ getLoc body :| map getLoc guards
1183 combineSrcSpans' $ getLoc body :| map getLoc guards
1067−getGRHSSpan (XGRHS NoExt) = notImplemented "XGRHS"
1184+getGRHSSpan (XGRHS x) = noExtCon x
1069-- | 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
1070-- to separate it from preceding expressions and whether to bump indentation
1187-- to separate it from preceding expressions and whether to bump indentation
1071-- depending on what sort of expression we have.
1188-- depending on what sort of expression we have.
1073placeHanging :: Placement -> R () -> R ()
1189placeHanging :: Placement -> R () -> R ()
1074placeHanging placement m =
1190placeHanging placement m =
1075 case placement of
1191 case placement of
@@ -1082,92 +1198,92 @@ placeHanging placement m =
1083-- | Check if given block contains single expression which has a hanging
1199-- | Check if given block contains single expression which has a hanging
1085−
1201+blockPlacement ::
1086−blockPlacement
1202+ (body -> Placement) ->
1087− :: (body -> Placement)
1203+ [LGRHS GhcPs (Located body)] ->
1088− -> [LGRHS GhcPs (Located body)]
1204+ Placement
1089− -> Placement
1205+blockPlacement placer [L _ (GRHS NoExtField _ (L _ x))] = placer x
1090−blockPlacement placer [(L _ (GRHS NoExt _ (L _ x)))] = placer x
1091blockPlacement _ _ = Normal
1206blockPlacement _ _ = Normal
1093-- | Check if given command has a hanging form.
1208-- | Check if given command has a hanging form.
1095cmdPlacement :: HsCmd GhcPs -> Placement
1209cmdPlacement :: HsCmd GhcPs -> Placement
1096cmdPlacement = \case
1210cmdPlacement = \case
1097− HsCmdLam NoExt _ -> Hanging
1211+ HsCmdLam NoExtField _ -> Hanging
1098− HsCmdCase NoExt _ _ -> Hanging
1212+ HsCmdCase NoExtField _ _ -> Hanging
1099− HsCmdDo NoExt _ -> Hanging
1213+ HsCmdDo NoExtField _ -> Hanging
1100 _ -> Normal
1214 _ -> Normal
1102cmdTopPlacement :: HsCmdTop GhcPs -> Placement
1216cmdTopPlacement :: HsCmdTop GhcPs -> Placement
1103cmdTopPlacement = \case
1217cmdTopPlacement = \case
1104− HsCmdTop NoExt (L _ x) -> cmdPlacement x
1218+ HsCmdTop NoExtField (L _ x) -> cmdPlacement x
1105− XCmdTop {} -> notImplemented "XCmdTop"
1219+ XCmdTop x -> noExtCon x
1107-- | Check if given expression has a hanging form.
1221-- | Check if given expression has a hanging form.
1109exprPlacement :: HsExpr GhcPs -> Placement
1222exprPlacement :: HsExpr GhcPs -> Placement
1110exprPlacement = \case
1223exprPlacement = \case
1111 -- Only hang lambdas with single line parameter lists
1224 -- Only hang lambdas with single line parameter lists
1112− HsLam NoExt mg -> case mg of
1225+ HsLam NoExtField mg -> case mg of
1113− MG _ (L _ [L _ (Match NoExt _ (x:xs) _)]) _
1226+ MG _ (L _ [L _ (Match NoExtField _ (x : xs) _)]) _
1114− | isOneLineSpan (combineSrcSpans' $ fmap getLoc (x :| xs))
1227+ | isOneLineSpan (combineSrcSpans' $ fmap getLoc (x :| xs)) ->
1115− -> Hanging
1228+ Hanging
1116 _ -> Normal
1229 _ -> Normal
1117− HsLamCase NoExt _ -> Hanging
1230+ HsLamCase NoExtField _ -> Hanging
1118− HsCase NoExt _ _ -> Hanging
1231+ HsCase NoExtField _ _ -> Hanging
1119− HsDo NoExt DoExpr _ -> Hanging
1232+ HsDo NoExtField DoExpr _ -> Hanging
1120− HsDo NoExt MDoExpr _ -> Hanging
1233+ HsDo NoExtField MDoExpr _ -> Hanging
1121− RecordCon NoExt _ _ -> Hanging
1234+ OpApp NoExtField _ op y ->
1122− -- If the rightmost expression in an operator chain is hanging, make the
1235+ case (fmap getOpNameStr . getOpName . unLoc) op of
1123− -- whole block hanging; so that we can use the common @f = foo $ do@
1236+ Just "$" -> exprPlacement (unLoc y)
1124− -- style.
1237+ _ -> Normal
1125− OpApp NoExt _ _ y -> exprPlacement (unLoc y)
1238+ HsApp NoExtField _ y -> exprPlacement (unLoc y)
1126− -- Same thing for function applications (usually with -XBlockArguments)
1239+ HsProc NoExtField p _ ->
1127− HsApp NoExt _ y -> exprPlacement (unLoc y)
1128− HsProc NoExt (L s _) _ ->
1129 -- Indentation breaks if pattern is longer than one line and left
1240 -- Indentation breaks if pattern is longer than one line and left
1130 -- hanging. Consequently, only apply hanging when it is safe.
1241 -- hanging. Consequently, only apply hanging when it is safe.
1131− if isOneLineSpan s
1242+ if isOneLineSpan (getLoc p)
1132− then Hanging
1243+ then Hanging
1133− else Normal
1244+ else Normal
1134 _ -> Normal
1245 _ -> Normal
1136withGuards :: [LGRHS GhcPs (Located body)] -> Bool
1247withGuards :: [LGRHS GhcPs (Located body)] -> Bool
1137withGuards = any (checkOne . unLoc)
1248withGuards = any (checkOne . unLoc)
1139 checkOne :: GRHS GhcPs (Located body) -> Bool
1250 checkOne :: GRHS GhcPs (Located body) -> Bool
1140− checkOne (GRHS NoExt [] _) = False
1251+ checkOne (GRHS NoExtField [] _) = False
1141 checkOne _ = True
1252 checkOne _ = True
1143exprOpTree :: LHsExpr GhcPs -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs)
1254exprOpTree :: LHsExpr GhcPs -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs)
1144−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)
1145exprOpTree n = OpNode n
1256exprOpTree n = OpNode n
1147getOpName :: HsExpr GhcPs -> Maybe RdrName
1258getOpName :: HsExpr GhcPs -> Maybe RdrName
1148getOpName = \case
1259getOpName = \case
1149− HsVar NoExt (L _ a) -> Just a
1260+ HsVar NoExtField (L _ a) -> Just a
1150 _ -> Nothing
1261 _ -> Nothing
1152−p_exprOpTree
1263+getOpNameStr :: RdrName -> String
1153− :: Bool -- ^ Can use special handling of dollar?
1264+getOpNameStr = occNameString . rdrNameOcc
1154− -> BracketStyle -- ^ Bracket style to use
1265+
1155− -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs)
1266+p_exprOpTree ::
1156− -> R ()
1267+ -- | Bracket style to use
1157−p_exprOpTree _ s (OpNode x) = located x (p_hsExpr' s)
1268+ BracketStyle ->
1158−p_exprOpTree isDollarSpecial s (OpBranch x op y) = do
1269+ OpTree (LHsExpr GhcPs) (LHsExpr GhcPs) ->
1159− -- NOTE If the beginning of the first argument and the second argument
1270+ R ()
1160− -- are on the same line, and the second argument has a hanging form, use
1271+p_exprOpTree s (OpNode x) = located x (p_hsExpr' s)
1161− -- hanging placement.
1272+p_exprOpTree s (OpBranch x op y) = do
1273+ -- If the beginning of the first argument and the second argument are on
1274+ -- the same line, and the second argument has a hanging form, use hanging
1162 let placement =
1276 let placement =
1163 if isOneLineSpan
1277 if isOneLineSpan
1164− (mkSrcSpan (srcSpanStart (opTreeLoc x)) (srcSpanStart (opTreeLoc y)))
1278+ (mkSrcSpan (srcSpanStart (opTreeLoc x)) (srcSpanStart (opTreeLoc y)))
1165 then case y of
1279 then case y of
1166− OpNode (L _ n) -> exprPlacement n
1280+ OpNode (L _ n) -> exprPlacement n
1167− _ -> Normal
1281+ _ -> Normal
1168 else Normal
1282 else Normal
1283+ -- Distinguish holes used in infix notation.
1284+ -- eg. '1 _foo 2' and '1 `_foo` 2'
1169 opWrapper = case unLoc op of
1285 opWrapper = case unLoc op of
1170− EWildPat NoExt -> backticks
1286+ HsUnboundVar NoExtField _ -> backticks
1172 layout <- getLayout
1288 layout <- getLayout
1173 let ub = case layout of
1289 let ub = case layout of
@@ -1175,30 +1291,72 @@ p_exprOpTree isDollarSpecial s (OpBranch x op y) = do
1175 MultiLine -> case placement of
1291 MultiLine -> case placement of
1176 Hanging -> useBraces
1292 Hanging -> useBraces
1177 Normal -> dontUseBraces
1293 Normal -> dontUseBraces
1178− gotDollar = case getOpName (unLoc op) of
1294+ opNameStr = (fmap getOpNameStr . getOpName . unLoc) op
1179− Just rname -> mkVarOcc "$" == (rdrNameOcc rname)
1295+ gotDollar = opNameStr == Just "$"
1296+ gotColon = opNameStr == Just ":"
1297+ gotRecordDot = isRecordDot (unLoc op) (opTreeLoc y)
1299+ switchLayout [opTreeLoc x] $
1301+ p_op = located op (opWrapper . p_hsExpr)
1302+ p_y = switchLayout [opTreeLoc y] (p_exprOpTree N y)
1303+ isSection = case (opTreeLoc x, getLoc op) of
1304+ (RealSrcSpan treeSpan, RealSrcSpan opSpan) ->
1305+ srcSpanEndCol treeSpan /= srcSpanStartCol opSpan
1180 _ -> False
1306 _ -> False
1181− switchLayout [opTreeLoc x] $
1307+ isDoBlock = \case
1182− ub $ p_exprOpTree (not gotDollar) s x
1308+ OpNode (L _ HsDo {}) -> True
1183− let p_op = located op (opWrapper . p_hsExpr)
1309+ _ -> False
1184− p_y = switchLayout [opTreeLoc y] (p_exprOpTree True N y)
1310+ useRecordDot' <- useRecordDot
1185− if isDollarSpecial && gotDollar && placement == Normal && isOneLineSpan (opTreeLoc x)
1311+ if
1186− then do
1312+ | gotColon -> do
1192− placeHanging placement $ do
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
1197-- | Get annotations for the enclosing element.
1356-- | Get annotations for the enclosing element.
1199getEnclosingAnns :: R [AnnKeywordId]
1357getEnclosingAnns :: R [AnnKeywordId]
1200getEnclosingAnns = do
1358getEnclosingAnns = do
1201 e <- getEnclosingSpan (const True)
1359 e <- getEnclosingSpan (const True)
1202 case e of
1360 case e of
1203 Nothing -> return []
1361 Nothing -> return []
1204− Just e' -> getAnns (RealSrcSpan e')
1362+ Just e' -> getAnns (RealSrcSpan e')