Filter out haddock doc decls from export lists

alanz · Apr 1, 2024 · 4bafb35 · 4bafb35
1 parent 24d96e2
commit 4bafb35
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/src/Language/Haskell/GHC/ExactPrint/ExactPrint.hs b/src/Language/Haskell/GHC/ExactPrint/ExactPrint.hs
@@ -1694,7 +1694,7 @@ instance ExactPrint (HsModule GhcPs) where
           flushComments []
           putUnallocatedComments []
 
-    decls' <- markTopLevelList (filter removeDocDecl decls)
+    decls' <- markTopLevelList (filter notDocDecl decls)
 
     lo1 <- case lo0 of
         EpExplicitBraces open close -> do
@@ -1715,9 +1715,15 @@ instance ExactPrint (HsModule GhcPs) where
     return (HsModule (XModulePs anf lo1 mdeprec' mbDoc') mmn' mexports' imports' decls')
 
 
-removeDocDecl :: LHsDecl GhcPs -> Bool
-removeDocDecl (L _ DocD{}) = False
-removeDocDecl _ = True
+notDocDecl :: LHsDecl GhcPs -> Bool
+notDocDecl (L _ DocD{}) = False
+notDocDecl _ = True
+
+notIEDoc :: LIE GhcPs -> Bool
+notIEDoc (L _ IEGroup {})    = False
+notIEDoc (L _ IEDoc {})      = False
+notIEDoc (L _ IEDocNamed {}) = False
+notIEDoc _ = True
 
 -- ---------------------------------------------------------------------
 
@@ -4530,7 +4536,7 @@ instance ExactPrint (LocatedL [LocatedA (IE GhcPs)]) where
     an0 <- markEpAnnL an lal_rest AnnHiding
     p <- getPosP
     debugM $ "LocatedL [LIE:p=" ++ showPprUnsafe p
-    (an1, ies') <- markAnnList an0 (markAnnotated ies)
+    (an1, ies') <- markAnnList an0 (markAnnotated (filter notIEDoc ies))
     return (L an1 ies')
 
 instance (ExactPrint (Match GhcPs (LocatedA body)))

diff --git a/tests/Test.hs b/tests/Test.hs
@@ -143,13 +143,13 @@ mkTests = do
   roundTripMakeDeltaTests <- findTestsMD libdir
   -- prettyRoundTripTests <- findPrettyTests libdir
   return $ TestList [
-                      internalTests,
+                      -- internalTests,
                       roundTripTests
-                   ,
-                     (transformTests libdir)
-                   , (failingTests libdir)
-                   ,
-                     roundTripBalanceCommentsTests
+                   -- ,
+                   --   (transformTests libdir)
+                   -- , (failingTests libdir)
+                   -- ,
+                   --   roundTripBalanceCommentsTests
                    -- ,
                    --   roundTripMakeDeltaTests
                     ]
@@ -213,7 +213,7 @@ tt' = do
     -- mkParserTest libdir "ghc94" "Haddock.hs"
     -- mkParserTest libdir "ghc94" "Haddock1.hs"
     -- mkParserTest libdir "ghc94" "Haddock2.hs"
-    -- mkParserTest libdir "ghc94" "Haddock3.hs"
+    mkParserTest libdir "ghc94" "Haddock3.hs"
     -- mkParserTestBC libdir "ghc94" "Haddock1.hs"
 
     -- mkParserTest libdir "ghc98" "ExportWarnings_aux.hs"
@@ -222,11 +222,6 @@ tt' = do
     -- mkParserTest libdir "ghc92" "TopLevelSemis.hs"
     -- mkParserTestBC libdir "ghc92" "TopLevelSemis.hs"
 
-    -- mkParserTest libdir "ghc92" "TH1.hs"
-    -- mkParserTestBC libdir "ghc92" "TH1.hs"
-
-    -- mkParserTest libdir "transform" "AddLocalDecl1.hs"
-    mkParserTestBC libdir "transform" "AddLocalDecl1.hs"
 
     -- mkParserTest libdir "ghc710" "CExpected.hs"
    -- Needs GHC changes