Separate constructors for typed and untyped brackets

Split HsBracket into HsTypedBracket and HsUntypedBracket.

Unfortunately, we still cannot get rid of

    instance XXTypedBracket GhcTc = HsTypedBracket GhcRn

despite no longer requiring it for typechecking, but rather because the
TH desugarer works on GhcRn rather than GhcTc (See GHC.HsToCore.Quote)

1 files changed, 12 insertions, 5 deletions

diff --git a/compiler/GHC/Iface/Ext/Ast.hs b/compiler/GHC/Iface/Ext/Ast.hs
index 3aba40407b..c825c46a01 100644
--- a/compiler/GHC/Iface/Ext/Ast.hs
+++ b/compiler/GHC/Iface/Ext/Ast.hs
@@ -1183,12 +1183,16 @@ instance HiePass p => ToHie (LocatedA (HsExpr (GhcPass p))) where
       HsStatic _ expr ->
         [ toHie expr
         ]
-      HsBracket xbracket b -> case hiePass @p of
-        HieRn -> case xbracket of
-          HsBracketRnTyped _ ->
+      HsTypedBracket xbracket b -> case hiePass @p of
+        HieRn | _ <- xbracket ->
             [ toHie b
             ]
-          HsBracketRnUntyped _ p ->
+        HieTc | HsBracketTc _ _ p <- xbracket ->
+          [ toHie b
+          , toHie p
+          ]
+      HsUntypedBracket xbracket b -> case hiePass @p of
+        HieRn | (_, p) <- xbracket ->
             [ toHie b
             , toHie p
             ]
@@ -1855,7 +1859,10 @@ instance ToHie (LocatedA (SpliceDecl GhcRn)) where
         [ toHie splice
         ]
 
-instance ToHie (HsBracket a) where
+instance ToHie (HsTypedBracket a) where
+  toHie _ = pure []
+
+instance ToHie (HsUntypedBracket a) where
   toHie _ = pure []
 
 instance ToHie PendingRnSplice where