WIP

Author: michaelpj

haskell-language-server.cabal

@@ -84,6 +84,12 @@ flag dynamic
   default:     True
   manual:      True
 
+----------------------------
+----------------------------
+-- PLUGINS
+----------------------------
+----------------------------
+
 -----------------------------
 -- cabal-fmt plugin
 -----------------------------
@@ -129,8 +135,7 @@ test-suite hls-cabal-fmt-plugin-tests
     , base
     , directory
     , filepath
-    , haskell-language-server:hls-cabal-fmt-plugin
-    , hls-test-utils        == 2.6.0.0
+    , haskell-language-server:{hls-cabal-fmt-plugin, hls-test-utils}
 
   if flag(isolateCabalfmtTests)
     build-tool-depends: cabal-fmt:cabal-fmt ^>=0.1.6
@@ -207,8 +212,7 @@ test-suite hls-cabal-plugin-tests
     , Cabal-syntax          >= 3.7
     , filepath
     , ghcide
-    , haskell-language-server:hls-cabal-plugin
-    , hls-test-utils    == 2.6.0.0
+    , haskell-language-server:{hls-cabal-plugin, hls-test-utils}
     , lens
     , lsp-types
     , text
@@ -268,8 +272,7 @@ test-suite hls-class-plugin-tests
   build-depends:
     , base
     , filepath
-    , haskell-language-server:hls-class-plugin
-    , hls-test-utils     == 2.6.0.0
+    , haskell-language-server:{hls-class-plugin, hls-test-utils}
     , lens
     , lsp-types
     , row-types
@@ -325,8 +328,7 @@ test-suite hls-call-hierarchy-plugin-tests
     , containers
     , extra
     , filepath
-    , haskell-language-server:hls-call-hierarchy-plugin
-    , hls-test-utils              == 2.6.0.0
+    , haskell-language-server:{hls-call-hierarchy-plugin, hls-test-utils}
     , ghcide:ghcide-test-utils
     , lens
     , lsp
@@ -405,9 +407,8 @@ test-suite hls-eval-plugin-tests
     , containers
     , extra
     , filepath
-    , haskell-language-server:hls-eval-plugin
+    , haskell-language-server:{hls-eval-plugin, hls-test-utils}
     , hls-plugin-api
-    , hls-test-utils   == 2.6.0.0
     , lens
     , lsp-types
     , text
@@ -458,8 +459,7 @@ test-suite hls-explicit-imports-plugin-tests
     , base
     , extra
     , filepath
-    , haskell-language-server:hls-explicit-imports-plugin
-    , hls-test-utils
+    , haskell-language-server:{hls-explicit-imports-plugin, hls-test-utils}
     , lens
     , lsp-types
     , row-types
@@ -514,8 +514,7 @@ test-suite hls-rename-plugin-tests
     , containers
     , filepath
     , hls-plugin-api
-    , haskell-language-server:hls-rename-plugin
-    , hls-test-utils             == 2.6.0.0
+    , haskell-language-server:{hls-rename-plugin, hls-test-utils}
 
 -----------------------------
 -- retrie plugin
@@ -571,8 +570,7 @@ test-suite hls-retrie-plugin-tests
     , containers
     , filepath
     , hls-plugin-api
-    , haskell-language-server:{hls-refactor-plugin, hls-retrie-plugin}
-    , hls-test-utils             == 2.6.0.0
+    , haskell-language-server:{hls-refactor-plugin, hls-retrie-plugin, hls-test-utils}
     , text
 
 -----------------------------
@@ -633,9 +631,8 @@ test-suite hls-hlint-plugin-tests
     , base
     , containers
     , filepath
-    , haskell-language-server:hls-hlint-plugin
+    , haskell-language-server:{hls-hlint-plugin, hls-test-utils}
     , hls-plugin-api
-    , hls-test-utils      == 2.6.0.0
     , lens
     , lsp-types
     , row-types
@@ -695,9 +692,8 @@ test-suite hls-stan-plugin-tests
   build-depends:
     , base
     , filepath
-    , haskell-language-server:hls-stan-plugin
+    , haskell-language-server:{hls-stan-plugin, hls-test-utils}
     , hls-plugin-api
-    , hls-test-utils      == 2.6.0.0
     , lens
     , lsp-types
     , text
