7376825 · ghcide · git.iko.soy

src/Development/IDE/Functions/AtPoint.hs+4−4

compare with master

unifiedsplit

@@ -18,10 +18,10 @@ import Development.IDE.Types.LSP

18import Development.IDE.Types.SpanInfo as SpanInfo

19

20-- GHC API imports

21−import "ghc-lib" GHC

21+import GHC

22−import "ghc-lib-parser" DynFlags

22+import DynFlags

23−import "ghc-lib-parser" Outputable hiding ((<>))

23+import Outputable hiding ((<>))

24−import "ghc-lib-parser" Name

24+import Name

25

26import Data.Maybe

27import Data.List

src/Development/IDE/Functions/Compile.hs+16−16

@@ -29,22 +29,22 @@ import Development.IDE.Functions.GHCError

29import Development.IDE.Functions.SpanInfo

30import Development.IDE.UtilGHC

31

32−import "ghc-lib" GHC hiding (parseModule, typecheckModule)

32+import GHC hiding (parseModule, typecheckModule)

33−import qualified "ghc-lib-parser" Parser

33+import qualified Parser

34−import "ghc-lib-parser" Lexer

34+import Lexer

35−import "ghc-lib-parser" Bag

35+import Bag

36−

36+

37−import qualified "ghc-lib" GHC

37+import qualified GHC

38−import "ghc-lib-parser" Panic

38+import Panic

39−import "ghc-lib-parser" GhcMonad

39+import GhcMonad

40−import "ghc-lib" GhcPlugins as GHC hiding (PackageState, fst3, (<>))

40+import GhcPlugins as GHC hiding (PackageState, fst3, (<>))

41−import qualified "ghc-lib" HeaderInfo as Hdr

41+import qualified HeaderInfo as Hdr

42−import "ghc-lib" MkIface

42+import MkIface

43−import "ghc-lib-parser" NameCache

43+import NameCache

44−import "ghc-lib-parser" StringBuffer as SB

44+import StringBuffer as SB

45−import "ghc-lib" TidyPgm

45+import TidyPgm

46−import "ghc-lib-parser" InstEnv

46+import InstEnv

47−import "ghc-lib-parser" FamInstEnv

47+import FamInstEnv

48

49import Control.DeepSeq

50import Control.Exception as E

src/Development/IDE/Functions/DependencyInformation.hs+2−2

@@ -30,8 +30,8 @@ import GHC.Generics (Generic)

30import Development.IDE.Types.Diagnostics

31import Development.IDE.UtilGHC ()

32

33−import "ghc-lib" GHC

33+import GHC

34−import "ghc-lib-parser" Module

34+import Module

35

36-- | Unprocessed results that we get from following all imports recursively starting from a module.

37data RawDependencyInformation = RawDependencyInformation

src/Development/IDE/Functions/FindImports.hs+10−10

@@ -12,16 +12,16 @@ module Development.IDE.Functions.FindImports

12import Development.IDE.Functions.GHCError as ErrUtils

13

14-- GHC imports

15−import "ghc-lib-parser" BasicTypes (StringLiteral(..))

15+import BasicTypes (StringLiteral(..))

16−import "ghc-lib-parser" DynFlags

16+import DynFlags

17−import "ghc-lib-parser" FastString

17+import FastString

18−import "ghc-lib" GHC

18+import GHC

19−import qualified "ghc-lib" HeaderInfo as Hdr

19+import qualified HeaderInfo as Hdr

20−import qualified "ghc-lib-parser" Module as M

20+import qualified Module as M

21−import qualified "ghc-lib-parser" GHC.LanguageExtensions.Type as GHC

21+import qualified GHC.LanguageExtensions.Type as GHC

22−import "ghc-lib-parser" Packages

22+import Packages

23−import "ghc-lib-parser" Outputable (showSDoc, ppr, pprPanic)

23+import Outputable (showSDoc, ppr, pprPanic)

24−import "ghc-lib" Finder

24+import Finder

25

26-- standard imports

27import Control.Monad.Extra

src/Development/IDE/Functions/GHCError.hs+6−6

@@ -31,13 +31,13 @@ module Development.IDE.Functions.GHCError

31import Development.IDE.Types.Diagnostics as D

32import qualified Data.Text as T

33import Development.IDE.UtilGHC()

34−import qualified "ghc-lib-parser" FastString as FS

34+import qualified FastString as FS

35−import "ghc-lib" GHC

