Skip to content

Commit 23005f8

Browse files
jhrcekjhrcek
authored
Cleanup cabal files, ghc compat code, fix ghc warnings (#4222)
1 parent 2b8f343 commit 23005f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+361
-458
lines changed

‎ghcide/ghcide.cabal

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ homepage:
1414
https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme
1515

1616
bug-reports: https://github.com/haskell/haskell-language-server/issues
17-
tested-with: GHC ==9.8.2 || ==9.6.4 || ==9.4.8 || ==9.2.8
17+
tested-with: GHC ==9.8.2 || ==9.6.5 || ==9.4.8 || ==9.2.8
1818
extra-source-files:
1919
CHANGELOG.md
2020
README.md
@@ -98,7 +98,6 @@ library
9898
, prettyprinter-ansi-terminal
9999
, random
100100
, regex-tdfa >=1.3.1.0
101-
, row-types
102101
, safe-exceptions
103102
, sorted-list
104103
, sqlite-simple
@@ -272,25 +271,12 @@ library ghcide-test-utils
272271
visibility: public
273272
default-language: GHC2021
274273

275-
hs-source-dirs: test/src test/cabal
274+
hs-source-dirs: test/cabal
276275
exposed-modules:
277276
Development.IDE.Test.Runfiles
278277

279278
build-depends:
280-
aeson,
281-
base > 4.9 && < 5,
282-
containers,
283-
data-default,
284-
directory,
285-
extra,
286-
filepath,
287-
ghcide,
288-
lsp-types,
289-
hls-plugin-api,
290-
lens,
291-
lsp-test ^>= 0.17,
292-
tasty-hunit >= 0.10,
293-
text,
279+
base > 4.9 && < 5
294280

295281
default-extensions:
296282
LambdaCase

‎ghcide/session-loader/Development/IDE/Session.hs

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,19 @@ import qualified Data.Text as T
4949
import Data.Time.Clock
5050
import Data.Version
5151
import Development.IDE.Core.RuleTypes
52-
import Development.IDE.Core.Shake hiding (Log, Priority,
53-
knownTargets, withHieDb)
52+
import Development.IDE.Core.Shake hiding (Log, knownTargets,
53+
withHieDb)
5454
import qualified Development.IDE.GHC.Compat as Compat
55+
import Development.IDE.GHC.Compat.CmdLine
5556
import Development.IDE.GHC.Compat.Core hiding (Target,
5657
TargetFile, TargetModule,
5758
Var, Warning, getOptions)
5859
import qualified Development.IDE.GHC.Compat.Core as GHC
5960
import Development.IDE.GHC.Compat.Env hiding (Logger)
6061
import Development.IDE.GHC.Compat.Units (UnitId)
61-
import qualified Development.IDE.GHC.Compat.Util as Compat
6262
import Development.IDE.GHC.Util
6363
import Development.IDE.Graph (Action)
64+
import qualified Development.IDE.Session.Implicit as GhcIde
6465
import Development.IDE.Session.VersionCheck
6566
import Development.IDE.Types.Diagnostics
6667
import Development.IDE.Types.Exports
@@ -69,8 +70,8 @@ import Development.IDE.Types.HscEnvEq (HscEnvEq, newHscEnvEq,
6970
import Development.IDE.Types.Location
7071
import Development.IDE.Types.Options
7172
import GHC.Check
73+
import GHC.ResponseFile
7274
import qualified HIE.Bios as HieBios
73-
import qualified HIE.Bios.Cradle as HieBios
7475
import HIE.Bios.Environment hiding (getCacheDir)
7576
import HIE.Bios.Types hiding (Log)
7677
import qualified HIE.Bios.Types as HieBios
@@ -113,27 +114,21 @@ import HieDb.Utils
113114
import qualified System.Random as Random
114115
import System.Random (RandomGen)
115116

116-
import qualified Development.IDE.Session.Implicit as GhcIde
117-
118-
import Development.IDE.GHC.Compat.CmdLine
119-
120-
121117
-- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
118+
122119
#if MIN_VERSION_ghc(9,3,0)
123120
import qualified Data.Set as OS
121+
import qualified Development.IDE.GHC.Compat.Util as Compat
122+
import GHC.Data.Graph.Directed
124123

125124
import GHC.Data.Bag
126125
import GHC.Driver.Env (hsc_all_home_unit_ids)
127126
import GHC.Driver.Errors.Types
128-
import GHC.Driver.Make (checkHomeUnitsClosed)
129127
import GHC.Types.Error (errMsgDiagnostic,
130128
singleMessage)
131129
import GHC.Unit.State
132130
#endif
133131

134-
import GHC.Data.Graph.Directed
135-
import GHC.ResponseFile
136-
137132
data Log
138133
= LogSettingInitialDynFlags
139134
| LogGetInitialGhcLibDirDefaultCradleFail !CradleError !FilePath !(Maybe FilePath) !(Cradle Void)

‎ghcide/src/Development/IDE/Core/Compile.hs

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
-- Copyright (c) 2019 The DAML Authors. All rights reserved.
22
-- SPDX-License-Identifier: Apache-2.0
33

4-
{-# LANGUAGE CPP #-}
5-
{-# LANGUAGE GADTs #-}
4+
{-# LANGUAGE CPP #-}
5+
{-# LANGUAGE GADTs #-}
66

77
-- | Based on https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/API.
88
-- Given a list of paths to find libraries, and a file to compile, produce a list of 'CoreModule' values.
@@ -38,17 +38,14 @@ module Development.IDE.Core.Compile
3838
, shareUsages
3939
) where
4040

41-
import Prelude hiding (mod)
42-
import Control.Monad.IO.Class
4341
import Control.Concurrent.Extra
4442
import Control.Concurrent.STM.Stats hiding (orElse)
45-
import Control.DeepSeq (NFData (..), force,
46-
rnf)
43+
import Control.DeepSeq (NFData (..), force, rnf)
4744
import Control.Exception (evaluate)
4845
import Control.Exception.Safe
49-
import Control.Lens hiding (List, (<.>), pre)
50-
import Control.Monad.Except
46+
import Control.Lens hiding (List, pre, (<.>))
5147
import Control.Monad.Extra
48+
import Control.Monad.IO.Class
5249
import Control.Monad.Trans.Except
5350
import qualified Control.Monad.Trans.State.Strict as S
5451
import Data.Aeson (toJSON)
@@ -65,8 +62,8 @@ import Data.IntMap (IntMap)
6562
import Data.IORef
6663
import Data.List.Extra
6764
import qualified Data.Map.Strict as Map
68-
import Data.Proxy (Proxy(Proxy))
6965
import Data.Maybe
66+
import Data.Proxy (Proxy (Proxy))
7067
import qualified Data.Text as T
7168
import Data.Time (UTCTime (..))
7269
import Data.Tuple.Extra (dupe)
@@ -97,33 +94,26 @@ import GHC (ForeignHValue,
9794
import qualified GHC.LanguageExtensions as LangExt
9895
import GHC.Serialized
9996
import HieDb hiding (withHieDb)
97+
import qualified Language.LSP.Protocol.Message as LSP
98+
import Language.LSP.Protocol.Types (DiagnosticTag (..))
99+
import qualified Language.LSP.Protocol.Types as LSP
100100
import qualified Language.LSP.Server as LSP
101-
import Language.LSP.Protocol.Types (DiagnosticTag (..))
102-
import qualified Language.LSP.Protocol.Types as LSP
103-
import qualified Language.LSP.Protocol.Message as LSP
101+
import Prelude hiding (mod)
104102
import System.Directory
105103
import System.FilePath
106104
import System.IO.Extra (fixIO, newTempFileWithin)
107105

108-
-- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
109-
110-
import GHC.Tc.Gen.Splice
111-
112-
113-
114106
import qualified GHC as G
115-
116-
#if !MIN_VERSION_ghc(9,3,0)
117-
import GHC (ModuleGraph)
118-
#endif
119-
107+
import GHC.Tc.Gen.Splice
120108
import GHC.Types.ForeignStubs
121109
import GHC.Types.HpcInfo
122110
import GHC.Types.TypeEnv
123111

112+
-- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
113+
124114
#if !MIN_VERSION_ghc(9,3,0)
125115
import Data.Map (Map)
126-
import GHC (GhcException (..))
116+
import GHC.Unit.Module.Graph (ModuleGraph)
127117
import Unsafe.Coerce
128118
#endif
129119

@@ -132,8 +122,8 @@ import qualified Data.Set as Set
132122
#endif
133123

134124
#if MIN_VERSION_ghc(9,5,0)
135-
import GHC.Driver.Config.CoreToStg.Prep
136125
import GHC.Core.Lint.Interactive
126+
import GHC.Driver.Config.CoreToStg.Prep
137127
#endif
138128

139129
#if MIN_VERSION_ghc(9,7,0)
@@ -482,11 +472,7 @@ mkHiFileResultNoCompile session tcm = do
482472
tcGblEnv = tmrTypechecked tcm
483473
details <- makeSimpleDetails hsc_env_tmp tcGblEnv
484474
sf <- finalSafeMode (ms_hspp_opts ms) tcGblEnv
485-
iface' <- mkIfaceTc hsc_env_tmp sf details ms
486-
#if MIN_VERSION_ghc(9,5,0)
487-
Nothing
488-
#endif
489-
tcGblEnv
475+
iface' <- mkIfaceTc hsc_env_tmp sf details ms Nothing tcGblEnv
490476
let iface = iface' { mi_globals = Nothing, mi_usages = filterUsages (mi_usages iface') } -- See Note [Clearing mi_globals after generating an iface]
491477
pure $! mkHiFileResult ms iface details (tmrRuntimeModules tcm) Nothing
492478

@@ -1266,7 +1252,7 @@ parseHeader dflags filename contents = do
12661252
PFailedWithErrorMessages msgs ->
12671253
throwE $ diagFromErrMsgs sourceParser dflags $ msgs dflags
12681254
POk pst rdr_module -> do
1269-
let (warns, errs) = renderMessages $ getPsMessages pst dflags
1255+
let (warns, errs) = renderMessages $ getPsMessages pst
12701256

12711257
-- Just because we got a `POk`, it doesn't mean there
12721258
-- weren't errors! To clarify, the GHC parser
@@ -1301,7 +1287,7 @@ parseFileContents env customPreprocessor filename ms = do
13011287
POk pst rdr_module ->
13021288
let
13031289
hpm_annotations = mkApiAnns pst
1304-
psMessages = getPsMessages pst dflags
1290+
psMessages = getPsMessages pst
13051291
in
13061292
do
13071293
let IdePreprocessedSource preproc_warns errs parsed = customPreprocessor rdr_module
@@ -1310,7 +1296,7 @@ parseFileContents env customPreprocessor filename ms = do
13101296
throwE $ diagFromStrings sourceParser DiagnosticSeverity_Error errs
13111297

13121298
let preproc_warnings = diagFromStrings sourceParser DiagnosticSeverity_Warning preproc_warns
1313-
(parsed', msgs) <- liftIO $ applyPluginsParsedResultAction env dflags ms hpm_annotations parsed psMessages
1299+
(parsed', msgs) <- liftIO $ applyPluginsParsedResultAction env ms hpm_annotations parsed psMessages
13141300
let (warns, errors) = renderMessages msgs
13151301

13161302
-- Just because we got a `POk`, it doesn't mean there

‎ghcide/src/Development/IDE/Core/FileStore.hs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ module Development.IDE.Core.FileStore(
2121
Log(..)
2222
) where
2323

24-
import Control.Concurrent.STM.Stats (STM, atomically,
25-
modifyTVar')
24+
import Control.Concurrent.STM.Stats (STM, atomically)
2625
import Control.Concurrent.STM.TQueue (writeTQueue)
2726
import Control.Exception
2827
import Control.Monad.Extra
@@ -32,10 +31,8 @@ import qualified Data.ByteString as BS
3231
import qualified Data.ByteString.Lazy as LBS
3332
import qualified Data.HashMap.Strict as HashMap
3433
import Data.IORef
35-
import Data.List (foldl')
3634
import qualified Data.Text as T
3735
import qualified Data.Text as Text
38-
import qualified Data.Text.Utf16.Rope as Rope
3936
import Data.Time
4037
import Data.Time.Clock.POSIX
4138
import Development.IDE.Core.FileUtils

‎ghcide/src/Development/IDE/Core/OfInterest.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import Control.Monad.IO.Class
2424
import Data.HashMap.Strict (HashMap)
2525
import qualified Data.HashMap.Strict as HashMap
2626
import Data.Proxy
27-
import qualified Data.Text as T
2827
import Development.IDE.Graph
2928

3029
import Control.Concurrent.STM.Stats (atomically,

‎ghcide/src/Development/IDE/Core/PositionMapping.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import Control.Monad
2929
import Data.Algorithm.Diff
3030
import Data.Bifunctor
3131
import Data.List
32-
import Data.Row
3332
import qualified Data.Text as T
3433
import qualified Data.Vector.Unboxed as V
3534
import qualified Language.LSP.Protocol.Lens as L

0 commit comments

Comments
 (0)