From 166cbdb8eedad4cbaed9f89af3451c4d264d353d Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Sun, 5 May 2024 12:19:48 +0100 Subject: [PATCH] Include annotations when printing splices --- src/Language/Haskell/GHC/ExactPrint/ExactPrint.hs | 4 ++-- tests/Test.hs | 4 ++-- tests/examples/ghc910/GenerateBug.hs | 11 ++++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Language/Haskell/GHC/ExactPrint/ExactPrint.hs b/src/Language/Haskell/GHC/ExactPrint/ExactPrint.hs index fe042d7e..a373db7d 100644 --- 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 index 4e59349a..2f1493d2 100644 --- 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 index 283bfa13..24b06002 100644 --- 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 + )