git.iko.soy/ghcide
on master help sign in
Avoid using package imports (#924)

* Hide the package ghc-boot-th by default * Don't use package imports in haskell-ide-core

commit73768254d6ac8fbd74e7847f1b28f8c6ef12fc73 authorNeil Mitchell <35463327+neil-da@users.noreply.github.com> dateSun 5 May 2019, 20:22 (7 years ago) parent32b6a5f
11 files changed+62−62
compare with master
unifiedsplit
src/Development/IDE/Functions/AtPoint.hs+4−4 src/Development/IDE/Functions/Compile.hs+16−16 src/Development/IDE/Functions/DependencyInformation.hs+2−2 src/Development/IDE/Functions/FindImports.hs+10−10 src/Development/IDE/Functions/GHCError.hs+6−6 src/Development/IDE/Functions/Warnings.hs+3−3 src/Development/IDE/State/FileStore.hs+1−1 src/Development/IDE/State/RuleTypes.hs+2−2 src/Development/IDE/State/Rules.hs+3−3 src/Development/IDE/State/Service.hs+1−1 src/Development/IDE/UtilGHC.hs+14−14
src/Development/IDE/Functions/AtPoint.hs+4−4
@@ -18,10 +18,10 @@ import Development.IDE.Types.LSP
1818import Development.IDE.Types.SpanInfo as SpanInfo
1919
2020-- GHC API imports
21−import "ghc-lib" GHC
22−import "ghc-lib-parser" DynFlags
23−import "ghc-lib-parser" Outputable hiding ((<>))
24−import "ghc-lib-parser" Name
21+import GHC
22+import DynFlags
23+import Outputable hiding ((<>))
24+import Name
2525
2626import Data.Maybe
2727import Data.List
src/Development/IDE/Functions/Compile.hs+16−16
@@ -29,22 +29,22 @@ import Development.IDE.Functions.GHCError
2929import Development.IDE.Functions.SpanInfo
3030import Development.IDE.UtilGHC
3131
32−import "ghc-lib" GHC hiding (parseModule, typecheckModule)
33−import qualified "ghc-lib-parser" Parser
34−import "ghc-lib-parser" Lexer
35−import "ghc-lib-parser" Bag
36−
37−import qualified "ghc-lib" GHC
38−import "ghc-lib-parser" Panic
39−import "ghc-lib-parser" GhcMonad
40−import "ghc-lib" GhcPlugins as GHC hiding (PackageState, fst3, (<>))
41−import qualified "ghc-lib" HeaderInfo as Hdr
42−import "ghc-lib" MkIface
43−import "ghc-lib-parser" NameCache
44−import "ghc-lib-parser" StringBuffer as SB
45−import "ghc-lib" TidyPgm
46−import "ghc-lib-parser" InstEnv
47−import "ghc-lib-parser" FamInstEnv
32+import GHC hiding (parseModule, typecheckModule)
33+import qualified Parser
34+import Lexer
35+import Bag
36+
37+import qualified GHC
38+import Panic
39+import GhcMonad
40+import GhcPlugins as GHC hiding (PackageState, fst3, (<>))
41+import qualified HeaderInfo as Hdr
42+import MkIface
43+import NameCache
44+import StringBuffer as SB
45+import TidyPgm
46+import InstEnv
47+import FamInstEnv
4848
4949import Control.DeepSeq
5050import Control.Exception as E
src/Development/IDE/Functions/DependencyInformation.hs+2−2
@@ -30,8 +30,8 @@ import GHC.Generics (Generic)
3030import Development.IDE.Types.Diagnostics
3131import Development.IDE.UtilGHC ()
3232
33−import "ghc-lib" GHC
34−import "ghc-lib-parser" Module
33+import GHC
34+import Module
3535
3636-- | Unprocessed results that we get from following all imports recursively starting from a module.
3737data RawDependencyInformation = RawDependencyInformation
src/Development/IDE/Functions/FindImports.hs+10−10
@@ -12,16 +12,16 @@ module Development.IDE.Functions.FindImports
1212import Development.IDE.Functions.GHCError as ErrUtils
1313
1414-- GHC imports
15−import "ghc-lib-parser" BasicTypes (StringLiteral(..))
16−import "ghc-lib-parser" DynFlags
17−import "ghc-lib-parser" FastString
18−import "ghc-lib" GHC
19−import qualified "ghc-lib" HeaderInfo as Hdr
20−import qualified "ghc-lib-parser" Module as M
21−import qualified "ghc-lib-parser" GHC.LanguageExtensions.Type as GHC
22−import "ghc-lib-parser" Packages
23−import "ghc-lib-parser" Outputable (showSDoc, ppr, pprPanic)
24−import "ghc-lib" Finder
15+import BasicTypes (StringLiteral(..))
16+import DynFlags
17+import FastString
18+import GHC
19+import qualified HeaderInfo as Hdr
20+import qualified Module as M
21+import qualified GHC.LanguageExtensions.Type as GHC
22+import Packages
23+import Outputable (showSDoc, ppr, pprPanic)
24+import Finder
2525
2626-- standard imports
2727import Control.Monad.Extra
src/Development/IDE/Functions/GHCError.hs+6−6
@@ -31,13 +31,13 @@ module Development.IDE.Functions.GHCError
3131import Development.IDE.Types.Diagnostics as D
3232import qualified Data.Text as T
3333import Development.IDE.UtilGHC()
34−import qualified "ghc-lib-parser" FastString as FS
35−import "ghc-lib" GHC
36−import "ghc-lib-parser" Bag
34+import qualified FastString as FS
35+import GHC
36+import Bag
3737import Data.Maybe
38−import "ghc-lib-parser" ErrUtils
39−import "ghc-lib-parser" SrcLoc
40−import qualified "ghc-lib-parser" Outputable as Out
38+import ErrUtils
39+import SrcLoc
40+import qualified Outputable as Out
4141import qualified Language.Haskell.LSP.Types as LSP
4242
4343
src/Development/IDE/Functions/Warnings.hs+3−3
@@ -3,9 +3,9 @@
33
44module Development.IDE.Functions.Warnings(withWarnings) where
55
6−import "ghc-lib-parser" ErrUtils
7−import "ghc-lib-parser" GhcMonad
8−import "ghc-lib" GhcPlugins as GHC hiding (Var)
6+import ErrUtils
7+import GhcMonad
8+import GhcPlugins as GHC hiding (Var)
99
1010import qualified Data.Text as T
1111import Data.Maybe
src/Development/IDE/State/FileStore.hs+1−1
@@ -11,7 +11,7 @@ module Development.IDE.State.FileStore(
1111
1212
1313
14−import "ghc-lib-parser" StringBuffer
14+import StringBuffer
1515
1616import qualified Data.Map.Strict as Map
1717import qualified Data.Text as T
src/Development/IDE/State/RuleTypes.hs+2−2
@@ -24,8 +24,8 @@ import Data.Typeable
2424import Development.Shake hiding (Env, newCache)
2525import GHC.Generics (Generic)
2626
27−import "ghc-lib" GHC
28−import "ghc-lib-parser" Module
27+import GHC
28+import Module
2929
3030import Development.IDE.Types.SpanInfo
3131
src/Development/IDE/State/Rules.hs+3−3
@@ -45,9 +45,9 @@ import Development.Shake hiding (Diagnostic, En
4545import Development.IDE.Types.LSP as Compiler
4646import Development.IDE.State.RuleTypes
4747
48−import "ghc-lib" GHC
49−import "ghc-lib-parser" UniqSupply
50−import "ghc-lib-parser" Module as M
48+import GHC
49+import UniqSupply
50+import Module as M
5151
5252import qualified Development.IDE.Functions.AtPoint as AtPoint
5353import Development.IDE.State.Service
src/Development/IDE/State/Service.hs+1−1
@@ -32,7 +32,7 @@ import Development.IDE.Functions.GHCError
3232import Development.Shake hiding (Diagnostic, Env, newCache)
3333import Development.IDE.Types.LSP as Compiler
3434
35−import "ghc-lib-parser" UniqSupply
35+import UniqSupply
3636
3737import Development.IDE.State.Shake
3838
src/Development/IDE/UtilGHC.hs+14−14
@@ -13,20 +13,20 @@
1313-- * Call setSessionDynFlags, use modifyDynFlags instead. It's faster and avoids loading packages.
1414module Development.IDE.UtilGHC(module Development.IDE.UtilGHC) where
1515
16−import "ghc-lib-parser" Config
17−import qualified "ghc-lib-parser" CmdLineParser as Cmd (warnMsg)
18−import "ghc-lib-parser" DynFlags (parseDynamicFilePragma)
19−import "ghc-lib-parser" Fingerprint
20−import "ghc-lib" GHC hiding (convertLit)
21−import "ghc-lib-parser" GHC.LanguageExtensions.Type
22−import "ghc-lib-parser" GhcMonad
23−import "ghc-lib" GhcPlugins as GHC hiding (PackageState, fst3, (<>))
24−import "ghc-lib" HscMain
25−import qualified "ghc-lib-parser" Packages
26−import "ghc-lib-parser" Panic (throwGhcExceptionIO)
27−import "ghc-lib-parser" Platform
28−import qualified "ghc-lib-parser" StringBuffer as SB
29−import qualified "ghc-lib-parser" EnumSet
16+import Config
17+import qualified CmdLineParser as Cmd (warnMsg)
18+import DynFlags (parseDynamicFilePragma)
19+import Fingerprint
20+import GHC hiding (convertLit)
21+import GHC.LanguageExtensions.Type
22+import GhcMonad
23+import GhcPlugins as GHC hiding (PackageState, fst3, (<>))
24+import HscMain
25+import qualified Packages
26+import Panic (throwGhcExceptionIO)
27+import Platform
28+import qualified StringBuffer as SB
29+import qualified EnumSet
3030
3131import Control.DeepSeq
3232import Control.Monad