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