Move ghcide-test to stand alone dir (#4520)

* Add multiple new Haskell modules and configuration files

* Fix directory paths for test data and source directories

* Remove unnecessary test data files from the cabal configuration

* fix test data dir

* Add ghcide-test-preprocessor executable and update cabal configuration

* Remove ghcide-test-preprocessor executable and associated flag from cabal configuration

* Update test-suite dependencies to reference the correct executable

* Remove ghcide-test-preprocessor from func-test dependencies

* Add additional test data files to cabal configuration

Author: soulomoon

ghcide-bench/src/Experiments.hs

@@ -857,11 +857,9 @@ getBuildEdgesCount = tryCallTestPlugin GetBuildEdgesCount
 getRebuildsCount :: Session (Either (TResponseError @ClientToServer (Method_CustomMethod "test")) Int)
 getRebuildsCount = tryCallTestPlugin GetRebuildsCount
 
--- Copy&paste from ghcide/test/Development.IDE.Test
 getStoredKeys :: Session [Text]
 getStoredKeys = callTestPlugin GetStoredKeys
 
--- Copy&paste from ghcide/test/Development.IDE.Test
 tryCallTestPlugin :: (A.FromJSON b) => TestRequest -> Session (Either (TResponseError @ClientToServer (Method_CustomMethod "test")) b)
 tryCallTestPlugin cmd = do
     let cm = SMethod_CustomMethod (Proxy @"test")
@@ -873,7 +871,6 @@ tryCallTestPlugin cmd = do
              A.Success a -> Right a
              A.Error e   -> error e
 
--- Copy&paste from ghcide/test/Development.IDE.Test
 callTestPlugin :: (A.FromJSON b) => TestRequest -> Session b
 callTestPlugin cmd = do
     res <- tryCallTestPlugin cmd

ghcide/test/LICENSE ghcide-test/LICENSE

@@ -28,6 +28,7 @@ module Config(
     , withLongTimeout
     , lspTestCaps
     , lspTestCapsNoFileWatches
+    , testDataDir
     ) where
 
 import           Control.Exception           (bracket_)
@@ -47,7 +48,7 @@ import           Test.Hls
 import qualified Test.Hls.FileSystem         as FS
 
 testDataDir :: FilePath
-testDataDir = "ghcide" </> "test" </> "data"
+testDataDir = "ghcide-test" </> "data"
 
 mkIdeTestFs :: [FS.FileTree] -> FS.VirtualFileTree
 mkIdeTestFs = FS.mkVirtualFileTree testDataDir

ghcide/test/data/TH/THA.hs ghcide-test/data/TH/THA.hs

@@ -14,6 +14,7 @@ import           System.Process.Extra     (CreateProcess (cwd), proc,
                                            readCreateProcessWithExitCode)
 import           Test.Tasty
 import           Test.Tasty.HUnit
+import           Config                   (testDataDir)
 
 
 -- A test to ensure that the command line ghcide workflow stays working
@@ -44,7 +45,7 @@ withTempDir f = System.IO.Extra.withTempDir $ canonicalizePath >=> f
 copyTestDataFiles :: FilePath -> FilePath -> IO ()
 copyTestDataFiles dir prefix = do
   -- Copy all the test data files to the temporary workspace
-  testDataFiles <- getDirectoryFilesIO ("ghcide/test/data" </> prefix) ["//*"]
+  testDataFiles <- getDirectoryFilesIO (testDataDir </> prefix) ["//*"]
   for_ testDataFiles $ \f -> do
     createDirectoryIfMissing True $ dir </> takeDirectory f
-    copyFile ("ghcide/test/data" </> prefix </> f) (dir </> f)
+    copyFile (testDataDir </> prefix </> f) (dir </> f)

ghcide/test/data/TH/THB.hs ghcide-test/data/TH/THB.hs

@@ -18,11 +18,6 @@ tested-with:        GHC ==9.10.1 || ==9.8.2 || ==9.6.5 || ==9.4.8
 extra-source-files:
   CHANGELOG.md
   README.md
-  test/data/**/*.cabal
-  test/data/**/*.hs
-  test/data/**/*.hs-boot
-  test/data/**/*.project
-  test/data/**/*.yaml
 
 source-repository head
   type:     git
@@ -212,20 +207,6 @@ library
     ghc-options:
       -Werror
 
-flag test-exe
-  description: Build the ghcide-test-preprocessor executable
-  default:     True
-
-executable ghcide-test-preprocessor
-  import: warnings
-  default-language:   GHC2021
-  hs-source-dirs:   test/preprocessor
-  main-is:          Main.hs
-  build-depends:    base >=4 && <5
-
-  if !flag(test-exe)
-    buildable: False
-
 flag executable
   description: Build the ghcide executable
   default:     True

ghcide/test/data/TH/THC.hs ghcide-test/data/TH/THC.hs

@@ -32,6 +32,12 @@ extra-source-files:
   plugins/**/*.txt
   plugins/**/*.hs
 
+  ghcide-test/data/**/*.cabal
+  ghcide-test/data/**/*.hs
+  ghcide-test/data/**/*.hs-boot
+  ghcide-test/data/**/*.project
+  ghcide-test/data/**/*.yaml
+
   bindist/wrapper.in
 
 source-repository head
@@ -2027,7 +2033,6 @@ test-suite func-test
   type:               exitcode-stdio-1.0
   build-tool-depends:
     haskell-language-server:haskell-language-server,
-    ghcide:ghcide-test-preprocessor
 
   build-depends:
     , aeson
@@ -2124,14 +2129,27 @@ benchmark benchmark
       , text
       , yaml
 
+flag test-exe
+  description: Build the ghcide-test-preprocessor executable
+  default:     True
+
+executable ghcide-test-preprocessor
+  import: warnings
+  default-language:   GHC2021
+  hs-source-dirs:   ghcide-test/preprocessor
+  main-is:          Main.hs
+  build-depends:    base >=4 && <5
+
+  if !flag(test-exe)
+    buildable: False
 
 test-suite ghcide-tests
   import: warnings
   type:               exitcode-stdio-1.0
   default-language:   GHC2021
   build-tool-depends:
     , ghcide:ghcide
-    , ghcide:ghcide-test-preprocessor
+    , haskell-language-server:ghcide-test-preprocessor
     , implicit-hie:gen-hie
 
   build-depends:
@@ -2174,7 +2192,7 @@ test-suite ghcide-tests
   if impl(ghc <9.3)
     build-depends: ghc-typelits-knownnat
 
-  hs-source-dirs:     ghcide/test/exe
+  hs-source-dirs:     ghcide-test/exe
   ghc-options:        -threaded -O0
 
   main-is:            Main.hs