Write a cabal.project file in the benchmark example (#640)

* Write a cabal.project file

As suggested in #617. Taken fron #624

* Write a cabal.project.local

Otherwise Cabal still errors out

* Override default hie dir

Otherwise .hi and .hie files end up in different locations, which causes the getDefinition experiment to fail the second time it's run.

This is because we assume in ghcide that .hi and .hie files have the same lifetimes, which is not true when the ..hie files are wiped but the .hi files aren't.

Author: pepeiborra

bench/Main.hs

@@ -373,6 +373,13 @@ setup = do
   writeFile
     (examplesPath </> examplePackage </> "hie.yaml")
     exampleCradle
+  -- Need this in case there is a parent cabal.project somewhere
+  writeFile
+    (examplesPath </> examplePackage </> "cabal.project")
+    "packages: ."
+  writeFile
+    (examplesPath </> examplePackage </> "cabal.project.local")
+    ""
 
   whenJust (shakeProfiling ?config) $ createDirectoryIfMissing True
 

exe/Main.hs

@@ -502,7 +502,7 @@ setCacheDir logger prefix hscComponents comps dflags = do
     liftIO $ logInfo logger $ "Using interface files cache dir: " <> T.pack cacheDir
     pure $ dflags
           & setHiDir cacheDir
-          & setDefaultHieDir cacheDir
+          & setHieDir cacheDir
 
 
 renderCradleError :: NormalizedFilePath -> CradleError -> FileDiagnostic

src/Development/IDE/GHC/Compat.hs

@@ -16,7 +16,7 @@ module Development.IDE.GHC.Compat(
     writeHieFile,
     readHieFile,
     supportsHieFiles,
-    setDefaultHieDir,
+    setHieDir,
     dontWriteHieFiles,
 #if !MIN_GHC_API_VERSION(8,8,0)
     ml_hie_file,
@@ -67,7 +67,6 @@ import HscTypes (mi_mod_hash)
 #endif
 
 #if MIN_GHC_API_VERSION(8,8,0)
-import Control.Applicative ((<|>))
 import Development.IDE.GHC.HieAst (mkHieFile)
 import HieBin
 import HieTypes
@@ -191,10 +190,10 @@ pattern IEThingAll a <-
     GHC.IEThingAll a
 #endif
 
-setDefaultHieDir :: FilePath -> DynFlags -> DynFlags
-setDefaultHieDir _f d =
+setHieDir :: FilePath -> DynFlags -> DynFlags
+setHieDir _f d =
 #if MIN_GHC_API_VERSION(8,8,0)
-    d { hieDir     = hieDir d <|> Just _f}
+    d { hieDir     = Just _f}
 #else
     d
 #endif

src/Development/IDE/GHC/Util.hs

@@ -25,7 +25,7 @@ module Development.IDE.GHC.Util(
     -- * General utilities
     readFileUtf8,
     hDuplicateTo',
-    setDefaultHieDir,
+    setHieDir,
     dontWriteHieFiles
     ) where