git.iko.soy/ormolu
on master help sign in
Fix record pattern synonyms
bdb22b9Mauricio Fierro
data/examples/declaration/value/pattern-synonyms/bidirectional-out.hs+14
compare with master
unifiedsplit
@@ -1,10 +1,24 @@
1+{-# LANGUAGE NamedFieldPuns #-}
1{-# LANGUAGE PatternSynonyms #-}
2{-# LANGUAGE PatternSynonyms #-}
2
3
3pattern Arrow t1 t2 = App "->" [t1, t2]
4pattern Arrow t1 t2 = App "->" [t1, t2]
4
5
6+pattern Arrow {t1, t2} = App "->" [t1, t2]
7+
8+pattern Arrow
9+ { t1,
10+ t2
11+ } =
12+ App "->" [t1, t2]
13+
5pattern Int =
14pattern Int =
6 App "Int" []
15 App "Int" []
7
16
17+pattern Maybe {t} =
18+ App
19+ "Maybe"
20+ [t]
21+
8pattern Maybe t =
22pattern Maybe t =
9 App
23 App
10 "Maybe"
24 "Maybe"
data/examples/declaration/value/pattern-synonyms/bidirectional.hs+8
@@ -1,8 +1,16 @@
1{-# LANGUAGE PatternSynonyms #-}
1{-# LANGUAGE PatternSynonyms #-}
2+{-# LANGUAGE NamedFieldPuns #-}
2
3
3pattern Arrow t1 t2 = App "->" [t1, t2]
4pattern Arrow t1 t2 = App "->" [t1, t2]
5+pattern Arrow{t1,t2} = App "->" [t1,t2]
6+pattern Arrow{t1
7+ , t2} = App "->" [t1, t2]
4pattern Int =
8pattern Int =
5 App "Int" []
9 App "Int" []
10+pattern Maybe{t} =
11+ App
12+ "Maybe"
13+ [t]
6pattern Maybe t =
14pattern Maybe t =
7 App
15 App
8 "Maybe"
16 "Maybe"
data/examples/declaration/value/pattern-synonyms/unidirectional-out.hs+12
@@ -5,6 +5,18 @@ pattern Head x <- x : xs
5pattern Head' x <-
5pattern Head' x <-
6 x : xs
6 x : xs
7
7
8+pattern Head'' {x} <-
9+ x : xs
10+
11+pattern FirstTwo {x, y} <-
12+ x : (y : xs)
13+
14+pattern FirstTwo'
15+ { x,
16+ y
17+ } <-
18+ x : (y : xs)
19+
8pattern Simple <- "Simple"
20pattern Simple <- "Simple"
9
21
10pattern WithTypeSig :: String
22pattern WithTypeSig :: String
data/examples/declaration/value/pattern-synonyms/unidirectional.hs+9
@@ -5,6 +5,15 @@ pattern Head x <- x:xs
5pattern Head' x
5pattern Head' x
6 <- x:xs
6 <- x:xs
7
7
8+pattern Head''{x}
9+ <- x:xs
10+
11+pattern FirstTwo{x,y}
12+ <- x : (y : xs)
13+
14+pattern FirstTwo'{x
15+ , y} <- x : (y:xs)
16+
8pattern Simple <- "Simple"
17pattern Simple <- "Simple"
9
18
10pattern WithTypeSig :: String
19pattern WithTypeSig :: String
src/Ormolu/Printer/Meat/Declaration/Value.hs+22−22
@@ -10,6 +10,7 @@ module Ormolu.Printer.Meat.Declaration.Value
10 )
10 )
11where
11where
12
12
13+import Ormolu.Printer.Internal
13import Bag (bagToList)
14import Bag (bagToList)
14import BasicTypes
15import BasicTypes
15import Control.Monad
16import Control.Monad
@@ -633,34 +634,29 @@ p_hsExpr = \case
633p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
634p_patSynBind :: PatSynBind GhcPs GhcPs -> R ()
634p_patSynBind PSB {..} = do
635p_patSynBind PSB {..} = do
635 txt "pattern "
636 txt "pattern "
636− let nonEmptySynDetails = \case
637− PrefixCon (_:_) -> True
638− RecCon (_:_) -> True
639− _ -> False
640 case psb_dir of
637 case psb_dir of
641 Unidirectional -> do
638 Unidirectional -> do
642 p_rdrName psb_id
639 p_rdrName psb_id
643− when (nonEmptySynDetails psb_args) space
640+ inci $ do
644− p_patSynDetails psb_args
641+ p_patSynDetails psb_args
645− txt " <-"
642+ txt " <-"
646− breakpoint
643+ breakpoint
647− inci (located psb_def p_pat)
644+ located psb_def p_pat
648 ImplicitBidirectional -> do
645 ImplicitBidirectional -> do
649 p_rdrName psb_id
646 p_rdrName psb_id
650− when (nonEmptySynDetails psb_args) space
647+ inci $ do
651− p_patSynDetails psb_args
648+ p_patSynDetails psb_args
652− txt " ="
649+ txt " ="
653− breakpoint
650+ breakpoint
654− inci (located psb_def p_pat)
651+ located psb_def p_pat
655 ExplicitBidirectional mgroup -> do
652 ExplicitBidirectional mgroup -> do
656 p_rdrName psb_id
653 p_rdrName psb_id
657− when (nonEmptySynDetails psb_args) space
658− p_patSynDetails psb_args
659− txt " <-"
660− breakpoint
661− inci (located psb_def p_pat)
662− newline
663 inci $ do
654 inci $ do
655+ p_patSynDetails psb_args
656+ txt " <-"
657+ breakpoint
658+ located psb_def p_pat
659+ newline
664 line (txt "where")
660 line (txt "where")
665 inci (p_matchGroup (Function psb_id) mgroup)
661 inci (p_matchGroup (Function psb_id) mgroup)
666p_patSynBind (XPatSynBind NoExt) = notImplemented "XPatSynBind"
662p_patSynBind (XPatSynBind NoExt) = notImplemented "XPatSynBind"
@@ -668,9 +664,13 @@ p_patSynBind (XPatSynBind NoExt) = notImplemented "XPatSynBind"
668p_patSynDetails :: HsPatSynDetails (Located RdrName) -> R ()
664p_patSynDetails :: HsPatSynDetails (Located RdrName) -> R ()
669p_patSynDetails = \case
665p_patSynDetails = \case
670 PrefixCon xs ->
666 PrefixCon xs ->
667+ switchLayout (getLoc <$> xs) $ do
668+ unless (null xs) breakpoint
671− sitcc $ sep breakpoint p_rdrName xs
669+ sitcc (sep breakpoint p_rdrName xs)
672 RecCon xs ->
670 RecCon xs ->
671+ switchLayout (getLoc . recordPatSynPatVar <$> xs) $ do
672+ unless (null xs) breakpoint
673− sitcc $ sep breakpoint (p_rdrName . recordPatSynPatVar) xs
673+ braces . sitcc $ sep (comma >> breakpoint) (p_rdrName . recordPatSynPatVar) xs
674 InfixCon _ _ -> notImplemented "InfixCon"
674 InfixCon _ _ -> notImplemented "InfixCon"
675
675
676p_pat :: Pat GhcPs -> R ()
676p_pat :: Pat GhcPs -> R ()