@@ -1,6 +1,8 @@
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,
@@ -18,22 +20,22 @@ 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 (..), (<|))
23import qualified Data.List.NonEmpty as NE
26import qualified Data.List.NonEmpty as NE
24import Data.Text (Text)
27import Data.Text (Text)
25import qualified Data.Text as Text
28import qualified Data.Text as Text
27−import OccName (mkVarOcc)
30+import OccName (occNameString)
28import Ormolu.Printer.Combinators
31import Ormolu.Printer.Combinators
32+import Ormolu.Printer.Internal
29import Ormolu.Printer.Meat.Common
33import Ormolu.Printer.Meat.Common
30import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
34import {-# SOURCE #-} Ormolu.Printer.Meat.Declaration
31import Ormolu.Printer.Meat.Declaration.Signature
35import Ormolu.Printer.Meat.Declaration.Signature
32import Ormolu.Printer.Meat.Type
36import Ormolu.Printer.Meat.Type
33import Ormolu.Printer.Operators
37import Ormolu.Printer.Operators
34import Ormolu.Utils
38import Ormolu.Utils
35−import RdrName (RdrName (..), rdrNameOcc)
36−import SrcLoc (combineSrcSpans, isOneLineSpan)
38-- | Style of a group of equations.
40-- | Style of a group of equations.
39data MatchGroupStyle
41data MatchGroupStyle
@@ -59,16 +61,16 @@ data Placement
59 -- should use it and avoid bumping one level
61 -- should use it and avoid bumping one level
60 -- of indentation
62 -- of indentation
62− deriving (Eq)
64+ deriving (Eq, Show)
64p_valDecl :: HsBindLR GhcPs GhcPs -> R ()
66p_valDecl :: HsBindLR GhcPs GhcPs -> R ()
65p_valDecl = \case
67p_valDecl = \case
66− FunBind NoExt funId funMatches _ _ -> p_funBind funId funMatches
68+ FunBind NoExtField funId funMatches _ _ -> p_funBind funId funMatches
67− PatBind NoExt pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
69+ PatBind NoExtField pat grhss _ -> p_match PatternBind False NoSrcStrict [pat] grhss
68 VarBind {} -> notImplemented "VarBinds" -- introduced by the type checker
70 VarBind {} -> notImplemented "VarBinds" -- introduced by the type checker
69 AbsBinds {} -> notImplemented "AbsBinds" -- introduced by the type checker
71 AbsBinds {} -> notImplemented "AbsBinds" -- introduced by the type checker
70− PatSynBind NoExt psb -> p_patSynBind psb
72+ PatSynBind NoExtField psb -> p_patSynBind psb
71− XHsBindsLR NoExt -> notImplemented "XHsBindsLR"
73+ XHsBindsLR x -> noExtCon x
73p_funBind ::
75p_funBind ::
74 Located RdrName ->
76 Located RdrName ->
@@ -98,7 +100,7 @@ p_matchGroup' placer render style MG {..} = do
98 Case -> id
100 Case -> id
99 LambdaCase -> id
101 LambdaCase -> id
100 _ -> dontUseBraces
102 _ -> dontUseBraces
101− -- 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
102 -- restore the brace state inside the sepsemi.
104 -- restore the brace state inside the sepsemi.
103 ub <- bool dontUseBraces useBraces <$> canUseBraces
105 ub <- bool dontUseBraces useBraces <$> canUseBraces
104 ob $ sepSemi (located' (ub . p_Match)) (unLoc mg_alts)
106 ob $ sepSemi (located' (ub . p_Match)) (unLoc mg_alts)
@@ -112,8 +114,8 @@ p_matchGroup' placer render style MG {..} = do
112 (matchStrictness m)
114 (matchStrictness m)
115− p_Match _ = notImplemented "XMatch"
117+ p_Match (XMatch x) = noExtCon x
116−p_matchGroup' _ _ _ (XMatchGroup NoExt) = notImplemented "XMatchGroup"
118+p_matchGroup' _ _ _ (XMatchGroup x) = noExtCon x
118-- | Function id obtained through pattern matching on 'FunBind' should not
120-- | Function id obtained through pattern matching on 'FunBind' should not
119-- be used to print the actual equations because the different ‘RdrNames’
121-- be used to print the actual equations because the different ‘RdrNames’
@@ -167,8 +169,8 @@ p_match' ::
167 GRHSs GhcPs (Located body) ->
169 GRHSs GhcPs (Located body) ->
169p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
171p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
170− -- 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
171− -- 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
172 -- indented than function name. This in turn means that indentation for
174 -- indented than function name. This in turn means that indentation for
173 -- 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
174 -- 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
@@ -178,27 +180,26 @@ p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
178 NoSrcStrict -> return ()
180 NoSrcStrict -> return ()
179 SrcStrict -> txt "!"
181 SrcStrict -> txt "!"
180 SrcLazy -> txt "~"
182 SrcLazy -> txt "~"
181− inci' <- case NE.nonEmpty m_pats of
183+ indentBody <- case NE.nonEmpty m_pats of
182− Nothing -> id <$ case style of
185+ False <$ case style of
183− Function name -> p_rdrName name
186+ Function name -> p_rdrName name
184− _ -> return ()
187+ _ -> return ()
185 Just ne_pats -> do
188 Just ne_pats -> do
186− let combinedSpans =
189+ let combinedSpans = case style of
190+ Function name -> combineSrcSpans (getLoc name) patSpans
187− combineSrcSpans' $
192+ patSpans = combineSrcSpans' (getLoc <$> ne_pats)
190− if isOneLineSpan combinedSpans
193+ indentBody = not (isOneLineSpan combinedSpans)
193 switchLayout [combinedSpans] $ do
194 switchLayout [combinedSpans] $ do
194− let stdCase = sep breakpoint p_pat m_pats
195+ let stdCase = sep breakpoint (located' p_pat) m_pats
195 case style of
196 case style of
196 Function name ->
197 Function name ->
197 p_infixDefHelper
198 p_infixDefHelper
199− inci'
200+ indentBody
200 (p_rdrName name)
201 (p_rdrName name)
201− (p_pat <$> m_pats)
202+ (located' p_pat <$> m_pats)
202 PatternBind -> stdCase
203 PatternBind -> stdCase
203 Case -> stdCase
204 Case -> stdCase
204 Lambda -> do
205 Lambda -> do
@@ -211,40 +212,32 @@ p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
211 when needsSpace space
212 when needsSpace space
212 sitcc stdCase
213 sitcc stdCase
213 LambdaCase -> stdCase
214 LambdaCase -> stdCase
214− return inci'
215+ return indentBody
215 let -- 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
216 -- about putting certain constructions in hanging positions.
217 -- about putting certain constructions in hanging positions.
217 endOfPats = case NE.nonEmpty m_pats of
218 endOfPats = case NE.nonEmpty m_pats of
218 Nothing -> case style of
219 Nothing -> case style of
219− Function name -> (Just . srcSpanEnd . getLoc) name
220+ Function name -> Just (getLoc name)
220 _ -> Nothing
221 _ -> Nothing
221− Just pats -> (Just . srcSpanEnd . getLoc . NE.last) pats
222+ Just pats -> (Just . getLoc . NE.last) pats
222 isCase = \case
223 isCase = \case
223 Case -> True
224 Case -> True
224 LambdaCase -> True
225 LambdaCase -> True
225 _ -> False
226 _ -> False
226− let hasGuards = withGuards grhssGRHSs
227+ hasGuards = withGuards grhssGRHSs
227− unless (length grhssGRHSs > 1) $
229− Function _ | hasGuards -> return ()
230− Function _ -> space >> txt "="
231− PatternBind -> space >> txt "="
232− s | isCase s && hasGuards -> return ()
233− _ -> space >> txt "->"
234− let grhssSpan =
228+ grhssSpan =
235 combineSrcSpans' $
229 combineSrcSpans' $
236 getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
230 getGRHSSpan . unLoc <$> NE.fromList grhssGRHSs
237 patGrhssSpan =
231 patGrhssSpan =
239 grhssSpan
233 grhssSpan
240− (combineSrcSpans grhssSpan . srcLocSpan)
234+ (combineSrcSpans grhssSpan . srcLocSpan . srcSpanEnd)
241 endOfPats
235 endOfPats
242 placement =
236 placement =
243 case endOfPats of
237 case endOfPats of
244 Nothing -> blockPlacement placer grhssGRHSs
238 Nothing -> blockPlacement placer grhssGRHSs
245 Just spn ->
239 Just spn ->
247− (mkSrcSpan spn (srcSpanStart grhssSpan))
240+ if onTheSameLine spn grhssSpan
248 then blockPlacement placer grhssGRHSs
241 then blockPlacement placer grhssGRHSs
249 else Normal
242 else Normal
250 p_body = do
243 p_body = do
@@ -260,11 +253,18 @@ p_match' placer render style isInfix strictness m_pats GRHSs {..} = do
260 txt "where"
253 txt "where"
261 unless whereIsEmpty breakpoint
254 unless whereIsEmpty breakpoint
262 inci $ located grhssLocalBinds p_hsLocalBinds
255 inci $ located grhssLocalBinds p_hsLocalBinds
263− 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 "->"
264 switchLayout [patGrhssSpan] $
264 switchLayout [patGrhssSpan] $
265 placeHanging placement p_body
265 placeHanging placement p_body
266 inci p_where
266 inci p_where
267−p_match' _ _ _ _ _ _ XGRHSs {} = notImplemented "XGRHSs"
267+p_match' _ _ _ _ _ _ (XGRHSs x) = noExtCon x
269p_grhs :: GroupStyle -> GRHS GhcPs (LHsExpr GhcPs) -> R ()
269p_grhs :: GroupStyle -> GRHS GhcPs (LHsExpr GhcPs) -> R ()
270p_grhs = p_grhs' exprPlacement p_hsExpr
270p_grhs = p_grhs' exprPlacement p_hsExpr
@@ -278,79 +278,109 @@ p_grhs' ::
278 GroupStyle ->
278 GroupStyle ->
279 GRHS GhcPs (Located body) ->
279 GRHS GhcPs (Located body) ->
281−p_grhs' placer render style (GRHS NoExt guards body) =
281+p_grhs' placer render style (GRHS NoExtField guards body) =
282 case guards of
282 case guards of
283 [] -> p_body
283 [] -> p_body
287− sitcc (sep (comma >> breakpoint) (sitcc . located' p_stmt) xs)
287+ sitcc (sep commaDel (sitcc . located' p_stmt) xs)
289− txt $ case style of
289+ inci $ case style of
290− EqualSign -> "="
290+ EqualSign -> equals
291− RightArrow -> "->"
291+ RightArrow -> txt "->"
292 placeHanging placement p_body
292 placeHanging placement p_body
294 placement =
294 placement =
295 case endOfGuards of
295 case endOfGuards of
296 Nothing -> placer (unLoc body)
296 Nothing -> placer (unLoc body)
297 Just spn ->
297 Just spn ->
298− if isOneLineSpan (mkSrcSpan spn (srcSpanStart (getLoc body)))
298+ if onTheSameLine spn (getLoc body)
299 then placer (unLoc body)
299 then placer (unLoc body)
300 else Normal
300 else Normal
301 endOfGuards =
301 endOfGuards =
302 case NE.nonEmpty guards of
302 case NE.nonEmpty guards of
303 Nothing -> Nothing
303 Nothing -> Nothing
304− Just gs -> (Just . srcSpanEnd . getLoc . NE.last) gs
304+ Just gs -> (Just . getLoc . NE.last) gs
305 p_body = located body render
305 p_body = located body render
306−p_grhs' _ _ _ (XGRHS NoExt) = notImplemented "XGRHS"
306+p_grhs' _ _ _ (XGRHS x) = noExtCon x
308p_hsCmd :: HsCmd GhcPs -> R ()
308p_hsCmd :: HsCmd GhcPs -> R ()
309p_hsCmd = \case
309p_hsCmd = \case
310− HsCmdArrApp NoExt body input arrType _ -> do
310+ HsCmdArrApp NoExtField body input arrType _ -> do
311 located body p_hsExpr
311 located body p_hsExpr
312− space
312+ breakpoint
313− case arrType of
314+ case arrType of
314− HsFirstOrderApp -> txt "-<"
315+ HsFirstOrderApp -> txt "-<"
315− HsHigherOrderApp -> txt "-<<"
316+ HsHigherOrderApp -> txt "-<<"
316− placeHanging (exprPlacement (unLoc input)) $
317+ placeHanging (exprPlacement (unLoc input)) $
317− located input p_hsExpr
318+ located input p_hsExpr
318− HsCmdArrForm NoExt form Prefix _ cmds -> banana $ sitcc $ do
319+ HsCmdArrForm NoExtField form Prefix _ cmds -> banana $ do
319 located form p_hsExpr
320 located form p_hsExpr
320 unless (null cmds) $ do
321 unless (null cmds) $ do
321 breakpoint
322 breakpoint
322 inci (sequence_ (intersperse breakpoint (located' p_hsCmdTop <$> cmds)))
323 inci (sequence_ (intersperse breakpoint (located' p_hsCmdTop <$> cmds)))
323− HsCmdArrForm NoExt form Infix _ [left, right] -> do
324+ HsCmdArrForm NoExtField form Infix _ [left, right] -> do
324 located left p_hsCmdTop
325 located left p_hsCmdTop
326 located form p_hsExpr
327 located form p_hsExpr
327 placeHanging (cmdTopPlacement (unLoc right)) $
328 placeHanging (cmdTopPlacement (unLoc right)) $
328 located right p_hsCmdTop
329 located right p_hsCmdTop
329− HsCmdArrForm NoExt _ Infix _ _ -> notImplemented "HsCmdArrForm"
330+ HsCmdArrForm NoExtField _ Infix _ _ -> notImplemented "HsCmdArrForm"
330 HsCmdApp {} ->
331 HsCmdApp {} ->
331 -- 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
332 -- 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.
333 notImplemented "HsCmdApp"
334 notImplemented "HsCmdApp"
334− HsCmdLam NoExt mgroup -> p_matchGroup' cmdPlacement p_hsCmd Lambda mgroup
335+ HsCmdLam NoExtField mgroup -> p_matchGroup' cmdPlacement p_hsCmd Lambda mgroup
335− HsCmdPar NoExt c -> parens N (located c p_hsCmd)
336+ HsCmdPar NoExtField c -> parens N (located c p_hsCmd)
336− HsCmdCase NoExt e mgroup ->
337+ HsCmdCase NoExtField e mgroup ->
337 p_case cmdPlacement p_hsCmd e mgroup
338 p_case cmdPlacement p_hsCmd e mgroup
338− HsCmdIf NoExt _ if' then' else' ->
339+ HsCmdIf NoExtField _ if' then' else' ->
339 p_if cmdPlacement p_hsCmd if' then' else'
340 p_if cmdPlacement p_hsCmd if' then' else'
340− HsCmdLet NoExt localBinds c ->
341+ HsCmdLet NoExtField localBinds c ->
341 p_let p_hsCmd localBinds c
342 p_let p_hsCmd localBinds c
342− HsCmdDo NoExt es -> do
343+ HsCmdDo NoExtField es -> do
345 inci . located es $
346 inci . located es $
346− sitcc . sep newline (located' (sitcc . p_stmt' cmdPlacement p_hsCmd))
347+ sitcc . sep newline (sitcc . withSpacing (p_stmt' cmdPlacement p_hsCmd))
347 HsCmdWrap {} -> notImplemented "HsCmdWrap"
348 HsCmdWrap {} -> notImplemented "HsCmdWrap"
348− XCmd {} -> notImplemented "XCmd"
349+ XCmd x -> noExtCon x
350p_hsCmdTop :: HsCmdTop GhcPs -> R ()
351p_hsCmdTop :: HsCmdTop GhcPs -> R ()
351p_hsCmdTop = \case
352p_hsCmdTop = \case
352− HsCmdTop NoExt cmd -> located cmd p_hsCmd
353+ HsCmdTop NoExtField cmd -> located cmd p_hsCmd
353− 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)
355p_stmt :: Stmt GhcPs (LHsExpr GhcPs) -> R ()
385p_stmt :: Stmt GhcPs (LHsExpr GhcPs) -> R ()
356p_stmt = p_stmt' exprPlacement p_hsExpr
386p_stmt = p_stmt' exprPlacement p_hsExpr
@@ -365,16 +395,13 @@ p_stmt' ::
365 Stmt GhcPs (Located body) ->
395 Stmt GhcPs (Located body) ->
367p_stmt' placer render = \case
397p_stmt' placer render = \case
368− LastStmt NoExt body _ _ -> located body render
398+ LastStmt NoExtField body _ _ -> located body render
369− BindStmt NoExt p f _ _ -> do
399+ BindStmt NoExtField p f _ _ -> do
370− p_pat p
400+ located p p_pat
373− -- https://gitlab.haskell.org/ghc/ghc/issues/17330
374− let loc = case p of
403+ let loc = getLoc p
375− XPat pat -> getLoc pat
376− _ -> error "p_stmt': BindStmt: Pat does not contain a location"
377− let placement =
404+ placement =
378 case f of
405 case f of
379 L l' x ->
406 L l' x ->
380 if isOneLineSpan
407 if isOneLineSpan
@@ -384,20 +411,20 @@ p_stmt' placer render = \case
384 switchLayout [loc, getLoc f] $
411 switchLayout [loc, getLoc f] $
385 placeHanging placement (located f render)
412 placeHanging placement (located f render)
386 ApplicativeStmt {} -> notImplemented "ApplicativeStmt" -- generated by renamer
413 ApplicativeStmt {} -> notImplemented "ApplicativeStmt" -- generated by renamer
387− BodyStmt NoExt body _ _ -> located body render
414+ BodyStmt NoExtField body _ _ -> located body render
388− LetStmt NoExt binds -> do
415+ LetStmt NoExtField binds -> do
389 txt "let"
416 txt "let"
391 sitcc $ located binds p_hsLocalBinds
418 sitcc $ located binds p_hsLocalBinds
392 ParStmt {} ->
419 ParStmt {} ->
393− -- NOTE 'ParStmt' should always be eliminated in 'gatherStmt' already,
420+ -- 'ParStmt' should always be eliminated in 'gatherStmt' already, such
394− -- such that it never occurs in 'p_stmt''. Consequently, handling it
421+ -- that it never occurs in 'p_stmt''. Consequently, handling it here
395− -- here would be redundant.
422+ -- would be redundant.
396 notImplemented "ParStmt"
423 notImplemented "ParStmt"
397 TransStmt {..} ->
424 TransStmt {..} ->
398− -- NOTE 'TransStmt' only needs to account for render printing itself,
425+ -- 'TransStmt' only needs to account for render printing itself, since
399− -- since pretty printing of relevant statements (e.g., in 'trS_stmts')
426+ -- pretty printing of relevant statements (e.g., in 'trS_stmts') is
400− -- is handled through 'gatherStmt'.
427+ -- handled through 'gatherStmt'.
401 case (trS_form, trS_by) of
428 case (trS_form, trS_by) of
402 (ThenForm, Nothing) -> do
429 (ThenForm, Nothing) -> do
403 txt "then"
430 txt "then"
@@ -426,11 +453,11 @@ p_stmt' placer render = \case
426 RecStmt {..} -> do
453 RecStmt {..} -> do
427 txt "rec"
454 txt "rec"
429− sitcc $ sepSemi (located' (p_stmt' placer render)) recS_stmts
456+ sitcc $ sepSemi (withSpacing (p_stmt' placer render)) recS_stmts
430− XStmtLR {} -> notImplemented "XStmtLR"
457+ XStmtLR c -> noExtCon c
432gatherStmt :: ExprLStmt GhcPs -> [[ExprLStmt GhcPs]]
459gatherStmt :: ExprLStmt GhcPs -> [[ExprLStmt GhcPs]]
433−gatherStmt (L _ (ParStmt NoExt block _ _)) =
460+gatherStmt (L _ (ParStmt NoExtField block _ _)) =
434 foldr ((<>) . gatherStmtBlock) [] block
461 foldr ((<>) . gatherStmtBlock) [] block
435gatherStmt (L s stmt@TransStmt {..}) =
462gatherStmt (L s stmt@TransStmt {..}) =
436 foldr liftAppend [] ((gatherStmt <$> trS_stmts) <> pure [[L s stmt]])
463 foldr liftAppend [] ((gatherStmt <$> trS_stmts) <> pure [[L s stmt]])
@@ -439,46 +466,46 @@ gatherStmt stmt = [[stmt]]
439gatherStmtBlock :: ParStmtBlock GhcPs GhcPs -> [[ExprLStmt GhcPs]]
466gatherStmtBlock :: ParStmtBlock GhcPs GhcPs -> [[ExprLStmt GhcPs]]
440gatherStmtBlock (ParStmtBlock _ stmts _ _) =
467gatherStmtBlock (ParStmtBlock _ stmts _ _) =
441 foldr (liftAppend . gatherStmt) [] stmts
468 foldr (liftAppend . gatherStmt) [] stmts
442−gatherStmtBlock XParStmtBlock {} = notImplemented "XParStmtBlock"
469+gatherStmtBlock (XParStmtBlock x) = noExtCon x
444p_hsLocalBinds :: HsLocalBindsLR GhcPs GhcPs -> R ()
471p_hsLocalBinds :: HsLocalBindsLR GhcPs GhcPs -> R ()
445p_hsLocalBinds = \case
472p_hsLocalBinds = \case
446− HsValBinds NoExt (ValBinds NoExt bag lsigs) -> do
473+ HsValBinds NoExtField (ValBinds NoExtField bag lsigs) -> do
449− (srcSpanStart . getLoc)
450− (srcSpanStart . getLoc)
452− (Left <$> bagToList bag) ++ (Right <$> lsigs)
453− p_item (Left x) = located x p_valDecl
454− p_item (Right x) = located x p_sigDecl
455− -- Assigns 'False' to the last element, 'True' to the rest.
456− markInit :: [a] -> [(Bool, a)]
458− markInit [x] = [(False, x)]
459− markInit (x : xs) = (True, x) : markInit xs
460− -- 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
461 -- elements will also contain semicolons and they will confuse the
475 -- elements will also contain semicolons and they will confuse the
462 -- parser. so we request braces around every element except the last.
476 -- parser. so we request braces around every element except the last.
463 br <- layoutToBraces <$> getLayout
477 br <- layoutToBraces <$> getLayout
464− sitcc $
478+ let items =
465− sepSemi
479+ let injectLeft (L l x) = L l (Left x)
466− (\(m, i) -> (if m then br else id) $ p_item i)
480+ injectRight (L l x) = L l (Right x)
467− (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)
468− HsValBinds NoExt _ -> notImplemented "HsValBinds"
492+ HsValBinds NoExtField _ -> notImplemented "HsValBinds"
469− HsIPBinds NoExt (IPBinds NoExt xs) ->
493+ HsIPBinds NoExtField (IPBinds NoExtField xs) ->
470 -- Second argument of IPBind is always Left before type-checking.
494 -- Second argument of IPBind is always Left before type-checking.
471− let p_ipBind (IPBind NoExt (Left name) expr) = do
495+ let p_ipBind (IPBind NoExtField (Left name) expr) = do
472 atom name
496 atom name
475 breakpoint
499 breakpoint
476 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
477− p_ipBind _ = notImplemented "XHsIPBinds"
503+ notImplemented "IPBind _ (Right _) _"
504+ p_ipBind (XIPBind x) = noExtCon x
478 in sepSemi (located' p_ipBind) xs
505 in sepSemi (located' p_ipBind) xs
479− HsIPBinds NoExt _ -> notImplemented "HsIpBinds"
506+ HsIPBinds NoExtField _ -> notImplemented "HsIpBinds"
480− EmptyLocalBinds NoExt -> return ()
507+ EmptyLocalBinds NoExtField -> return ()
481− XHsLocalBindsLR _ -> notImplemented "XHsLocalBindsLR"
508+ XHsLocalBindsLR x -> noExtCon x
483p_hsRecField ::
510p_hsRecField ::
484 HsRecField' RdrName (LHsExpr GhcPs) ->
511 HsRecField' RdrName (LHsExpr GhcPs) ->
@@ -487,48 +514,45 @@ p_hsRecField HsRecField {..} = do
487 p_rdrName hsRecFieldLbl
514 p_rdrName hsRecFieldLbl
488 unless hsRecPun $ do
515 unless hsRecPun $ do
519+ if onTheSameLine (getLoc hsRecFieldLbl) (getLoc hsRecFieldArg)
491− let placement = exprPlacement (unLoc hsRecFieldArg)
520+ then exprPlacement (unLoc hsRecFieldArg)
492− placeHanging placement $ located hsRecFieldArg p_hsExpr
522+ placeHanging placement (located hsRecFieldArg p_hsExpr)
494−p_hsTupArg :: HsTupArg GhcPs -> R ()
496− Present NoExt x -> located x p_hsExpr
497− Missing NoExt -> pure ()
498− XTupArg {} -> notImplemented "XTupArg"
500p_hsExpr :: HsExpr GhcPs -> R ()
524p_hsExpr :: HsExpr GhcPs -> R ()
501p_hsExpr = p_hsExpr' N
525p_hsExpr = p_hsExpr' N
503p_hsExpr' :: BracketStyle -> HsExpr GhcPs -> R ()
527p_hsExpr' :: BracketStyle -> HsExpr GhcPs -> R ()
504p_hsExpr' s = \case
528p_hsExpr' s = \case
505− HsVar NoExt name -> p_rdrName name
529+ HsVar NoExtField name -> p_rdrName name
506− HsUnboundVar NoExt _ -> notImplemented "HsUnboundVar"
530+ HsUnboundVar NoExtField v -> atom (unboundVarOcc v)
507− HsConLikeOut NoExt _ -> notImplemented "HsConLikeOut"
531+ HsConLikeOut NoExtField _ -> notImplemented "HsConLikeOut"
508− HsRecFld NoExt x ->
532+ HsRecFld NoExtField x ->
509 case x of
533 case x of
510− Unambiguous NoExt name -> p_rdrName name
534+ Unambiguous NoExtField name -> p_rdrName name
511− Ambiguous NoExt name -> p_rdrName name
535+ Ambiguous NoExtField name -> p_rdrName name
512− XAmbiguousFieldOcc NoExt -> notImplemented "XAmbiguousFieldOcc"
536+ XAmbiguousFieldOcc xx -> noExtCon xx
513− HsOverLabel NoExt _ v -> do
537+ HsOverLabel NoExtField _ v -> do
516− HsIPVar NoExt (HsIPName name) -> do
540+ HsIPVar NoExtField (HsIPName name) -> do
518 atom name
542 atom name
519− HsOverLit NoExt v -> atom (ol_val v)
543+ HsOverLit NoExtField v -> atom (ol_val v)
520− HsLit NoExt lit ->
544+ HsLit NoExtField lit ->
521 case lit of
545 case lit of
522 HsString (SourceText stxt) _ -> p_stringLit stxt
546 HsString (SourceText stxt) _ -> p_stringLit stxt
523 HsStringPrim (SourceText stxt) _ -> p_stringLit stxt
547 HsStringPrim (SourceText stxt) _ -> p_stringLit stxt
524 r -> atom r
548 r -> atom r
525− HsLam NoExt mgroup ->
549+ HsLam NoExtField mgroup ->
526 p_matchGroup Lambda mgroup
550 p_matchGroup Lambda mgroup
527− HsLamCase NoExt mgroup -> do
551+ HsLamCase NoExtField mgroup -> do
528 txt "\\case"
552 txt "\\case"
529 breakpoint
553 breakpoint
530 inci (p_matchGroup LambdaCase mgroup)
554 inci (p_matchGroup LambdaCase mgroup)
531− HsApp NoExt f x -> do
555+ HsApp NoExtField f x -> do
532 let -- In order to format function applications with multiple parameters
556 let -- In order to format function applications with multiple parameters
533 -- nicer, traverse the AST to gather the function and all the
557 -- nicer, traverse the AST to gather the function and all the
534 -- parameters together.
558 -- parameters together.
@@ -540,8 +564,10 @@ p_hsExpr' s = \case
540 -- We need to handle the last argument specially if it is a
564 -- We need to handle the last argument specially if it is a
541 -- hanging construct, so separate it from the rest.
565 -- hanging construct, so separate it from the rest.
542 (initp, lastp) = (NE.init args, NE.last args)
566 (initp, lastp) = (NE.init args, NE.last args)
543− initSpan = combineSrcSpans' $ getLoc f :| map getLoc initp
568+ combineSrcSpans' $
569+ getLoc f :| [(srcLocSpan . srcSpanStart . getLoc) lastp]
544− -- Hang the last argument only if the initial arguments spans one
570+ -- Hang the last argument only if the initial arguments span one
546 placement =
572 placement =
547 if isOneLineSpan initSpan
573 if isOneLineSpan initSpan
@@ -558,18 +584,21 @@ p_hsExpr' s = \case
558 -- do-block or case expression it is not a good idea. It seems
584 -- do-block or case expression it is not a good idea. It seems
559 -- to be safe to always bump indentation when the function
585 -- to be safe to always bump indentation when the function
560 -- expression is parenthesised.
586 -- expression is parenthesised.
561− indent =
587+ doIndent =
562 case func of
588 case func of
563− L _ (HsPar NoExt _) -> inci
589+ L _ (HsPar NoExtField _) -> True
564− L spn _ ->
590+ L _ (HsAppType NoExtField _ _) -> True
591+ L _ (HsMultiIf NoExtField _) -> True
565− if isOneLineSpan spn
592+ L spn _ -> isOneLineSpan spn
567− else id
594+ getLayout <&> \case
568− useBraces $ do
595+ SingleLine -> useBraces
569 located func (p_hsExpr' s)
598 located func (p_hsExpr' s)
570 breakpoint
599 breakpoint
571− indent $ sep breakpoint (located' p_hsExpr) initp
600+ inciIf doIndent $ sep breakpoint (located' p_hsExpr) initp
572− indent $ do
601+ inciIf doIndent $ do
573 unless (null initp) breakpoint
602 unless (null initp) breakpoint
574 located lastp p_hsExpr
603 located lastp p_hsExpr
575 Hanging -> do
604 Hanging -> do
@@ -579,75 +608,87 @@ p_hsExpr' s = \case
579 sep breakpoint (located' p_hsExpr) initp
608 sep breakpoint (located' p_hsExpr) initp
580 placeHanging placement $
609 placeHanging placement $
581 located lastp p_hsExpr
610 located lastp p_hsExpr
582− HsAppType NoExt e a -> do
611+ HsAppType NoExtField e a -> do
583 located e p_hsExpr
612 located e p_hsExpr
584 breakpoint
613 breakpoint
585 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
587 located (hswc_body a) p_hsType
621 located (hswc_body a) p_hsType
588− OpApp NoExt x op y -> do
622+ OpApp NoExtField x op y -> do
589 let opTree = OpBranch (exprOpTree x) op (exprOpTree y)
623 let opTree = OpBranch (exprOpTree x) op (exprOpTree y)
590− p_exprOpTree True s (reassociateOpTree getOpName opTree)
624+ p_exprOpTree s (reassociateOpTree getOpName opTree)
591− NegApp NoExt e _ -> do
625+ NegApp NoExtField e _ -> do
594 located e p_hsExpr
628 located e p_hsExpr
595− HsPar NoExt e ->
629+ HsPar NoExtField e ->
596 parens s (located e (dontUseBraces . p_hsExpr))
630 parens s (located e (dontUseBraces . p_hsExpr))
597− SectionL NoExt x op -> do
631+ SectionL NoExtField x op -> do
598 located x p_hsExpr
632 located x p_hsExpr
599 breakpoint
633 breakpoint
600 inci (located op p_hsExpr)
634 inci (located op p_hsExpr)
601− SectionR NoExt op x -> do
635+ SectionR NoExtField op x -> do
602 located op p_hsExpr
636 located op p_hsExpr
637+ useRecordDot' <- useRecordDot
638+ let isRecordDot' = isRecordDot (unLoc op) (getLoc x)
603− breakpoint
639+ unless (useRecordDot' && isRecordDot') breakpoint
604 inci (located x p_hsExpr)
640 inci (located x p_hsExpr)
605− ExplicitTuple NoExt args boxity -> do
641+ ExplicitTuple NoExtField args boxity ->
606 let isSection = any (isMissing . unLoc) args
642 let isSection = any (isMissing . unLoc) args
607 isMissing = \case
643 isMissing = \case
608− Missing NoExt -> True
644+ Missing NoExtField -> True
609 _ -> 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
610− let parens' =
651+ parens' =
611 case boxity of
652 case boxity of
612 Boxed -> parens
653 Boxed -> parens
613 Unboxed -> parensHash
654 Unboxed -> parensHash
614− if isSection
655+ in if isSection
616− switchLayout [] . parens' s $
657+ switchLayout [] . parens' s $
617− sep comma (located' p_hsTupArg) args
658+ sep comma p_larg args
619− switchLayout (getLoc <$> args) . parens' s . sitcc $
660+ switchLayout (getLoc <$> args) . parens' s $
620− sep (comma >> breakpoint) (sitcc . located' p_hsTupArg) args
661+ sep commaDel p_larg args
621− ExplicitSum NoExt tag arity e ->
662+ ExplicitSum NoExtField tag arity e ->
622 p_unboxedSum N tag arity (located e p_hsExpr)
663 p_unboxedSum N tag arity (located e p_hsExpr)
623− HsCase NoExt e mgroup ->
664+ HsCase NoExtField e mgroup ->
624 p_case exprPlacement p_hsExpr e mgroup
665 p_case exprPlacement p_hsExpr e mgroup
625− HsIf NoExt _ if' then' else' ->
666+ HsIf NoExtField _ if' then' else' ->
626 p_if exprPlacement p_hsExpr if' then' else'
667 p_if exprPlacement p_hsExpr if' then' else'
627− HsMultiIf NoExt guards -> do
668+ HsMultiIf NoExtField guards -> do
629 breakpoint
670 breakpoint
630− inci . sitcc $ sep newline (located' (p_grhs RightArrow)) guards
671+ inci . inci $ sep newline (located' (p_grhs RightArrow)) guards
631− HsLet NoExt localBinds e ->
672+ HsLet NoExtField localBinds e ->
632 p_let p_hsExpr localBinds e
673 p_let p_hsExpr localBinds e
633− HsDo NoExt ctx es -> do
674+ HsDo NoExtField ctx es -> do
634 let doBody header = do
675 let doBody header = do
635 txt header
676 txt header
636 breakpoint
677 breakpoint
637 ub <- layoutToBraces <$> getLayout
678 ub <- layoutToBraces <$> getLayout
640− (located' (ub . p_stmt' exprPlacement (p_hsExpr' S)))
681+ (ub . withSpacing (p_stmt' exprPlacement (p_hsExpr' S)))
641 (unLoc es)
682 (unLoc es)
642− compBody = brackets N $ located es $ \xs -> do
683+ compBody = brackets N . located es $ \xs -> do
643 let p_parBody =
684 let p_parBody =
645− (breakpoint >> txt "| ")
686+ (breakpoint >> txt "|" >> space)
646 p_seqBody
687 p_seqBody
647 p_seqBody =
688 p_seqBody =
650− (comma >> breakpoint)
691+ commaDel
651 (located' (sitcc . p_stmt))
692 (located' (sitcc . p_stmt))
652 stmts = init xs
693 stmts = init xs
653 yield = last xs
694 yield = last xs
@@ -668,90 +709,96 @@ p_hsExpr' s = \case
668 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
709 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
669 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
710 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
670 ExplicitList _ _ xs ->
711 ExplicitList _ _ xs ->
671− brackets s . sitcc $
712+ brackets s $
672− sep (comma >> breakpoint) (sitcc . located' p_hsExpr) xs
713+ sep commaDel (sitcc . located' p_hsExpr) xs
673 RecordCon {..} -> do
714 RecordCon {..} -> do
674 located rcon_con_name atom
715 located rcon_con_name atom
675 breakpoint
716 breakpoint
676 let HsRecFields {..} = rcon_flds
717 let HsRecFields {..} = rcon_flds
677 updName f =
718 updName f =
678− f
719+ (f :: HsRecField GhcPs (LHsExpr GhcPs))
679 { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
720 { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
680 FieldOcc _ n -> n
721 FieldOcc _ n -> n
681− XFieldOcc _ -> notImplemented "XFieldOcc"
722+ XFieldOcc x -> noExtCon x
683 fields = located' (p_hsRecField . updName) <$> rec_flds
724 fields = located' (p_hsRecField . updName) <$> rec_flds
685 case rec_dotdot of
726 case rec_dotdot of
686 Just {} -> [txt ".."]
727 Just {} -> [txt ".."]
687 Nothing -> []
728 Nothing -> []
688− inci . braces N . sitcc $
729+ inci . braces N $
689− sep (comma >> breakpoint) sitcc (fields <> dotdot)
730+ sep commaDel sitcc (fields <> dotdot)
690 RecordUpd {..} -> do
731 RecordUpd {..} -> do
691 located rupd_expr p_hsExpr
732 located rupd_expr p_hsExpr
733+ useRecordDot' <- useRecordDot
734+ let mrs sp = case getLoc sp of
735+ RealSrcSpan r -> Just r
738+ ((1 +) . srcSpanEndCol <$> mrs rupd_expr)
739+ == (srcSpanStartCol <$> mrs (head rupd_flds))
692− breakpoint
740+ unless (useRecordDot' && isPluginForm) breakpoint
693 let updName f =
741 let updName f =
694− f
742+ (f :: HsRecUpdField GhcPs)
695 { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
743 { hsRecFieldLbl = case unLoc $ hsRecFieldLbl f of
696 Ambiguous _ n -> n
744 Ambiguous _ n -> n
697 Unambiguous _ n -> n
745 Unambiguous _ n -> n
698− XAmbiguousFieldOcc _ -> notImplemented "XAmbiguousFieldOcc"
746+ XAmbiguousFieldOcc x -> noExtCon x
700− inci . braces N . sitcc $
748+ inci . braces N $
702− (comma >> breakpoint)
750+ commaDel
703 (sitcc . located' (p_hsRecField . updName))
751 (sitcc . located' (p_hsRecField . updName))
704 rupd_flds
752 rupd_flds
705− ExprWithTySig NoExt x HsWC {hswc_body = HsIB {..}} -> sitcc $ do
753+ ExprWithTySig NoExtField x HsWC {hswc_body = HsIB {..}} -> sitcc $ do
706 located x p_hsExpr
754 located x p_hsExpr
709 breakpoint
757 breakpoint
710 inci $ located hsib_body p_hsType
758 inci $ located hsib_body p_hsType
711− ExprWithTySig NoExt _ HsWC {hswc_body = XHsImplicitBndrs {}} ->
759+ ExprWithTySig NoExtField _ HsWC {hswc_body = XHsImplicitBndrs x} -> noExtCon x
712− notImplemented "XHsImplicitBndrs"
713− ExprWithTySig NoExt _ XHsWildCardBndrs {} -> notImplemented "XHsWildCardBndrs"
760+ ExprWithTySig NoExtField _ (XHsWildCardBndrs x) -> noExtCon x
714− ArithSeq NoExt _ x ->
761+ ArithSeq NoExtField _ x ->
715 case x of
762 case x of
716− From from -> brackets s . sitcc $ do
763+ From from -> brackets s $ do
717 located from p_hsExpr
764 located from p_hsExpr
718 breakpoint
765 breakpoint
720− FromThen from next -> brackets s . sitcc $ do
767+ FromThen from next -> brackets s $ do
721− sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
768+ sep commaDel (located' p_hsExpr) [from, next]
722 breakpoint
769 breakpoint
724− FromTo from to -> brackets s . sitcc $ do
771+ FromTo from to -> brackets s $ do
725 located from p_hsExpr
772 located from p_hsExpr
726 breakpoint
773 breakpoint
729 located to p_hsExpr
776 located to p_hsExpr
730− FromThenTo from next to -> brackets s . sitcc $ do
777+ FromThenTo from next to -> brackets s $ do
731− sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
778+ sep commaDel (located' p_hsExpr) [from, next]
732 breakpoint
779 breakpoint
735 located to p_hsExpr
782 located to p_hsExpr
736− HsSCC NoExt _ name x -> do
783+ HsSCC NoExtField _ name x -> do
737 txt "{-# SCC "
784 txt "{-# SCC "
738 atom name
785 atom name
739 txt " #-}"
786 txt " #-}"
740 breakpoint
787 breakpoint
741 located x p_hsExpr
788 located x p_hsExpr
742− HsCoreAnn NoExt _ value x -> do
789+ HsCoreAnn NoExtField _ value x -> do
743 txt "{-# CORE "
790 txt "{-# CORE "
744 atom value
791 atom value
745 txt " #-}"
792 txt " #-}"
746 breakpoint
793 breakpoint
747 located x p_hsExpr
794 located x p_hsExpr
748− HsBracket NoExt x -> p_hsBracket x
795+ HsBracket NoExtField x -> p_hsBracket x
749 HsRnBracketOut {} -> notImplemented "HsRnBracketOut"
796 HsRnBracketOut {} -> notImplemented "HsRnBracketOut"
750 HsTcBracketOut {} -> notImplemented "HsTcBracketOut"
797 HsTcBracketOut {} -> notImplemented "HsTcBracketOut"
751− HsSpliceE NoExt splice -> p_hsSplice splice
798+ HsSpliceE NoExtField splice -> p_hsSplice splice
752− HsProc NoExt p e -> do
799+ HsProc NoExtField p e -> do
753 txt "proc"
800 txt "proc"
754− locatedPat p $ \x -> do
801+ located p $ \x -> do
755 breakpoint
802 breakpoint
756 inci (p_pat x)
803 inci (p_pat x)
757 breakpoint
804 breakpoint
@@ -762,31 +809,11 @@ p_hsExpr' s = \case
762 txt "static"
809 txt "static"
763 breakpoint
810 breakpoint
764 inci (located e p_hsExpr)
811 inci (located e p_hsExpr)
765− HsArrApp NoExt body input arrType cond ->
766− p_hsCmd (HsCmdArrApp NoExt body input arrType cond)
767− HsArrForm NoExt form mfixity cmds ->
768− p_hsCmd (HsCmdArrForm NoExt form Prefix mfixity cmds)
769 HsTick {} -> notImplemented "HsTick"
812 HsTick {} -> notImplemented "HsTick"
770 HsBinTick {} -> notImplemented "HsBinTick"
813 HsBinTick {} -> notImplemented "HsBinTick"
771 HsTickPragma {} -> notImplemented "HsTickPragma"
814 HsTickPragma {} -> notImplemented "HsTickPragma"
772− -- These four constructs should never appear in correct programs.
773− -- See: https://github.com/tweag/ormolu/issues/343
774− EWildPat NoExt -> txt "_"
775− EAsPat NoExt n p -> do
779− EViewPat NoExt p e -> do
784− inci (located e p_hsExpr)
785− ELazyPat NoExt p -> do
788 HsWrap {} -> notImplemented "HsWrap"
815 HsWrap {} -> notImplemented "HsWrap"
789− XExpr {} -> notImplemented "XExpr"
816+ XExpr x -> noExtCon x
791p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
818p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
792p_patSynBind PSB {..} = do
819p_patSynBind PSB {..} = do
@@ -796,15 +823,15 @@ p_patSynBind PSB {..} = do
796 Unidirectional -> do
823 Unidirectional -> do
798 breakpoint
825 breakpoint
799− p_pat psb_def
826+ located psb_def p_pat
800 ImplicitBidirectional -> do
827 ImplicitBidirectional -> do
802 breakpoint
829 breakpoint
803− p_pat psb_def
830+ located psb_def p_pat
804 ExplicitBidirectional mgroup -> do
831 ExplicitBidirectional mgroup -> do
806 breakpoint
833 breakpoint
807− p_pat psb_def
834+ located psb_def p_pat
809 txt "where"
836 txt "where"
@@ -825,8 +852,8 @@ p_patSynBind PSB {..} = do
825 inci $ do
852 inci $ do
826 switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
853 switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
827 unless (null xs) breakpoint
854 unless (null xs) breakpoint
828− braces N . sitcc $
855+ braces N $
829− sep (comma >> breakpoint) (p_rdrName . recordPatSynPatVar) xs
856+ sep commaDel (p_rdrName . recordPatSynPatVar) xs
831 InfixCon l r -> do
858 InfixCon l r -> do
832 switchLayout [getLoc l, getLoc r] $ do
859 switchLayout [getLoc l, getLoc r] $ do
@@ -838,7 +865,7 @@ p_patSynBind PSB {..} = do
839 p_rdrName r
866 p_rdrName r
841−p_patSynBind (XPatSynBind NoExt) = notImplemented "XPatSynBind"
868+p_patSynBind (XPatSynBind x) = noExtCon x
844 Data body =>
871 Data body =>
@@ -880,10 +907,12 @@ p_if placer render if' then' else' = do
880 breakpoint
907 breakpoint
881 inci $ do
908 inci $ do
882 txt "then"
909 txt "then"
883 located then' $ \x ->
911 located then' $ \x ->
884 placeHanging (placer x) (render x)
912 placeHanging (placer x) (render x)
885 breakpoint
913 breakpoint
886 txt "else"
914 txt "else"
887 located else' $ \x ->
916 located else' $ \x ->
888 placeHanging (placer x) (render x)
917 placeHanging (placer x) (render x)
@@ -905,77 +934,77 @@ p_let render localBinds e = sitcc $ do
906p_pat :: Pat GhcPs -> R ()
935p_pat :: Pat GhcPs -> R ()
907p_pat = \case
936p_pat = \case
908− -- Note: starting from GHC 8.8, 'LPat' == 'Pat'. Located 'Pat's are always
909− -- constructed with the 'XPat' constructor, containing a @Located Pat@.
910− XPat pat -> located pat p_pat
911− WildPat NoExt -> txt "_"
937+ WildPat NoExtField -> txt "_"
912− VarPat NoExt name -> p_rdrName name
938+ VarPat NoExtField name -> p_rdrName name
913− LazyPat NoExt pat -> do
939+ LazyPat NoExtField pat -> do
915− p_pat pat
941+ located pat p_pat
916− AsPat NoExt name pat -> do
942+ AsPat NoExtField name pat -> do
917 p_rdrName name
943 p_rdrName name
919− p_pat pat
945+ located pat p_pat
920− ParPat NoExt pat ->
946+ ParPat NoExtField pat ->
921− locatedPat pat (parens S . p_pat)
947+ located pat (parens S . p_pat)
922− BangPat NoExt pat -> do
948+ BangPat NoExtField pat -> do
924− p_pat pat
950+ located pat p_pat
925− ListPat NoExt pats ->
951+ ListPat NoExtField pats ->
926− brackets S . sitcc $ sep (comma >> breakpoint) p_pat pats
952+ brackets S $ sep commaDel (located' p_pat) pats
927− TuplePat NoExt pats boxing -> do
953+ TuplePat NoExtField pats boxing -> do
928− let f =
954+ let parens' =
929 case boxing of
955 case boxing of
930 Boxed -> parens S
956 Boxed -> parens S
931 Unboxed -> parensHash S
957 Unboxed -> parensHash S
932− f . sitcc $ sep (comma >> breakpoint) (sitcc . p_pat) pats
958+ parens' $ sep commaDel (sitcc . located' p_pat) pats
933− SumPat NoExt pat tag arity ->
959+ SumPat NoExtField pat tag arity ->
934− p_unboxedSum S tag arity (p_pat pat)
960+ p_unboxedSum S tag arity (located pat p_pat)
935 ConPatIn pat details ->
961 ConPatIn pat details ->
936 case details of
962 case details of
937 PrefixCon xs -> sitcc $ do
963 PrefixCon xs -> sitcc $ do
938 p_rdrName pat
964 p_rdrName pat
939 unless (null xs) $ do
965 unless (null xs) $ do
940 breakpoint
966 breakpoint
941− inci . sitcc $ sep breakpoint (sitcc . p_pat) xs
967+ inci . sitcc $ sep breakpoint (sitcc . located' p_pat) xs
942 RecCon (HsRecFields fields dotdot) -> do
968 RecCon (HsRecFields fields dotdot) -> do
943 p_rdrName pat
969 p_rdrName pat
944 breakpoint
970 breakpoint
945 let f = \case
971 let f = \case
946 Nothing -> txt ".."
972 Nothing -> txt ".."
947 Just x -> located x p_pat_hsRecField
973 Just x -> located x p_pat_hsRecField
948− inci . braces N . sitcc . sep (comma >> breakpoint) f $
974+ inci . braces N . sep commaDel f $
949 case dotdot of
975 case dotdot of
950 Nothing -> Just <$> fields
976 Nothing -> Just <$> fields
951− Just n -> (Just <$> take n fields) ++ [Nothing]
977+ Just (L _ n) -> (Just <$> take n fields) ++ [Nothing]
952− InfixCon x y -> do
978+ InfixCon l r -> do
953− p_pat x
979+ switchLayout [getLoc l, getLoc r] $ do
954− space
980+ located l p_pat
955− p_rdrName pat
983+ p_rdrName pat
956− breakpoint
984+ space
957− inci (p_pat y)
985+ located r p_pat
958 ConPatOut {} -> notImplemented "ConPatOut" -- presumably created by renamer?
986 ConPatOut {} -> notImplemented "ConPatOut" -- presumably created by renamer?
959− ViewPat NoExt expr pat -> sitcc $ do
987+ ViewPat NoExtField expr pat -> sitcc $ do
960 located expr p_hsExpr
988 located expr p_hsExpr
963 breakpoint
991 breakpoint
964− inci (p_pat pat)
992+ inci (located pat p_pat)
965− SplicePat NoExt splice -> p_hsSplice splice
993+ SplicePat NoExtField splice -> p_hsSplice splice
966− LitPat NoExt p -> atom p
994+ LitPat NoExtField p -> atom p
967− NPat NoExt v _ _ -> located v (atom . ol_val)
995+ NPat NoExtField v _ _ -> located v (atom . ol_val)
968− NPlusKPat NoExt n k _ _ _ -> sitcc $ do
996+ NPlusKPat NoExtField n k _ _ _ -> sitcc $ do
969 p_rdrName n
997 p_rdrName n
970 breakpoint
998 breakpoint
971 inci $ do
999 inci $ do
974 located k (atom . ol_val)
1002 located k (atom . ol_val)
975− SigPat NoExt pat hswc -> do
1003+ SigPat NoExtField pat hswc -> do
976− p_pat pat
1004+ located pat p_pat
977 p_typeAscription hswc
1005 p_typeAscription hswc
978 CoPat {} -> notImplemented "CoPat" -- apparently created at some later stage
1006 CoPat {} -> notImplemented "CoPat" -- apparently created at some later stage
1007+ XPat x -> noExtCon x
980p_pat_hsRecField :: HsRecField' (FieldOcc GhcPs) (LPat GhcPs) -> R ()
1009p_pat_hsRecField :: HsRecField' (FieldOcc GhcPs) (LPat GhcPs) -> R ()
981p_pat_hsRecField HsRecField {..} = do
1010p_pat_hsRecField HsRecField {..} = do
@@ -983,42 +1012,40 @@ p_pat_hsRecField HsRecField {..} = do
983 p_rdrName (rdrNameFieldOcc x)
1012 p_rdrName (rdrNameFieldOcc x)
984 unless hsRecPun $ do
1013 unless hsRecPun $ do
987 breakpoint
1016 breakpoint
988− inci (p_pat hsRecFieldArg)
1017+ inci (located hsRecFieldArg p_pat)
990p_unboxedSum :: BracketStyle -> ConTag -> Arity -> R () -> R ()
1019p_unboxedSum :: BracketStyle -> ConTag -> Arity -> R () -> R ()
991p_unboxedSum s tag arity m = do
1020p_unboxedSum s tag arity m = do
992 let before = tag - 1
1021 let before = tag - 1
993 after = arity - before - 1
1022 after = arity - before - 1
994 args = replicate before Nothing <> [Just m] <> replicate after Nothing
1023 args = replicate before Nothing <> [Just m] <> replicate after Nothing
995− f (x, i) = do
1024+ f x =
996− let isFirst = i == 0
997− isLast = i == arity - 1
998 case x :: Maybe (R ()) of
1025 case x :: Maybe (R ()) of
999 Nothing ->
1026 Nothing ->
1000− unless (isFirst || isLast) space
1027+ space
1001 Just m' -> do
1028 Just m' -> do
1002− unless isFirst space
1029+ space
1004− unless isLast space
1031+ space
1005− parensHash s $ sep (txt "|") f (zip args [0 ..])
1032+ parensHash s $ sep (txt "|") f args
1007p_hsSplice :: HsSplice GhcPs -> R ()
1034p_hsSplice :: HsSplice GhcPs -> R ()
1008p_hsSplice = \case
1035p_hsSplice = \case
1009− HsTypedSplice NoExt deco _ expr -> p_hsSpliceTH True expr deco
1036+ HsTypedSplice NoExtField deco _ expr -> p_hsSpliceTH True expr deco
1010− HsUntypedSplice NoExt deco _ expr -> p_hsSpliceTH False expr deco
1037+ HsUntypedSplice NoExtField deco _ expr -> p_hsSpliceTH False expr deco
1011− HsQuasiQuote NoExt _ quoterName srcSpan str -> do
1038+ HsQuasiQuote NoExtField _ quoterName srcSpan str -> do
1013 p_rdrName (L srcSpan quoterName)
1040 p_rdrName (L srcSpan quoterName)
1015− -- NOTE QuasiQuoters often rely on precise custom strings. We cannot do
1042+ -- QuasiQuoters often rely on precise custom strings. We cannot do any
1016− -- any formatting here without potentially breaking someone's code.
1043+ -- formatting here without potentially breaking someone's code.
1017 atom str
1044 atom str
1018 txt "|]"
1045 txt "|]"
1019 HsSpliced {} -> notImplemented "HsSpliced"
1046 HsSpliced {} -> notImplemented "HsSpliced"
1020 HsSplicedT {} -> notImplemented "HsSplicedT"
1047 HsSplicedT {} -> notImplemented "HsSplicedT"
1021− XSplice {} -> notImplemented "XSplice"
1048+ XSplice x -> noExtCon x
1023p_hsSpliceTH ::
1050p_hsSpliceTH ::
1024 -- | Typed splice?
1051 -- | Typed splice?
@@ -1042,17 +1069,17 @@ p_hsSpliceTH isTyped expr = \case
1043p_hsBracket :: HsBracket GhcPs -> R ()
1070p_hsBracket :: HsBracket GhcPs -> R ()
1044p_hsBracket = \case
1071p_hsBracket = \case
1045− ExpBr NoExt expr -> do
1072+ ExpBr NoExtField expr -> do
1046 anns <- getEnclosingAnns
1073 anns <- getEnclosingAnns
1047 let name = case anns of
1074 let name = case anns of
1048 AnnOpenEQ : _ -> ""
1075 AnnOpenEQ : _ -> ""
1049 _ -> "e"
1076 _ -> "e"
1050 quote name (located expr p_hsExpr)
1077 quote name (located expr p_hsExpr)
1051− PatBr NoExt pat -> quote "p" (p_pat pat)
1078+ PatBr NoExtField pat -> located pat (quote "p" . p_pat)
1052− DecBrL NoExt decls -> quote "d" (p_hsDecls Free decls)
1079+ DecBrL NoExtField decls -> quote "d" (p_hsDecls Free decls)
1053− DecBrG NoExt _ -> notImplemented "DecBrG" -- result of renamer
1080+ DecBrG NoExtField _ -> notImplemented "DecBrG" -- result of renamer
1054− TypBr NoExt ty -> quote "t" (located ty p_hsType)
1081+ TypBr NoExtField ty -> quote "t" (located ty p_hsType)
1055− VarBr NoExt isSingleQuote name -> do
1082+ VarBr NoExtField isSingleQuote name -> do
1056 txt (bool "''" "'" isSingleQuote)
1083 txt (bool "''" "'" isSingleQuote)
1057 -- 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
1058 -- 'p_rdrName' since the latter expects a "located" thing. The problem
1085 -- 'p_rdrName' since the latter expects a "located" thing. The problem
@@ -1067,13 +1094,13 @@ p_hsBracket = \case
1067 && not (doesNotNeedExtraParens name)
1094 && not (doesNotNeedExtraParens name)
1068 wrapper = if isOperator then parens N else id
1095 wrapper = if isOperator then parens N else id
1069 wrapper $ p_rdrName (noLoc name)
1096 wrapper $ p_rdrName (noLoc name)
1070− TExpBr NoExt expr -> do
1097+ TExpBr NoExtField expr -> do
1071 txt "[||"
1098 txt "[||"
1072 breakpoint'
1099 breakpoint'
1073 located expr p_hsExpr
1100 located expr p_hsExpr
1074 breakpoint'
1101 breakpoint'
1075 txt "||]"
1102 txt "||]"
1076− XBracket {} -> notImplemented "XBracket"
1103+ XBracket x -> noExtCon x
1078 quote :: Text -> R () -> R ()
1105 quote :: Text -> R () -> R ()
1079 quote name body = do
1106 quote name body = do
@@ -1152,9 +1179,9 @@ liftAppend (x : xs) [] = x : xs
1152liftAppend (x : xs) (y : ys) = x <> y : liftAppend xs ys
1179liftAppend (x : xs) (y : ys) = x <> y : liftAppend xs ys
1154getGRHSSpan :: GRHS GhcPs (Located body) -> SrcSpan
1181getGRHSSpan :: GRHS GhcPs (Located body) -> SrcSpan
1155−getGRHSSpan (GRHS NoExt guards body) =
1182+getGRHSSpan (GRHS NoExtField guards body) =
1156 combineSrcSpans' $ getLoc body :| map getLoc guards
1183 combineSrcSpans' $ getLoc body :| map getLoc guards
1157−getGRHSSpan (XGRHS NoExt) = notImplemented "XGRHS"
1184+getGRHSSpan (XGRHS x) = noExtCon x
1159-- | 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
1160-- to separate it from preceding expressions and whether to bump indentation
1187-- to separate it from preceding expressions and whether to bump indentation
@@ -1175,82 +1202,77 @@ blockPlacement ::
1175 (body -> Placement) ->
1202 (body -> Placement) ->
1176 [LGRHS GhcPs (Located body)] ->
1203 [LGRHS GhcPs (Located body)] ->
1177 Placement
1204 Placement
1178−blockPlacement placer [L _ (GRHS NoExt _ (L _ x))] = placer x
1205+blockPlacement placer [L _ (GRHS NoExtField _ (L _ x))] = placer x
1179blockPlacement _ _ = Normal
1206blockPlacement _ _ = Normal
1181-- | Check if given command has a hanging form.
1208-- | Check if given command has a hanging form.
1182cmdPlacement :: HsCmd GhcPs -> Placement
1209cmdPlacement :: HsCmd GhcPs -> Placement
1183cmdPlacement = \case
1210cmdPlacement = \case
1184− HsCmdLam NoExt _ -> Hanging
1211+ HsCmdLam NoExtField _ -> Hanging
1185− HsCmdCase NoExt _ _ -> Hanging
1212+ HsCmdCase NoExtField _ _ -> Hanging
1186− HsCmdDo NoExt _ -> Hanging
1213+ HsCmdDo NoExtField _ -> Hanging
1187 _ -> Normal
1214 _ -> Normal
1189cmdTopPlacement :: HsCmdTop GhcPs -> Placement
1216cmdTopPlacement :: HsCmdTop GhcPs -> Placement
1190cmdTopPlacement = \case
1217cmdTopPlacement = \case
1191− HsCmdTop NoExt (L _ x) -> cmdPlacement x
1218+ HsCmdTop NoExtField (L _ x) -> cmdPlacement x
1192− XCmdTop {} -> notImplemented "XCmdTop"
1219+ XCmdTop x -> noExtCon x
1194-- | Check if given expression has a hanging form.
1221-- | Check if given expression has a hanging form.
1195exprPlacement :: HsExpr GhcPs -> Placement
1222exprPlacement :: HsExpr GhcPs -> Placement
1196exprPlacement = \case
1223exprPlacement = \case
1197 -- Only hang lambdas with single line parameter lists
1224 -- Only hang lambdas with single line parameter lists
1198− HsLam NoExt mg -> case mg of
1225+ HsLam NoExtField mg -> case mg of
1199− MG _ (L _ [L _ (Match NoExt _ (x : xs) _)]) _
1226+ MG _ (L _ [L _ (Match NoExtField _ (x : xs) _)]) _
1200 | isOneLineSpan (combineSrcSpans' $ fmap getLoc (x :| xs)) ->
1227 | isOneLineSpan (combineSrcSpans' $ fmap getLoc (x :| xs)) ->
1202 _ -> Normal
1229 _ -> Normal
1203− HsLamCase NoExt _ -> Hanging
1230+ HsLamCase NoExtField _ -> Hanging
1204− HsCase NoExt _ _ -> Hanging
1231+ HsCase NoExtField _ _ -> Hanging
1205− HsDo NoExt DoExpr _ -> Hanging
1232+ HsDo NoExtField DoExpr _ -> Hanging
1206− HsDo NoExt MDoExpr _ -> Hanging
1233+ HsDo NoExtField MDoExpr _ -> Hanging
1207− RecordCon NoExt _ _ -> Hanging
1234+ OpApp NoExtField _ op y ->
1208− -- If the rightmost expression in an operator chain is hanging, make the
1235+ case (fmap getOpNameStr . getOpName . unLoc) op of
1209− -- whole block hanging; so that we can use the common @f = foo $ do@
1236+ Just "$" -> exprPlacement (unLoc y)
1210− -- style.
1237+ _ -> Normal
1211− OpApp NoExt _ _ y -> exprPlacement (unLoc y)
1238+ HsApp NoExtField _ y -> exprPlacement (unLoc y)
1212− -- Same thing for function applications (usually with -XBlockArguments)
1239+ HsProc NoExtField p _ ->
1213− HsApp NoExt _ y -> exprPlacement (unLoc y)
1214− HsProc NoExt p _ ->
1215− -- https://gitlab.haskell.org/ghc/ghc/issues/17330
1216− let loc = case p of
1217− XPat pat -> getLoc pat
1218− _ -> error "exprPlacement: HsProc: Pat does not contain a location"
1219− in -- Indentation breaks if pattern is longer than one line and left
1240+ -- Indentation breaks if pattern is longer than one line and left
1220− -- hanging. Consequently, only apply hanging when it is safe.
1241+ -- hanging. Consequently, only apply hanging when it is safe.
1221− if isOneLineSpan loc
1242+ if isOneLineSpan (getLoc p)
1222− then Hanging
1243+ then Hanging
1223− else Normal
1244+ else Normal
1224 _ -> Normal
1245 _ -> Normal
1226withGuards :: [LGRHS GhcPs (Located body)] -> Bool
1247withGuards :: [LGRHS GhcPs (Located body)] -> Bool
1227withGuards = any (checkOne . unLoc)
1248withGuards = any (checkOne . unLoc)
1229 checkOne :: GRHS GhcPs (Located body) -> Bool
1250 checkOne :: GRHS GhcPs (Located body) -> Bool
1230− checkOne (GRHS NoExt [] _) = False
1251+ checkOne (GRHS NoExtField [] _) = False
1231 checkOne _ = True
1252 checkOne _ = True
1233exprOpTree :: LHsExpr GhcPs -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs)
1254exprOpTree :: LHsExpr GhcPs -> OpTree (LHsExpr GhcPs) (LHsExpr GhcPs)
1234−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)
1235exprOpTree n = OpNode n
1256exprOpTree n = OpNode n
1237getOpName :: HsExpr GhcPs -> Maybe RdrName
1258getOpName :: HsExpr GhcPs -> Maybe RdrName
1238getOpName = \case
1259getOpName = \case
1239− HsVar NoExt (L _ a) -> Just a
1260+ HsVar NoExtField (L _ a) -> Just a
1240 _ -> Nothing
1261 _ -> Nothing
1263+getOpNameStr :: RdrName -> String
1264+getOpNameStr = occNameString . rdrNameOcc
1242p_exprOpTree ::
1266p_exprOpTree ::
1243− -- | Can use special handling of dollar?
1245 -- | Bracket style to use
1267 -- | Bracket style to use
1246 BracketStyle ->
1268 BracketStyle ->
1247 OpTree (LHsExpr GhcPs) (LHsExpr GhcPs) ->
1269 OpTree (LHsExpr GhcPs) (LHsExpr GhcPs) ->
1249−p_exprOpTree _ s (OpNode x) = located x (p_hsExpr' s)
1271+p_exprOpTree s (OpNode x) = located x (p_hsExpr' s)
1250−p_exprOpTree isDollarSpecial s (OpBranch x op y) = do
1272+p_exprOpTree s (OpBranch x op y) = do
1251− -- NOTE If the beginning of the first argument and the second argument
1273+ -- If the beginning of the first argument and the second argument are on
1252− -- are on the same line, and the second argument has a hanging form, use
1274+ -- the same line, and the second argument has a hanging form, use hanging
1253− -- hanging placement.
1275+ -- placement.
1254 let placement =
1276 let placement =
1255 if isOneLineSpan
1277 if isOneLineSpan
1256 (mkSrcSpan (srcSpanStart (opTreeLoc x)) (srcSpanStart (opTreeLoc y)))
1278 (mkSrcSpan (srcSpanStart (opTreeLoc x)) (srcSpanStart (opTreeLoc y)))
@@ -1258,8 +1280,10 @@ p_exprOpTree isDollarSpecial s (OpBranch x op y) = do
1258 OpNode (L _ n) -> exprPlacement n
1280 OpNode (L _ n) -> exprPlacement n
1259 _ -> Normal
1281 _ -> Normal
1260 else Normal
1282 else Normal
1283+ -- Distinguish holes used in infix notation.
1284+ -- eg. '1 _foo 2' and '1 `_foo` 2'
1261 opWrapper = case unLoc op of
1285 opWrapper = case unLoc op of
1262− EWildPat NoExt -> backticks
1286+ HsUnboundVar NoExtField _ -> backticks
1264 layout <- getLayout
1288 layout <- getLayout
1265 let ub = case layout of
1289 let ub = case layout of
@@ -1267,27 +1291,67 @@ p_exprOpTree isDollarSpecial s (OpBranch x op y) = do
1267 MultiLine -> case placement of
1291 MultiLine -> case placement of
1268 Hanging -> useBraces
1292 Hanging -> useBraces
1269 Normal -> dontUseBraces
1293 Normal -> dontUseBraces
1270− gotDollar = case getOpName (unLoc op) of
1294+ opNameStr = (fmap getOpNameStr . getOpName . unLoc) op
1271− Just rname -> mkVarOcc "$" == rdrNameOcc rname
1295+ gotDollar = opNameStr == Just "$"
1272− _ -> False
1296+ gotColon = opNameStr == Just ":"
1297+ gotRecordDot = isRecordDot (unLoc op) (opTreeLoc y)
1274 switchLayout [opTreeLoc x] $
1299 switchLayout [opTreeLoc x] $
1275− p_exprOpTree (not gotDollar) s x
1300+ p_exprOpTree s x
1276− let p_op = located op (opWrapper . p_hsExpr)
1301+ p_op = located op (opWrapper . p_hsExpr)
1277− p_y = switchLayout [opTreeLoc y] (p_exprOpTree True N y)
1302+ p_y = switchLayout [opTreeLoc y] (p_exprOpTree N y)
1278− if isDollarSpecial && gotDollar && placement == Normal && isOneLineSpan (opTreeLoc x)
1303+ isSection = case (opTreeLoc x, getLoc op) of
1279− then do
1304+ (RealSrcSpan treeSpan, RealSrcSpan opSpan) ->
1305+ srcSpanEndCol treeSpan /= srcSpanStartCol opSpan
1308+ OpNode (L _ HsDo {}) -> True
1310+ useRecordDot' <- useRecordDot
1280− useBraces lhs
1313+ lhs
1287− 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
1292-- | Get annotations for the enclosing element.
1356-- | Get annotations for the enclosing element.
1293getEnclosingAnns :: R [AnnKeywordId]
1357getEnclosingAnns :: R [AnnKeywordId]