Skip to content

Commit 61ff8d2

Browse files
jhrcekjhrcek
committed
Fixes after rebase
1 parent af19389 commit 61ff8d2

File tree

4 files changed

+33
-51
lines changed

4 files changed

+33
-51
lines changed

‎ghcide/exe/Main.hs

-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ module Main(main) where
66

77
import Arguments (Arguments (..),
88
getArguments)
9-
import Control.Monad.Extra (unless)
109
import Control.Monad.IO.Class (liftIO)
1110
import Data.Default (def)
1211
import Data.Function ((&))
1312
import Data.Version (showVersion)
1413
import Development.GitRev (gitHash)
15-
import Development.IDE (action)
16-
import Development.IDE.Core.OfInterest (kick)
1714
import Development.IDE.Core.Rules (mainRule)
1815
import qualified Development.IDE.Core.Rules as Rules
1916
import Development.IDE.Core.Tracing (withTelemetryRecorder)

‎ghcide/test/exe/DiagnosticTests.hs

+2-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ import Control.Monad.Extra (whenJust)
3636
import Data.Default (def)
3737
import Development.IDE.Plugin.Test (WaitForIdeRuleResult (..))
3838
import System.Time.Extra
39-
import Test.Hls (runSessionWithServer',
40-
runSessionWithServerInTmpDirCont,
41-
waitForProgressBegin,
42-
waitForTypecheck)
39+
import Test.Hls (runSessionWithServerInTmpDirCont,
40+
waitForProgressBegin)
4341
import Test.Hls.FileSystem (directCradle, file, text,
4442
toAbsFp)
4543
import Test.Tasty

‎ghcide/test/exe/TestUtils.hs

+17-26
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,37 @@
1-
21
{-# LANGUAGE GADTs #-}
32

43
module TestUtils where
54

6-
import Control.Applicative.Combinators
75
import Control.Concurrent.Async
8-
import Control.Exception (bracket_, finally)
9-
import Control.Lens ((.~))
10-
import qualified Control.Lens as Lens
11-
import qualified Control.Lens.Extras as Lens
12-
import Control.Monad
6+
import Control.Exception (bracket_, finally)
137
import Data.Foldable
14-
import Data.Function ((&))
158
import Data.Maybe
16-
import Development.IDE.GHC.Compat (GhcVersion (..), ghcVersion)
17-
import qualified Development.IDE.Main as IDE
18-
import Development.IDE.Test (configureCheckProject,
19-
expectNoMoreDiagnostics)
9+
import Development.IDE.GHC.Compat (GhcVersion (..), ghcVersion)
10+
import qualified Development.IDE.Main as IDE
11+
import Development.IDE.Test (configureCheckProject,
12+
expectNoMoreDiagnostics)
2013
import Development.IDE.Test.Runfiles
2114
import Development.IDE.Types.Location
22-
import Development.Shake (getDirectoryFilesIO)
23-
import Ide.Logger (Recorder, WithPriority,
24-
cmapWithPrio)
25-
import qualified Language.LSP.Protocol.Lens as L
26-
import Language.LSP.Protocol.Message
27-
import Language.LSP.Protocol.Types hiding
28-
(SemanticTokenAbsolute (..),
29-
SemanticTokenRelative (..),
30-
SemanticTokensEdit (..),
31-
mkRange)
15+
import Development.Shake (getDirectoryFilesIO)
16+
import Ide.Logger (Recorder, WithPriority,
17+
cmapWithPrio)
18+
import Language.LSP.Protocol.Types hiding
19+
(SemanticTokenAbsolute (..),
20+
SemanticTokenRelative (..),
21+
SemanticTokensEdit (..),
22+
mkRange)
3223
import Language.LSP.Test
3324
import System.Directory
34-
import System.Environment.Blank (getEnv, setEnv, unsetEnv)
25+
import System.Environment.Blank (getEnv, setEnv, unsetEnv)
3526
import System.FilePath
36-
import System.Info.Extra (isMac, isWindows)
27+
import System.Info.Extra (isMac, isWindows)
3728
import qualified System.IO.Extra
38-
import System.Process.Extra (createPipe)
29+
import System.Process.Extra (createPipe)
3930
import Test.Tasty
4031
import Test.Tasty.ExpectedFailure
4132
import Test.Tasty.HUnit
4233

43-
import Config (lspTestCaps)
34+
import Config (lspTestCaps)
4435
import LogType
4536

4637

‎haskell-language-server.cabal

+14-18
Original file line numberDiff line numberDiff line change
@@ -1680,25 +1680,23 @@ test-suite hls-refactor-plugin-tests
16801680
ghc-options: -O0
16811681
build-depends:
16821682
, base
1683+
, data-default
1684+
, directory
1685+
, extra
16831686
, filepath
1687+
, ghcide:ghcide
16841688
, haskell-language-server:hls-refactor-plugin
16851689
, hls-test-utils == 2.8.0.0
16861690
, lens
1691+
, lsp-test
16871692
, lsp-types
1688-
, text
1689-
, hls-plugin-api
16901693
, parser-combinators
1691-
, data-default
1692-
, extra
1693-
, ghcide:ghcide
1694-
, shake
1695-
, hls-plugin-api
1696-
, lsp-test
1697-
, directory
16981694
, regex-tdfa
1699-
, tasty-hunit
1700-
, tasty-expected-failure
1695+
, shake
17011696
, tasty
1697+
, tasty-expected-failure
1698+
, tasty-hunit
1699+
, text
17021700

17031701
-----------------------------
17041702
-- semantic tokens plugin
@@ -1767,19 +1765,17 @@ test-suite hls-semantic-tokens-plugin-tests
17671765
, aeson
17681766
, base
17691767
, containers
1768+
, data-default
17701769
, filepath
1770+
, ghcide == 2.8.0.0
17711771
, haskell-language-server:hls-semantic-tokens-plugin
1772-
, hls-test-utils == 2.8.0.0
1773-
, hls-plugin-api
1772+
, hls-plugin-api == 2.8.0.0
1773+
, hls-test-utils == 2.8.0.0
17741774
, lens
17751775
, lsp
1776-
, text-rope
17771776
, lsp-test
17781777
, text
1779-
, data-default
1780-
, ghcide == 2.8.0.0
1781-
, hls-plugin-api == 2.8.0.0
1782-
, data-default
1778+
, text-rope
17831779

17841780
-----------------------------
17851781
-- notes plugin

0 commit comments

Comments
 (0)