Include annotations when printing splices

alanz · May 5, 2024 · 166cbdb · 166cbdb
1 parent 488df4c
commit 166cbdb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/Language/Haskell/GHC/ExactPrint/ExactPrint.hs b/src/Language/Haskell/GHC/ExactPrint/ExactPrint.hs
@@ -3311,11 +3311,11 @@ instance ExactPrint (HsExpr GhcPs) where
 
   exact (HsTypedSplice an s)   = do
     an0 <- markEpAnnL an lidl AnnDollarDollar
-    s' <- exact s
+    s' <- markAnnotated s
     return (HsTypedSplice an0 s')
 
   exact (HsUntypedSplice an s) = do
-    s' <- exact s
+    s' <- markAnnotated s
     return (HsUntypedSplice an s')
 
   exact (HsProc an p c) = do

diff --git a/tests/Test.hs b/tests/Test.hs
@@ -200,9 +200,9 @@ tt' = do
     -- mkParserTest libdir "ghc910" "LinearLet.hs"
     -- mkParserTest libdir "ghc910" "Generic.hs"
     -- mkParserTest libdir "ghc910" "Expression.hs"
-    -- mkParserTest libdir "ghc910" "GenerateBug.hs"
+    mkParserTest libdir "ghc910" "GenerateBug.hs"
     -- mkParserTest libdir "ghc910" "ConstructorArgs.hs"
-    mkParserTest libdir "ghc910" "T23927_2.hs"
+    -- mkParserTest libdir "ghc910" "T23927_2.hs"
 
    -- Needs GHC changes
 

diff --git a/tests/examples/ghc910/GenerateBug.hs b/tests/examples/ghc910/GenerateBug.hs
@@ -2,8 +2,13 @@
 module Generate where
 
 onReturnCode = [||
-  let _ = foo in
-  \farInp ->
-    $$({-trace "unGen.onReturnCode" $-} unGen)
+    $$(
+       {- c1 -} unGen
+      )
   ||]
 
+
+foo =
+      (
+       {- c2 -} blah
+      )