Merge branch 'master' into jhrcek/remove-ghc-pre-0.9-workarounds

Author: jhrcek

.github/workflows/test.yml

@@ -101,7 +101,7 @@ jobs:
           os:  ${{ runner.os }}
 
       - name: Build
-        run: cabal build
+        run: cabal build all
 
       - name: Set test options
         # See https://github.com/ocharles/tasty-rerun/issues/22 for why we need

cabal.project

@@ -5,7 +5,6 @@ packages:
          ./hls-graph
          ./ghcide
          ./ghcide-bench
-         ./ghcide/test
          ./hls-plugin-api
          ./hls-test-utils
 

ghcide-bench/ghcide-bench.cabal

@@ -67,8 +67,7 @@ library
         directory,
         extra,
         filepath,
-        ghcide,
-        ghcide-test-utils,
+        ghcide:{ghcide, ghcide-test-utils},
         hashable,
         lens,
         lsp-test,

ghcide/ghcide.cabal

@@ -1,4 +1,4 @@
-cabal-version:      3.0
+cabal-version:      3.4
 build-type:         Simple
 category:           Development
 name:               ghcide
@@ -280,6 +280,40 @@ executable ghcide
   if !flag(executable)
     buildable: False
 
+library ghcide-test-utils
+  import: warnings
+  visibility: public
+  default-language:   GHC2021
+
+  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.17,
+      tasty-hunit >= 0.10,
+      text,
+      row-types,
+
+  default-extensions:
+      LambdaCase
+      OverloadedStrings
+      RecordWildCards
+      ViewPatterns
+  
 test-suite ghcide-tests
   import: warnings
   type:               exitcode-stdio-1.0
@@ -301,6 +335,7 @@ test-suite ghcide-tests
     , filepath
     , fuzzy
     , ghcide
+    , ghcide:ghcide-test-utils
     , hls-plugin-api
     , lens
     , list-t
@@ -330,7 +365,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
 
   main-is:            Main.hs
@@ -343,9 +378,6 @@ test-suite ghcide-tests
     CPPTests
     CradleTests
     DependentFileTest
-    Development.IDE.Test
-    Development.IDE.Test.Diagnostic
-    Development.IDE.Test.Runfiles
     DiagnosticTests
     ExceptionTests
     FindDefinitionAndHoverTests

ghcide/test/ghcide-test-utils.cabal

@@ -84,6 +84,12 @@ flag dynamic
   default:     True
   manual:      True
 
+----------------------------
+----------------------------
+-- PLUGINS
+----------------------------
+----------------------------
+
 -----------------------------
 -- cabal-fmt plugin
 -----------------------------
@@ -326,8 +332,8 @@ test-suite hls-call-hierarchy-plugin-tests
     , extra
     , filepath
     , haskell-language-server:hls-call-hierarchy-plugin
-    , hls-test-utils              == 2.6.0.0
-    , ghcide-test-utils
+    , hls-test-utils        == 2.6.0.0
+    , ghcide:ghcide-test-utils
     , lens
     , lsp
     , lsp-test
@@ -459,7 +465,7 @@ test-suite hls-explicit-imports-plugin-tests
     , extra
     , filepath
     , haskell-language-server:hls-explicit-imports-plugin
-    , hls-test-utils
+    , hls-test-utils   == 2.6.0.0
     , lens
     , lsp-types
     , row-types
@@ -1194,7 +1200,7 @@ test-suite hls-explicit-record-fields-plugin-tests
     , filepath
     , text
     , haskell-language-server:hls-explicit-record-fields-plugin
-    , hls-test-utils
+    , hls-test-utils              == 2.6.0.0
 
 -----------------------------
 -- overloaded record dot plugin
@@ -1238,7 +1244,7 @@ test-suite hls-overloaded-record-dot-plugin-tests
     , filepath
     , text
     , haskell-language-server:hls-overloaded-record-dot-plugin
-    , hls-test-utils
+    , hls-test-utils              == 2.6.0.0
 
 
 -----------------------------
@@ -1511,8 +1517,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
@@ -1589,7 +1594,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
@@ -1602,9 +1607,11 @@ test-suite hls-semantic-tokens-plugin-tests
     , data-default
     , row-types
 
------------------------------
+----------------------------
+----------------------------
 -- HLS
------------------------------
+----------------------------
+----------------------------
 
 library
   import:           defaults
@@ -1763,8 +1770,7 @@ test-suite func-test
     , deepseq
     , extra
     , filepath
-    , ghcide
-    , ghcide-test-utils
+    , ghcide:{ghcide, ghcide-test-utils}
     , hashable
     , hls-plugin-api
     , hls-test-utils == 2.6.0.0
@@ -1812,7 +1818,7 @@ test-suite wrapper-test
   build-depends:
     , base       >=4.16 && <5
     , extra
-    , hls-test-utils
+    , hls-test-utils              == 2.6.0.0
     , process
 
   hs-source-dirs:     test/wrapper

haskell-language-server.cabal

@@ -5,7 +5,6 @@ packages:
   - ./hie-compat
   - ./hls-graph
   - ./ghcide/
-  - ./ghcide/test
   - ./hls-plugin-api
   - ./hls-test-utils
   # - ./shake-bench

stack-lts21.yaml

@@ -5,7 +5,6 @@ packages:
   - ./hie-compat
   - ./hls-graph
   - ./ghcide/
-  - ./ghcide/test
   - ./hls-plugin-api
   - ./hls-test-utils
   # - ./shake-bench