Remove the separate ghcide-test-utils package

haskell · Feb 1, 2024 · 6bedcb2 · 6bedcb2
1 parent 598de16
commit 6bedcb2
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 76 deletions.
diff --git a/cabal.project b/cabal.project
@@ -5,7 +5,6 @@ packages:
          ./hls-graph
          ./ghcide
          ./ghcide-bench
-         ./ghcide/test
          ./hls-plugin-api
          ./hls-test-utils
 

diff --git a/ghcide-bench/ghcide-bench.cabal b/ghcide-bench/ghcide-bench.cabal
@@ -77,8 +77,7 @@ library
         directory,
         extra,
         filepath,
-        ghcide,
-        ghcide-test-utils,
+        ghcide:{ghcide, ghcide-test-utils},
         hashable,
         lens,
         lsp-test,

diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
@@ -1,4 +1,4 @@
-cabal-version:      3.0
+cabal-version:      3.4
 build-type:         Simple
 category:           Development
 name:               ghcide
@@ -316,6 +316,50 @@ executable ghcide
 
     cpp-options:   -DMONITORING_EKG
 
+library ghcide-test-utils
+  import: warnings
+  visibility: public
+  default-language:   Haskell2010
+
+  hs-source-dirs: test/src test/cabal 
+  exposed-modules:
+    Development.IDE.Test
+    Development.IDE.Test.Runfiles
+    Development.IDE.Test.Diagnostic
+
+  build-depends:
+      aeson,
+      base > 4.9 && < 5,
+      containers,
+      data-default,
+      directory,
+      extra,
+      filepath,
+      ghcide,
+      lsp-types,
+      hls-plugin-api,
+      lens,
+      lsp-test ^>= 0.16,
+      tasty-hunit >= 0.10,
+      text,
+      row-types,
+
+  default-extensions:
+      BangPatterns
+      DeriveFunctor
+      DeriveGeneric
+      FlexibleContexts
+      GeneralizedNewtypeDeriving
+      LambdaCase
+      NamedFieldPuns
+      OverloadedStrings
+      RecordWildCards
+      ScopedTypeVariables
+      StandaloneDeriving
+      TupleSections
+      TypeApplications
+      ViewPatterns
+
 test-suite ghcide-tests
   import: warnings
   type:               exitcode-stdio-1.0
@@ -345,6 +389,7 @@ test-suite ghcide-tests
   --------------------------------------------------------------
     , ghc
     , ghcide
+    , ghcide:ghcide-test-utils
     , hls-plugin-api
     , lens
     , list-t
@@ -374,7 +419,7 @@ test-suite ghcide-tests
   if impl(ghc <9.3)
     build-depends: ghc-typelits-knownnat
 
-  hs-source-dirs:     test/cabal test/exe test/src
+  hs-source-dirs:     test/exe 
   ghc-options:        -threaded -O0 -Wno-name-shadowing
 
   main-is:            Main.hs
@@ -387,9 +432,6 @@ test-suite ghcide-tests
     CPPTests
     CradleTests
     DependentFileTest
-    Development.IDE.Test
-    Development.IDE.Test.Diagnostic
-    Development.IDE.Test.Runfiles
     DiagnosticTests
     ExceptionTests
     FindDefinitionAndHoverTests

diff --git a/ghcide/test/ghcide-test-utils.cabal b/ghcide/test/ghcide-test-utils.cabal
diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
@@ -325,7 +325,7 @@ test-suite hls-call-hierarchy-plugin-tests
     , filepath
     , haskell-language-server:hls-call-hierarchy-plugin
     , hls-test-utils              == 2.6.0.0
-    , ghcide-test-utils
+    , ghcide:ghcide-test-utils
     , lens
     , lsp
     , lsp-test
@@ -1574,8 +1574,7 @@ test-suite hls-refactor-plugin-tests
     , parser-combinators
     , data-default
     , extra
-    , ghcide
-    , ghcide-test-utils
+    , ghcide:{ghcide, ghcide-test-utils}
     , shake
     , hls-plugin-api
     , lsp-test
@@ -1654,7 +1653,7 @@ test-suite hls-semantic-tokens-plugin-tests
     , filepath
     , haskell-language-server:hls-semantic-tokens-plugin
     , hls-test-utils              == 2.6.0.0
-    , ghcide-test-utils
+    , ghcide:ghcide-test-utils
     , hls-plugin-api
     , lens
     , lsp
@@ -1863,8 +1862,7 @@ test-suite func-test
     , hashable
     , lens
     , lens-aeson
-    , ghcide
-    , ghcide-test-utils
+    , ghcide:{ghcide, ghcide-test-utils}
     , hls-test-utils == 2.6.0.0
     , lsp-types
     , aeson

diff --git a/stack-lts21.yaml b/stack-lts21.yaml
@@ -5,7 +5,6 @@ packages:
   - ./hie-compat
   - ./hls-graph
   - ./ghcide/
-  - ./ghcide/test
   - ./hls-plugin-api
   - ./hls-test-utils
   # - ./shake-bench

diff --git a/stack.yaml b/stack.yaml
@@ -5,7 +5,6 @@ packages:
   - ./hie-compat
   - ./hls-graph
   - ./ghcide/
-  - ./ghcide/test
   - ./hls-plugin-api
   - ./hls-test-utils
   # - ./shake-bench