git.iko.soy/ormolu
on master help sign in
Remove redundant ‘sitcc’
a44fdeaMark Karpov
src/Ormolu/Printer/Meat/Declaration/Data.hs+1−1
compare with master
unifiedsplit
@@ -211,7 +211,7 @@ p_hsDerivingClause HsDerivingClause {..} = do
211 let derivingWhat = located deriv_clause_tys $ \case
211 let derivingWhat = located deriv_clause_tys $ \case
212 [] -> txt "()"
212 [] -> txt "()"
213 xs ->
213 xs ->
214− parens N . sitcc $
214+ parens N $
215 sep
215 sep
216 (comma >> breakpoint)
216 (comma >> breakpoint)
217 (sitcc . located' p_hsType . hsib_body)
217 (sitcc . located' p_hsType . hsib_body)
src/Ormolu/Printer/Meat/Declaration/Default.hs+1−1
@@ -15,6 +15,6 @@ p_defaultDecl = \case
15 DefaultDecl NoExtField ts -> do
15 DefaultDecl NoExtField ts -> do
16 txt "default"
16 txt "default"
17 breakpoint
17 breakpoint
18− inci . parens N . sitcc $
18+ inci . parens N $
19 sep (comma >> breakpoint) (sitcc . located' p_hsType) ts
19 sep (comma >> breakpoint) (sitcc . located' p_hsType) ts
20 XDefaultDecl x -> noExtCon x
20 XDefaultDecl x -> noExtCon x
src/Ormolu/Printer/Meat/Declaration/Rule.hs+1−1
@@ -18,7 +18,7 @@ import Ormolu.Printer.Meat.Type
18p_ruleDecls :: RuleDecls GhcPs -> R ()
18p_ruleDecls :: RuleDecls GhcPs -> R ()
19p_ruleDecls = \case
19p_ruleDecls = \case
20 HsRules NoExtField _ xs ->
20 HsRules NoExtField _ xs ->
21− pragma "RULES" . sitcc $
21+ pragma "RULES" $
22 sep breakpoint (sitcc . located' p_ruleDecl) xs
22 sep breakpoint (sitcc . located' p_ruleDecl) xs
23 XRuleDecls x -> noExtCon x
23 XRuleDecls x -> noExtCon x
24
24
src/Ormolu/Printer/Meat/Declaration/Signature.hs+1−1
@@ -211,7 +211,7 @@ p_completeSig ::
211p_completeSig cs' mty =
211p_completeSig cs' mty =
212 located cs' $ \cs ->
212 located cs' $ \cs ->
213 pragma "COMPLETE" . inci $ do
213 pragma "COMPLETE" . inci $ do
214− sitcc $ sep (comma >> breakpoint) p_rdrName cs
214+ sep (comma >> breakpoint) p_rdrName cs
215 forM_ mty $ \ty -> do
215 forM_ mty $ \ty -> do
216 space
216 space
217 txt "::"
217 txt "::"
src/Ormolu/Printer/Meat/Declaration/Value.hs+18−18
@@ -316,7 +316,7 @@ p_hsCmd = \case
316 HsHigherOrderApp -> txt "-<<"
316 HsHigherOrderApp -> txt "-<<"
317 placeHanging (exprPlacement (unLoc input)) $
317 placeHanging (exprPlacement (unLoc input)) $
318 located input p_hsExpr
318 located input p_hsExpr
319− HsCmdArrForm NoExtField form Prefix _ cmds -> banana $ sitcc $ do
319+ HsCmdArrForm NoExtField form Prefix _ cmds -> banana $ do
320 located form p_hsExpr
320 located form p_hsExpr
321 unless (null cmds) $ do
321 unless (null cmds) $ do
322 breakpoint
322 breakpoint
@@ -654,7 +654,7 @@ p_hsExpr' s = \case
654 switchLayout [] . parens' s $
654 switchLayout [] . parens' s $
655 sep comma (located' p_hsTupArg) args
655 sep comma (located' p_hsTupArg) args
656 else
656 else
657− switchLayout (getLoc <$> args) . parens' s . sitcc $
657+ switchLayout (getLoc <$> args) . parens' s $
658 sep (comma >> breakpoint) (sitcc . located' p_hsTupArg) args
658 sep (comma >> breakpoint) (sitcc . located' p_hsTupArg) args
659 ExplicitSum NoExtField tag arity e ->
659 ExplicitSum NoExtField tag arity e ->
660 p_unboxedSum N tag arity (located e p_hsExpr)
660 p_unboxedSum N tag arity (located e p_hsExpr)
@@ -665,7 +665,7 @@ p_hsExpr' s = \case
665 HsMultiIf NoExtField guards -> do
665 HsMultiIf NoExtField guards -> do
666 txt "if"
666 txt "if"
667 breakpoint
667 breakpoint
668− inci . inci . sitcc $ sep newline (located' (p_grhs RightArrow)) guards
668+ inci . inci $ sep newline (located' (p_grhs RightArrow)) guards
669 HsLet NoExtField localBinds e ->
669 HsLet NoExtField localBinds e ->
670 p_let p_hsExpr localBinds e
670 p_let p_hsExpr localBinds e
671 HsDo NoExtField ctx es -> do
671 HsDo NoExtField ctx es -> do
@@ -680,7 +680,7 @@ p_hsExpr' s = \case
680 compBody = brackets N $ located es $ \xs -> do
680 compBody = brackets N $ located es $ \xs -> do
681 let p_parBody =
681 let p_parBody =
682 sep
682 sep
683− (breakpoint >> txt "| ")
683+ (breakpoint >> txt "|" >> space)
684 p_seqBody
684 p_seqBody
685 p_seqBody =
685 p_seqBody =
686 sitcc
686 sitcc
@@ -706,7 +706,7 @@ p_hsExpr' s = \case
706 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
706 ParStmtCtxt _ -> notImplemented "ParStmtCtxt"
707 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
707 TransStmtCtxt _ -> notImplemented "TransStmtCtxt"
708 ExplicitList _ _ xs ->
708 ExplicitList _ _ xs ->
709− brackets s . sitcc $
709+ brackets s $
710 sep (comma >> breakpoint) (sitcc . located' p_hsExpr) xs
710 sep (comma >> breakpoint) (sitcc . located' p_hsExpr) xs
711 RecordCon {..} -> do
711 RecordCon {..} -> do
712 located rcon_con_name atom
712 located rcon_con_name atom
@@ -723,7 +723,7 @@ p_hsExpr' s = \case
723 case rec_dotdot of
723 case rec_dotdot of
724 Just {} -> [txt ".."]
724 Just {} -> [txt ".."]
725 Nothing -> []
725 Nothing -> []
726− inci . braces N . sitcc $
726+ inci . braces N $
727 sep (comma >> breakpoint) sitcc (fields <> dotdot)
727 sep (comma >> breakpoint) sitcc (fields <> dotdot)
728 RecordUpd {..} -> do
728 RecordUpd {..} -> do
729 located rupd_expr p_hsExpr
729 located rupd_expr p_hsExpr
@@ -742,7 +742,7 @@ p_hsExpr' s = \case
742 Unambiguous _ n -> n
742 Unambiguous _ n -> n
743 XAmbiguousFieldOcc x -> noExtCon x
743 XAmbiguousFieldOcc x -> noExtCon x
744 }
744 }
745− inci . braces N . sitcc $
745+ inci . braces N $
746 sep
746 sep
747 (comma >> breakpoint)
747 (comma >> breakpoint)
748 (sitcc . located' (p_hsRecField . updName))
748 (sitcc . located' (p_hsRecField . updName))
@@ -757,22 +757,22 @@ p_hsExpr' s = \case
757 ExprWithTySig NoExtField _ (XHsWildCardBndrs x) -> noExtCon x
757 ExprWithTySig NoExtField _ (XHsWildCardBndrs x) -> noExtCon x
758 ArithSeq NoExtField _ x ->
758 ArithSeq NoExtField _ x ->
759 case x of
759 case x of
760− From from -> brackets s . sitcc $ do
760+ From from -> brackets s $ do
761 located from p_hsExpr
761 located from p_hsExpr
762 breakpoint
762 breakpoint
763 txt ".."
763 txt ".."
764− FromThen from next -> brackets s . sitcc $ do
764+ FromThen from next -> brackets s $ do
765− sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
765+ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
766 breakpoint
766 breakpoint
767 txt ".."
767 txt ".."
768− FromTo from to -> brackets s . sitcc $ do
768+ FromTo from to -> brackets s $ do
769 located from p_hsExpr
769 located from p_hsExpr
770 breakpoint
770 breakpoint
771 txt ".."
771 txt ".."
772 space
772 space
773 located to p_hsExpr
773 located to p_hsExpr
774− FromThenTo from next to -> brackets s . sitcc $ do
774+ FromThenTo from next to -> brackets s $ do
775− sitcc $ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
775+ sep (comma >> breakpoint) (located' p_hsExpr) [from, next]
776 breakpoint
776 breakpoint
777 txt ".."
777 txt ".."
778 space
778 space
@@ -849,7 +849,7 @@ p_patSynBind PSB {..} = do
849 inci $ do
849 inci $ do
850 switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
850 switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
851 unless (null xs) breakpoint
851 unless (null xs) breakpoint
852− braces N . sitcc $
852+ braces N $
853 sep (comma >> breakpoint) (p_rdrName . recordPatSynPatVar) xs
853 sep (comma >> breakpoint) (p_rdrName . recordPatSynPatVar) xs
854 rhs
854 rhs
855 InfixCon l r -> do
855 InfixCon l r -> do
@@ -946,13 +946,13 @@ p_pat = \case
946 txt "!"
946 txt "!"
947 located pat p_pat
947 located pat p_pat
948 ListPat NoExtField pats ->
948 ListPat NoExtField pats ->
949− brackets S . sitcc $ sep (comma >> breakpoint) (located' p_pat) pats
949+ brackets S $ sep (comma >> breakpoint) (located' p_pat) pats
950 TuplePat NoExtField pats boxing -> do
950 TuplePat NoExtField pats boxing -> do
951− let f =
951+ let parens' =
952 case boxing of
952 case boxing of
953 Boxed -> parens S
953 Boxed -> parens S
954 Unboxed -> parensHash S
954 Unboxed -> parensHash S
955− f . sitcc $ sep (comma >> breakpoint) (sitcc . located' p_pat) pats
955+ parens' $ sep (comma >> breakpoint) (sitcc . located' p_pat) pats
956 SumPat NoExtField pat tag arity ->
956 SumPat NoExtField pat tag arity ->
957 p_unboxedSum S tag arity (located pat p_pat)
957 p_unboxedSum S tag arity (located pat p_pat)
958 ConPatIn pat details ->
958 ConPatIn pat details ->
@@ -968,7 +968,7 @@ p_pat = \case
968 let f = \case
968 let f = \case
969 Nothing -> txt ".."
969 Nothing -> txt ".."
970 Just x -> located x p_pat_hsRecField
970 Just x -> located x p_pat_hsRecField
971− inci . braces N . sitcc . sep (comma >> breakpoint) f $
971+ inci . braces N . sep (comma >> breakpoint) f $
972 case dotdot of
972 case dotdot of
973 Nothing -> Just <$> fields
973 Nothing -> Just <$> fields
974 Just (L _ n) -> (Just <$> take n fields) ++ [Nothing]
974 Just (L _ n) -> (Just <$> take n fields) ++ [Nothing]
src/Ormolu/Printer/Meat/Declaration/Warning.hs+2−2
@@ -35,7 +35,7 @@ p_topLevelWarning fnames wtxt = do
35 switchLayout (fmap getLoc fnames ++ fmap getLoc lits)
35 switchLayout (fmap getLoc fnames ++ fmap getLoc lits)
36 $ pragma pragmaText . inci
36 $ pragma pragmaText . inci
37 $ do
37 $ do
38− sitcc $ sep (comma >> breakpoint) p_rdrName fnames
38+ sep (comma >> breakpoint) p_rdrName fnames
39 breakpoint
39 breakpoint
40 p_lits lits
40 p_lits lits
41
41
@@ -47,4 +47,4 @@ warningText = \case
47p_lits :: [Located StringLiteral] -> R ()
47p_lits :: [Located StringLiteral] -> R ()
48p_lits = \case
48p_lits = \case
49 [l] -> atom l
49 [l] -> atom l
50− ls -> brackets N . sitcc $ sep (comma >> breakpoint) atom ls
50+ ls -> brackets N $ sep (comma >> breakpoint) atom ls
src/Ormolu/Printer/Meat/ImportExport.hs+3−3
@@ -21,7 +21,7 @@ p_hsmodExports [] = do
21 breakpoint'
21 breakpoint'
22 txt ")"
22 txt ")"
23p_hsmodExports xs =
23p_hsmodExports xs =
24− parens N . sitcc $ do
24+ parens N $ do
25 layout <- getLayout
25 layout <- getLayout
26 sep
26 sep
27 breakpoint
27 breakpoint
@@ -65,7 +65,7 @@ p_hsmodImport useQualifiedPost ImportDecl {..} = do
65 Nothing -> return ()
65 Nothing -> return ()
66 Just (_, L _ xs) -> do
66 Just (_, L _ xs) -> do
67 breakpoint
67 breakpoint
68− parens N . sitcc $ do
68+ parens N $ do
69 layout <- getLayout
69 layout <- getLayout
70 sep
70 sep
71 breakpoint
71 breakpoint
@@ -93,7 +93,7 @@ p_lie encLayout relativePos = \case
93 inci $ do
93 inci $ do
94 let names :: [R ()]
94 let names :: [R ()]
95 names = located' p_ieWrappedName <$> xs
95 names = located' p_ieWrappedName <$> xs
96− parens N . sitcc
96+ parens N
97 $ sep (comma >> breakpoint) sitcc
97 $ sep (comma >> breakpoint) sitcc
98 $ case w of
98 $ case w of
99 NoIEWildcard -> names
99 NoIEWildcard -> names
src/Ormolu/Printer/Meat/Type.hs+5−5
@@ -98,10 +98,10 @@ p_hsType' multilineArgs docStyle = \case
98 HsBoxedTuple -> parens N
98 HsBoxedTuple -> parens N
99 HsConstraintTuple -> parens N
99 HsConstraintTuple -> parens N
100 HsBoxedOrConstraintTuple -> parens N
100 HsBoxedOrConstraintTuple -> parens N
101− in parens' . sitcc $
101+ in parens' $
102 sep (comma >> breakpoint) (sitcc . located' p_hsType) xs
102 sep (comma >> breakpoint) (sitcc . located' p_hsType) xs
103 HsSumTy NoExtField xs ->
103 HsSumTy NoExtField xs ->
104− parensHash N . sitcc $
104+ parensHash N $
105 sep (txt "|" >> breakpoint) (sitcc . located' p_hsType) xs
105 sep (txt "|" >> breakpoint) (sitcc . located' p_hsType) xs
106 HsOpTy NoExtField x op y ->
106 HsOpTy NoExtField x op y ->
107 sitcc $
107 sitcc $
@@ -154,7 +154,7 @@ p_hsType' multilineArgs docStyle = \case
154 case (p, xs) of
154 case (p, xs) of
155 (IsPromoted, L _ t : _) | isPromoted t -> space
155 (IsPromoted, L _ t : _) | isPromoted t -> space
156 _ -> return ()
156 _ -> return ()
157− sitcc $ sep (comma >> breakpoint) (sitcc . located' p_hsType) xs
157+ sep (comma >> breakpoint) (sitcc . located' p_hsType) xs
158 HsExplicitTupleTy NoExtField xs -> do
158 HsExplicitTupleTy NoExtField xs -> do
159 txt "'"
159 txt "'"
160 parens N $ do
160 parens N $ do
@@ -193,7 +193,7 @@ p_hsContext = \case
193 [] -> txt "()"
193 [] -> txt "()"
194 [x] -> located x p_hsType
194 [x] -> located x p_hsType
195 xs ->
195 xs ->
196− parens N . sitcc $
196+ parens N $
197 sep (comma >> breakpoint) (sitcc . located' p_hsType) xs
197 sep (comma >> breakpoint) (sitcc . located' p_hsType) xs
198
198
199p_hsTyVarBndr :: HsTyVarBndr GhcPs -> R ()
199p_hsTyVarBndr :: HsTyVarBndr GhcPs -> R ()
@@ -224,7 +224,7 @@ p_forallBndrs vis p tyvars =
224
224
225p_conDeclFields :: [LConDeclField GhcPs] -> R ()
225p_conDeclFields :: [LConDeclField GhcPs] -> R ()
226p_conDeclFields xs =
226p_conDeclFields xs =
227− braces N . sitcc $
227+ braces N $
228 sep (comma >> breakpoint) (sitcc . located' p_conDeclField) xs
228 sep (comma >> breakpoint) (sitcc . located' p_conDeclField) xs
229
229
230p_conDeclField :: ConDeclField GhcPs -> R ()
230p_conDeclField :: ConDeclField GhcPs -> R ()