diff options
Diffstat (limited to 'ghc/GHCi/UI/Tags.hs')
| -rw-r--r-- | ghc/GHCi/UI/Tags.hs | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/ghc/GHCi/UI/Tags.hs b/ghc/GHCi/UI/Tags.hs index f1d55eab15..ebf2d5ebab 100644 --- a/ghc/GHCi/UI/Tags.hs +++ b/ghc/GHCi/UI/Tags.hs @@ -16,16 +16,14 @@ module GHCi.UI.Tags ( import GHC.Utils.Exception import GHC import GHCi.UI.Monad -import GHC.Utils.Outputable -- ToDo: figure out whether we need these, and put something appropriate -- into the GHC API instead import GHC.Types.Name (nameOccName) -import GHC.Types.Name.Occurrence (pprOccName) +import GHC.Types.Name.Occurrence (occNameString) import GHC.Core.ConLike import GHC.Utils.Monad -import GHC.Unit.State -import GHC.Driver.Env +import GHC.Data.FastString import Control.Monad import Data.Function @@ -34,7 +32,6 @@ import qualified Data.List.NonEmpty as NE import Data.Maybe import Data.Ord import GHC.Driver.Phases -import GHC.Driver.Ppr import GHC.Utils.Panic import Prelude import System.Directory @@ -97,14 +94,10 @@ listModuleTags m = do case mbModInfo of Nothing -> return [] Just mInfo -> do - dflags <- getDynFlags - unit_state <- hsc_units <$> getSession - mb_print_unqual <- GHC.mkPrintUnqualifiedForModule mInfo - let unqual = fromMaybe GHC.alwaysQualify mb_print_unqual let names = fromMaybe [] $ GHC.modInfoTopLevelScope mInfo let localNames = filter ((m==) . nameModule) names mbTyThings <- mapM GHC.lookupName localNames - return $! [ tagInfo dflags unit_state unqual exported kind name realLoc + return $! [ tagInfo exported kind name realLoc | tyThing <- catMaybes mbTyThings , let name = getName tyThing , let exported = GHC.modInfoIsExportedName mInfo name @@ -133,13 +126,12 @@ data TagInfo = TagInfo -- get tag info, for later translation into Vim or Emacs style -tagInfo :: DynFlags -> UnitState -> PrintUnqualified - -> Bool -> Char -> Name -> RealSrcLoc +tagInfo :: Bool -> Char -> Name -> RealSrcLoc -> TagInfo -tagInfo dflags unit_state unqual exported kind name loc +tagInfo exported kind name loc = TagInfo exported kind - (showSDocForUser dflags unit_state unqual $ pprOccName (nameOccName name)) - (showSDocForUser dflags unit_state unqual $ ftext (srcLocFile loc)) + (occNameString $ nameOccName name) + (unpackFS (srcLocFile loc)) (srcLocLine loc) (srcLocCol loc) Nothing -- throw an exception when someone tries to overwrite existing source file (fix for #10989) |