35+import GHC

36−import "ghc-lib-parser" Bag

36+import Bag

37import Data.Maybe

38−import "ghc-lib-parser" ErrUtils

38+import ErrUtils

39−import "ghc-lib-parser" SrcLoc

39+import SrcLoc

40−import qualified "ghc-lib-parser" Outputable as Out

40+import qualified Outputable as Out

41import qualified Language.Haskell.LSP.Types as LSP

42

43

src/Development/IDE/Functions/Warnings.hs+3−3

@@ -3,9 +3,9 @@

3

4module Development.IDE.Functions.Warnings(withWarnings) where

5

6−import "ghc-lib-parser" ErrUtils

6+import ErrUtils

7−import "ghc-lib-parser" GhcMonad

7+import GhcMonad

8−import "ghc-lib" GhcPlugins as GHC hiding (Var)

8+import GhcPlugins as GHC hiding (Var)

9

10import qualified Data.Text as T

11import Data.Maybe

src/Development/IDE/State/FileStore.hs+1−1

@@ -11,7 +11,7 @@ module Development.IDE.State.FileStore(

11

12

13

14−import "ghc-lib-parser" StringBuffer

14+import StringBuffer

15

16import qualified Data.Map.Strict as Map

17import qualified Data.Text as T

src/Development/IDE/State/RuleTypes.hs+2−2

@@ -24,8 +24,8 @@ import Data.Typeable

24import Development.Shake hiding (Env, newCache)

25import GHC.Generics (Generic)

26

27−import "ghc-lib" GHC

27+import GHC

28−import "ghc-lib-parser" Module

28+import Module

29

30import Development.IDE.Types.SpanInfo

31

src/Development/IDE/State/Rules.hs+3−3

@@ -45,9 +45,9 @@ import Development.Shake hiding (Diagnostic, En

45import Development.IDE.Types.LSP as Compiler

46import Development.IDE.State.RuleTypes

47

48−import "ghc-lib" GHC

48+import GHC

49−import "ghc-lib-parser" UniqSupply

49+import UniqSupply

50−import "ghc-lib-parser" Module as M

50+import Module as M

51

52import qualified Development.IDE.Functions.AtPoint as AtPoint

53import Development.IDE.State.Service

src/Development/IDE/State/Service.hs+1−1

@@ -32,7 +32,7 @@ import Development.IDE.Functions.GHCError

32import Development.Shake hiding (Diagnostic, Env, newCache)

33import Development.IDE.Types.LSP as Compiler

34

35−import "ghc-lib-parser" UniqSupply

35+import UniqSupply

36

37import Development.IDE.State.Shake

38

src/Development/IDE/UtilGHC.hs+14−14

@@ -13,20 +13,20 @@

13-- * Call setSessionDynFlags, use modifyDynFlags instead. It's faster and avoids loading packages.

14module Development.IDE.UtilGHC(module Development.IDE.UtilGHC) where

15

16−import "ghc-lib-parser" Config

16+import Config

17−import qualified "ghc-lib-parser" CmdLineParser as Cmd (warnMsg)

17+import qualified CmdLineParser as Cmd (warnMsg)

18−import "ghc-lib-parser" DynFlags (parseDynamicFilePragma)

18+import DynFlags (parseDynamicFilePragma)

19−import "ghc-lib-parser" Fingerprint

19+import Fingerprint

20−import "ghc-lib" GHC hiding (convertLit)

20+import GHC hiding (convertLit)

21−import "ghc-lib-parser" GHC.LanguageExtensions.Type

21+import GHC.LanguageExtensions.Type

22−import "ghc-lib-parser" GhcMonad

22+import GhcMonad

23−import "ghc-lib" GhcPlugins as GHC hiding (PackageState, fst3, (<>))

23+import GhcPlugins as GHC hiding (PackageState, fst3, (<>))

24−import "ghc-lib" HscMain

24+import HscMain

25−import qualified "ghc-lib-parser" Packages

25+import qualified Packages

26−import "ghc-lib-parser" Panic (throwGhcExceptionIO)

26+import Panic (throwGhcExceptionIO)

27−import "ghc-lib-parser" Platform

27+import Platform

28−import qualified "ghc-lib-parser" StringBuffer as SB

28+import qualified StringBuffer as SB

29−import qualified "ghc-lib-parser" EnumSet

29+import qualified EnumSet

30

31import Control.DeepSeq

32import Control.Monad