Use WithComments instead of GHC's types

src/HIndent/Ast/Module/Export/Entry.hs

@@ -6,29 +6,29 @@ module HIndent.Ast.Module.Export.Entry
   ) where
 
 import GHC.Stack
-import qualified GHC.Types.SrcLoc as GHC
 import qualified GHC.Unit as GHC
 import HIndent.Ast.NodeComments
+import HIndent.Ast.WithComments
 import qualified HIndent.GhcLibParserWrapper.GHC.Hs as GHC
 import HIndent.Pretty
 import HIndent.Pretty.Combinators
 import HIndent.Pretty.NodeComments
 #if MIN_VERSION_ghc_lib_parser(9, 6, 1)
 data ExportEntry
-  = SingleIdentifier (GHC.LIEWrappedName GHC.GhcPs)
+  = SingleIdentifier (WithComments (GHC.IEWrappedName GHC.GhcPs))
   | WithSpecificConstructors
-      (GHC.LIEWrappedName GHC.GhcPs)
-      [GHC.LIEWrappedName GHC.GhcPs]
-  | WithAllConstructors (GHC.LIEWrappedName GHC.GhcPs)
-  | ByModule (GHC.GenLocated GHC.SrcSpanAnnA GHC.ModuleName)
+      (WithComments (GHC.IEWrappedName GHC.GhcPs))
+      [WithComments (GHC.IEWrappedName GHC.GhcPs)]
+  | WithAllConstructors (WithComments (GHC.IEWrappedName GHC.GhcPs))
+  | ByModule (WithComments GHC.ModuleName)
 #else
 data ExportEntry
-  = SingleIdentifier (GHC.LIEWrappedName (GHC.IdP GHC.GhcPs))
+  = SingleIdentifier (WithComments (GHC.IEWrappedName (GHC.IdP GHC.GhcPs)))
   | WithSpecificConstructors
-      (GHC.LIEWrappedName (GHC.IdP GHC.GhcPs))
-      [GHC.LIEWrappedName (GHC.IdP GHC.GhcPs)]
-  | WithAllConstructors (GHC.LIEWrappedName (GHC.IdP GHC.GhcPs))
-  | ByModule (GHC.GenLocated GHC.SrcSpanAnnA GHC.ModuleName)
+      (WithComments (GHC.IEWrappedName (GHC.IdP GHC.GhcPs)))
+      [WithComments (GHC.IEWrappedName (GHC.IdP GHC.GhcPs))]
+  | WithAllConstructors (WithComments (GHC.IEWrappedName (GHC.IdP GHC.GhcPs)))
+  | ByModule (WithComments GHC.ModuleName)
 #endif
 instance CommentExtraction ExportEntry where
   nodeComments SingleIdentifier {} = NodeComments [] [] []
@@ -50,13 +50,16 @@ mkExportEntry (GHC.IEThingAll _ name _) = WithAllConstructors name
 mkExportEntry (GHC.IEThingWith _ name _ constructors _) =
   WithSpecificConstructors name constructors
 #else
-mkExportEntry (GHC.IEVar _ name) = SingleIdentifier name
-mkExportEntry (GHC.IEThingAbs _ name) = SingleIdentifier name
-mkExportEntry (GHC.IEThingAll _ name) = WithAllConstructors name
+mkExportEntry (GHC.IEVar _ name) = SingleIdentifier $ fromGenLocated name
+mkExportEntry (GHC.IEThingAbs _ name) = SingleIdentifier $ fromGenLocated name
+mkExportEntry (GHC.IEThingAll _ name) =
+  WithAllConstructors $ fromGenLocated name
 mkExportEntry (GHC.IEThingWith _ name _ constructors) =
-  WithSpecificConstructors name constructors
+  WithSpecificConstructors
+    (fromGenLocated name)
+    (fmap fromGenLocated constructors)
 #endif
-mkExportEntry (GHC.IEModuleContents _ name) = ByModule name
+mkExportEntry (GHC.IEModuleContents _ name) = ByModule $ fromGenLocated name
 mkExportEntry GHC.IEGroup {} = neverAppears
 mkExportEntry GHC.IEDoc {} = neverAppears
 mkExportEntry GHC.IEDocNamed {} = neverAppears