@@ -743,8 +739,7 @@ test-suite hls-module-name-plugin-tests
   build-depends:
     , base
     , filepath
-    , haskell-language-server:hls-module-name-plugin
-    , hls-test-utils          == 2.6.0.0
+    , haskell-language-server:{hls-module-name-plugin, hls-test-utils}
 
 -----------------------------
 -- pragmas plugin
@@ -785,8 +780,7 @@ test-suite hls-pragmas-plugin-tests
     , aeson
     , base
     , filepath
-    , haskell-language-server:hls-pragmas-plugin
-    , hls-test-utils      == 2.6.0.0
+    , haskell-language-server:{hls-pragmas-plugin, hls-test-utils}
     , lens
     , lsp-types
     , text
@@ -841,8 +835,7 @@ test-suite hls-splice-plugin-tests
   build-depends:
     , base
     , filepath
-    , haskell-language-server:hls-splice-plugin
-    , hls-test-utils == 2.6.0.0
+    , haskell-language-server:{hls-splice-plugin, hls-test-utils}
     , text
     , row-types
 
@@ -895,8 +888,7 @@ test-suite hls-alternate-number-format-plugin-tests
   build-depends:
     , base                 >=4.12 && < 5
     , filepath
-    , haskell-language-server:hls-alternate-number-format-plugin
-    , hls-test-utils       == 2.6.0.0
+    , haskell-language-server:{hls-alternate-number-format-plugin, hls-test-utils}
     , regex-tdfa
     , tasty-quickcheck
     , text
@@ -947,8 +939,7 @@ test-suite hls-qualify-imported-names-plugin-tests
     , base
     , text
     , filepath
-    , haskell-language-server:hls-qualify-imported-names-plugin
-    , hls-test-utils             == 2.6.0.0
+    , haskell-language-server:{hls-qualify-imported-names-plugin, hls-test-utils}
 
 -----------------------------
 -- code range plugin
@@ -999,8 +990,7 @@ test-suite hls-code-range-plugin-tests
     , base
     , bytestring
     , filepath
-    , haskell-language-server:hls-code-range-plugin
-    , hls-test-utils             == 2.6.0.0
+    , haskell-language-server:{hls-code-range-plugin, hls-test-utils}
     , lens
     , lsp
     , lsp-test
@@ -1050,8 +1040,7 @@ test-suite hls-change-type-signature-plugin-tests
   build-depends:
     , base                 >=4.12 && < 5
     , filepath
-    , haskell-language-server:hls-change-type-signature-plugin
-    , hls-test-utils       == 2.6.0.0
+    , haskell-language-server:{hls-change-type-signature-plugin, hls-test-utils}
     , regex-tdfa
     , text
   default-extensions:
@@ -1104,8 +1093,7 @@ test-suite hls-gadt-plugin-tests
   build-depends:
     , base
     , filepath
-    , haskell-language-server:hls-gadt-plugin
-    , hls-test-utils              == 2.6.0.0
+    , haskell-language-server:{hls-gadt-plugin, hls-test-utils}
     , text
 
 -----------------------------
@@ -1148,8 +1136,7 @@ test-suite hls-explicit-fixity-plugin-tests
   build-depends:
     , base
     , filepath
-    , haskell-language-server:hls-explicit-fixity-plugin
-    , hls-test-utils              == 2.6.0.0
+    , haskell-language-server:{hls-explicit-fixity-plugin, hls-test-utils}
     , text
 
 -----------------------------
@@ -1195,8 +1182,7 @@ test-suite hls-explicit-record-fields-plugin-tests
       , base
       , filepath
       , text
-      , haskell-language-server:hls-explicit-record-fields-plugin
-      , hls-test-utils
+      , haskell-language-server:{hls-explicit-record-fields-plugin, hls-test-utils}
 
 -----------------------------
 -- overloaded record dot plugin
@@ -1239,8 +1225,7 @@ test-suite hls-overloaded-record-dot-plugin-tests
       , base
       , filepath
       , text
-      , haskell-language-server:hls-overloaded-record-dot-plugin
-      , hls-test-utils
+      , haskell-language-server:{hls-overloaded-record-dot-plugin, hls-test-utils}
 
 
 -----------------------------
@@ -1279,8 +1264,7 @@ test-suite hls-floskell-plugin-tests
   build-depends:
     , base
     , filepath
