diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 2b5be914d4..948dfeb034 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -265,21 +265,3 @@ executable ghcide if !flag(executable) buildable: False - -library ghcide-test-utils - import: warnings - visibility: public - default-language: GHC2021 - - hs-source-dirs: test/cabal - exposed-modules: - Development.IDE.Test.Runfiles - - build-depends: - base > 4.9 && < 5 - - default-extensions: - LambdaCase - OverloadedStrings - RecordWildCards - ViewPatterns diff --git a/ghcide/test/exe/NonLspCommandLine.hs b/ghcide/test/exe/NonLspCommandLine.hs index 1e6fcd0317..a0940625b5 100644 --- a/ghcide/test/exe/NonLspCommandLine.hs +++ b/ghcide/test/exe/NonLspCommandLine.hs @@ -1,19 +1,17 @@ module NonLspCommandLine (tests) where -import Control.Monad ((>=>)) -import Data.Foldable (for_) -import Development.IDE.Test.Runfiles -import Development.Shake (getDirectoryFilesIO) -import System.Directory (copyFile, - createDirectoryIfMissing) -import System.Directory.Extra (canonicalizePath) -import System.Environment.Blank (setEnv) -import System.Exit (ExitCode (ExitSuccess)) -import System.FilePath (takeDirectory, ()) +import Control.Monad ((>=>)) +import Data.Foldable (for_) +import Development.Shake (getDirectoryFilesIO) +import System.Directory (copyFile, createDirectoryIfMissing) +import System.Directory.Extra (canonicalizePath) +import System.Environment.Blank (setEnv) +import System.Exit (ExitCode (ExitSuccess)) +import System.FilePath (takeDirectory, ()) import qualified System.IO.Extra -import System.Process.Extra (CreateProcess (cwd), proc, - readCreateProcessWithExitCode) +import System.Process.Extra (CreateProcess (cwd), proc, + readCreateProcessWithExitCode) import Test.Tasty import Test.Tasty.HUnit @@ -33,6 +31,9 @@ tests = testGroup "ghcide command line" ec @?= ExitSuccess ] +locateGhcideExecutable :: IO FilePath +locateGhcideExecutable = pure "ghcide" + -- | Version of 'System.IO.Extra.withTempDir' that canonicalizes the path -- Which we need to do on macOS since the $TMPDIR can be in @/private/var@ or -- @/var@ diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 9faba0c502..a06b4764f4 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -2109,7 +2109,6 @@ test-suite ghcide-tests , filepath , fuzzy , ghcide - , ghcide:ghcide-test-utils , hls-plugin-api , lens , list-t @@ -2237,7 +2236,7 @@ library ghcide-bench-lib directory, extra, filepath, - ghcide:{ghcide, ghcide-test-utils}, + ghcide:{ghcide}, hashable, lens, lsp-test,