removed orphan instance, changed to showDynFlags

Author: tittoassini

plugins/default/src/Ide/Plugin/Eval/GHC.hs

@@ -11,34 +11,15 @@ module Ide.Plugin.Eval.GHC (
     hasPackage,
     addPackages,
     modifyFlags,
+    showDynFlags,
 ) where
 
 import Data.List (isPrefixOf)
-import Development.IDE.GHC.Error ()
+import Development.IDE.GHC.Compat
 import qualified EnumSet
-import Development.IDE.GHC.Compat (
-    DynFlags (..),
-    Ghc,
-    GhcMonad,
-    InteractiveImport (IIDecl),
-    getContext,
-    getSessionDynFlags,
-    parseImportDecl,
-    setContext,
-    setSessionDynFlags,
- )
 import GHC.LanguageExtensions.Type (Extension (..))
 import GhcMonad (modifySession)
-import Development.IDE.GHC.Compat (
-    DefUnitId (DefUnitId),
-    HscEnv (hsc_IC),
-    InstalledUnitId (InstalledUnitId),
-    ModRenaming (ModRenaming),
-    PackageArg (PackageArg, UnitIdArg),
-    PackageFlag (ExposePackage),
-    fsLit,
-    xopt_set,
- )
+import GhcPlugins (DefUnitId (..), InstalledUnitId (..), fsLit, hsc_IC)
 import HscTypes (InteractiveContext (ic_dflags))
 import Ide.Plugin.Eval.Util (asS, gStrictTry)
 import qualified Lexer
@@ -181,18 +162,18 @@ setExtension ic ext = ic{ic_dflags = xopt_set (ic_dflags ic) ext}
 deriving instance Read Extension
 
 -- Partial display of DynFlags contents, for testing purposes
-instance Show DynFlags where
-    show df =
-        showSDocUnsafe . vcat . map (\(n, d) -> text (n ++ ": ") <+> d) $
-            [ ("extensions", ppr . extensions $ df)
-            , ("extensionFlags", ppr . EnumSet.toList . extensionFlags $ df)
-            , ("importPaths", vList $ importPaths df)
-            -- , ("includePaths", text . show $ includePaths df)
-            -- , ("packageEnv", ppr $ packageEnv df)
-            -- , ("packageFlags", vcat . map ppr $ packageFlags df)
-            -- ,("pkgDatabase",(map) (ppr . installedPackageId) . pkgDatabase $ df)
-            -- ,("pkgDatabase",text . show <$> pkgDatabase $ df)
-            ]
+showDynFlags :: DynFlags -> String
+showDynFlags df =
+    showSDocUnsafe . vcat . map (\(n, d) -> text (n ++ ": ") <+> d) $
+        [ ("extensions", ppr . extensions $ df)
+        , ("extensionFlags", ppr . EnumSet.toList . extensionFlags $ df)
+        , ("importPaths", vList $ importPaths df)
+        -- , ("includePaths", text . show $ includePaths df)
+        -- , ("packageEnv", ppr $ packageEnv df)
+        -- , ("packageFlags", vcat . map ppr $ packageFlags df)
+        -- ,("pkgDatabase",(map) (ppr . installedPackageId) . pkgDatabase $ df)
+        -- ,("pkgDatabase",text . show <$> pkgDatabase $ df)
+        ]
 
 vList :: [String] -> SDoc
 vList = vcat . map text