-    , haskell-language-server:hls-floskell-plugin
-    , hls-test-utils       == 2.6.0.0
+    , haskell-language-server:{hls-floskell-plugin, hls-test-utils}
 
 -----------------------------
 -- fourmolu plugin
@@ -1327,9 +1311,8 @@ test-suite hls-fourmolu-plugin-tests
     , base            >=4.12 && <5
     , aeson
     , filepath
-    , haskell-language-server:hls-fourmolu-plugin
+    , haskell-language-server:{hls-fourmolu-plugin, hls-test-utils}
     , hls-plugin-api
-    , hls-test-utils       == 2.6.0.0
     , lsp-test
 
 -----------------------------
@@ -1376,9 +1359,8 @@ test-suite hls-ormolu-plugin-tests
     , base
     , aeson
     , filepath
-    , haskell-language-server:hls-ormolu-plugin
+    , haskell-language-server:{hls-ormolu-plugin, hls-test-utils}
     , hls-plugin-api
-    , hls-test-utils     == 2.6.0.0
     , lsp-types
     , ormolu
 
@@ -1421,8 +1403,7 @@ test-suite hls-stylish-haskell-plugin-tests
   build-depends:
     , base
     , filepath
-    , haskell-language-server:hls-stylish-haskell-plugin
-    , hls-test-utils              == 2.6.0.0
+    , haskell-language-server:{hls-stylish-haskell-plugin, hls-test-utils}
 
 -----------------------------
 -- refactor plugin
@@ -1505,8 +1486,7 @@ test-suite hls-refactor-plugin-tests
   build-depends:
     , base
     , filepath
-    , haskell-language-server:hls-refactor-plugin
-    , hls-test-utils      == 2.6.0.0
+    , haskell-language-server:{hls-refactor-plugin, hls-test-utils}
     , lens
     , lsp-types
     , text
@@ -1587,8 +1567,7 @@ test-suite hls-semantic-tokens-plugin-tests
     , base
     , containers
     , filepath
-    , haskell-language-server:hls-semantic-tokens-plugin
-    , hls-test-utils              == 2.6.0.0
+    , haskell-language-server:{hls-semantic-tokens-plugin, hls-test-utils}
     , ghcide:ghcide-test-utils
     , hls-plugin-api
     , lens
@@ -1601,9 +1580,11 @@ test-suite hls-semantic-tokens-plugin-tests
     , hls-plugin-api        == 2.6.0.0
     , data-default
 
------------------------------
+----------------------------
+----------------------------
 -- HLS
------------------------------
+----------------------------
+----------------------------
 
 library
   import:           defaults
@@ -1763,10 +1744,9 @@ test-suite func-test
     , extra
     , filepath
     , ghcide:{ghcide, ghcide-test-utils}
-    , ghcide-test-utils
     , hashable
     , hls-plugin-api
-    , hls-test-utils == 2.6.0.0
+    , haskell-language-server:hls-test-utils 
     , lens
     , lsp-test
     , lsp-types
@@ -1811,7 +1791,7 @@ test-suite wrapper-test
   build-depends:
     , base       >=4.16 && <5
     , extra
-    , hls-test-utils
+    , haskell-language-server:hls-test-utils
     , process
 
   hs-source-dirs:     test/wrapper
@@ -1852,3 +1832,36 @@ benchmark benchmark
       , shake-bench == 0.2.*
       , text
       , yaml
+
+library hls-test-utils
+  import: defaults, warnings, pedantic
+  exposed-modules:
+    Test.Hls
+    Test.Hls.Util
+    Test.Hls.FileSystem
+
+  hs-source-dirs:   hls-test-utils/src
+  build-depends:
+    , aeson
+    , async
+    , base                    >=4.12 && <5
+    , bytestring
+    , containers
+    , data-default
+    , directory
+    , extra
+    , filepath
+    , ghcide                  == 2.6.0.0
+    , hls-plugin-api          == 2.6.0.0
+    , lens
+    , lsp-test                ^>=0.16
+    , lsp-types               ^>=2.1
+    , tasty
+    , tasty-expected-failure
+    , tasty-golden
+    , tasty-hunit
+    , tasty-rerun
+    , temporary
+    , text
+    , row-types
+