Remove the Pretty instance for HsOuterSigTyVarBndrs

src/HIndent/Ast/Declaration/Data/GADT/Constructor.hs

@@ -11,6 +11,7 @@ import qualified GHC.Types.SrcLoc as GHC
 import HIndent.Ast.Context
 import HIndent.Ast.Declaration.Data.GADT.Constructor.Signature
 import HIndent.Ast.NodeComments
+import HIndent.Ast.Type.Variable
 import HIndent.Ast.WithComments
 import qualified HIndent.GhcLibParserWrapper.GHC.Hs as GHC
 import {-# SOURCE #-} HIndent.Pretty
@@ -21,8 +22,7 @@ import qualified Data.List.NonEmpty as NE
 #endif
 data GADTConstructor = GADTConstructor
   { names :: [WithComments (GHC.IdP GHC.GhcPs)]
-  , forallNeeded :: Bool
-  , bindings :: WithComments (GHC.HsOuterSigTyVarBndrs GHC.GhcPs)
+  , bindings :: Maybe (WithComments [WithComments TypeVariable])
   , context :: Maybe (WithComments Context)
   , signature :: ConstructorSignature
   }
@@ -38,18 +38,22 @@ instance Pretty GADTConstructor where
       hor = string " :: " |=> body
       ver = newline >> indentedBlock (string ":: " |=> body)
       body =
-        case (forallNeeded, context) of
-          (True, Just ctx) -> withForallCtx ctx
-          (True, Nothing) -> withForallOnly
-          (False, Just ctx) -> withCtxOnly ctx
-          (False, Nothing) -> noForallCtx
-      withForallCtx ctx = do
-        pretty bindings
+        case (bindings, context) of
+          (Just bs, Just ctx) -> withForallCtx bs ctx
+          (Just bs, Nothing) -> withForallOnly bs
+          (Nothing, Just ctx) -> withCtxOnly ctx
+          (Nothing, Nothing) -> noForallCtx
+      withForallCtx bs ctx = do
+        string "forall"
+        prettyWith bs (spacePrefixed . fmap pretty)
+        dot
         (space >> pretty ctx) <-|> (newline >> pretty ctx)
         newline
         prefixed "=> " $ prettyVertically signature
-      withForallOnly = do
-        pretty bindings
+      withForallOnly bs = do
+        string "forall"
+        prettyWith bs (spacePrefixed . fmap pretty)
+        dot
         (space >> prettyHorizontally signature)
           <-|> (newline >> prettyVertically signature)
       withCtxOnly ctx =
@@ -61,11 +65,15 @@ mkGADTConstructor :: GHC.ConDecl GHC.GhcPs -> Maybe GADTConstructor
 mkGADTConstructor [email protected] {..} = Just $ GADTConstructor {..}
   where
     names = fromMaybe (error "Couldn't get names.") $ getNames decl
-    bindings = fromGenLocated con_bndrs
-    forallNeeded =
-      case GHC.unLoc con_bndrs of
-        GHC.HsOuterImplicit {} -> False
-        GHC.HsOuterExplicit {} -> True
+    bindings =
+      case con_bndrs of
+        GHC.L _ GHC.HsOuterImplicit {} -> Nothing
+        GHC.L l GHC.HsOuterExplicit {..} ->
+          Just
+            $ fromGenLocated
+            $ fmap
+                (fmap (fmap mkTypeVariable . fromGenLocated))
+                (GHC.L l hso_bndrs)
     signature =
       fromMaybe (error "Couldn't get signature.") $ mkConstructorSignature decl
     context = fmap (fmap mkContext . fromGenLocated) con_mb_cxt

src/HIndent/Pretty.hs

@@ -55,7 +55,7 @@
 import qualified Language.Haskell.GhclibParserEx.GHC.Hs.Expr as GHC
 import Text.Show.Unicode
 #if MIN_VERSION_ghc_lib_parser(9,6,1)
 import qualified Data.Foldable as NonEmpty
 import qualified GHC.Core.DataCon as GHC
 #endif
 #if !MIN_VERSION_ghc_lib_parser(9,6,1)
@@ -545,7 +545,7 @@
 prettyMatchExpr GHC.Match {m_ctxt = GHC.LambdaExpr, ..} = do
   string "\\"
   unless (null m_pats)
     $ case GHC.unLoc $ head m_pats of
         GHC.LazyPat {} -> space
         GHC.BangPat {} -> space
         _ -> return ()
@@ -584,7 +584,7 @@
 prettyMatchProc GHC.Match {m_ctxt = GHC.LambdaExpr, ..} = do
   string "\\"
   unless (null m_pats)
     $ case GHC.unLoc $ head m_pats of
         GHC.LazyPat {} -> space
         GHC.BangPat {} -> space
         _ -> return ()
@@ -1216,7 +1216,7 @@
   pretty' (GHC.DctMulti _ ts) = hvTuple $ fmap pretty ts
 
 instance Pretty GHC.OverlapMode where
   pretty' GHC.NoOverlap {} = notUsedInParsedStage
   pretty' GHC.Overlappable {} = string "{-# OVERLAPPABLE #-}"
   pretty' GHC.Overlapping {} = string "{-# OVERLAPPING #-}"
   pretty' GHC.Overlaps {} = string "{-# OVERLAPS #-}"
@@ -1333,8 +1333,8 @@
       [] -> pure ()
       [x'] -> string x'
       xs -> do
         string $ head xs
         indentedWithFixedLevel 0 $ newlinePrefixed $ string <$> tail xs
   pretty' (GHC.IEModuleContents _ name) =
     pretty $ fmap ModuleNameWithPrefix name
   pretty' GHC.IEGroup {} = docNode
@@ -1515,7 +1515,7 @@
   pretty' (GHC.HsFloatPrim _ x) = pretty x >> string "#"
   pretty' GHC.HsDoublePrim {} = notUsedInParsedStage
   pretty' x =
     case x of
       GHC.HsString {} -> prettyString
       GHC.HsStringPrim {} -> prettyString
     where
@@ -1647,7 +1647,7 @@
           string p |=> pretty (fmap StmtLRInsideVerticalList x)
           newline
         string "]"
       stmtsAndPrefixes l = ("| ", head l) : fmap (", ", ) (tail l)
 
 instance Pretty DoExpression where
   pretty' DoExpression {..} = do
@@ -1685,14 +1685,6 @@
   pretty' GHC.SrcLazy = string "~"
   pretty' GHC.SrcStrict = string "!"
   pretty' GHC.NoSrcStrict = pure ()
-
-instance Pretty (GHC.HsOuterSigTyVarBndrs GHC.GhcPs) where
-  pretty' GHC.HsOuterImplicit {} = pure ()
-  pretty' GHC.HsOuterExplicit {..} = do
-    string "forall"
-    spacePrefixed
-      $ fmap (pretty . fmap mkTypeVariable . fromGenLocated) hso_bndrs
-    dot
 #if MIN_VERSION_ghc_lib_parser(9,6,1)
 instance Pretty GHC.FieldLabelString where
   pretty' = output

src/HIndent/Pretty.hs-boot

@@ -8,7 +8,6 @@ module HIndent.Pretty
   ) where
 
 import           Data.Void
-import qualified GHC.Core.Type                      as GHC
 import qualified GHC.Types.Basic                    as GHC
 import qualified GHC.Types.Name.Reader              as GHC
 import qualified GHC.Types.SourceText               as GHC
@@ -44,8 +43,6 @@ instance Pretty
 
 instance Pretty GHC.RdrName
 
-instance Pretty (GHC.HsOuterTyVarBndrs GHC.Specificity GHc.GhcPs)
-
 instance Pretty SigBindFamily
 
 instance Pretty InfixOp