Use direct cradles for test-setup

Author: fendor

test/utils/TestUtils.hs

@@ -12,7 +12,6 @@ module TestUtils
   -- , runIGM'
   , ghcVersion, GhcVersion(..)
   , logFilePath
-  , readResolver
   , hieCommand
   , hieCommandVomit
   , hieCommandExamplePlugin
@@ -112,27 +111,9 @@ withFileLogging logFile f = do
 
 -- ---------------------------------------------------------------------
 
--- If an executable @stack@ is present on the system then setup stack files,
--- otherwise specify a direct cradle with -isrc
 setupBuildToolFiles :: IO ()
 setupBuildToolFiles = do
-  stack <- findExecutable "stack"
-  let s = case stack of
-        Nothing -> setupDirectFilesIn
-        Just _  -> setupStackFilesIn
-  forM_ files $ \f -> do
-    s f
-    -- Cleanup stack directory in case the presence of stack has changed since
-    -- the last run
-    removePathForcibly (f ++ ".stack-work")
-
-setupStackFilesIn :: FilePath -> IO ()
-setupStackFilesIn f = do
-  resolver <- readResolver
-  writeFile (f ++ "stack.yaml") $ stackFileContents resolver
-  case f of
-    "./test/testdata/" -> writeFile (f ++ "hie.yaml") testdataHieYamlCradleStackContents
-    _ ->  writeFile (f ++ "hie.yaml") hieYamlCradleStackContents
+  forM_ files setupDirectFilesIn
 
 setupDirectFilesIn :: FilePath -> IO ()
 setupDirectFilesIn f =
@@ -172,32 +153,8 @@ ghcVersion = GHC86
 ghcVersion = GHC84
 #endif
 
-stackYaml :: FilePath
-stackYaml =
-#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,2,0)))
-  "stack-8.8.2.yaml"
-#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,1,0)))
-  "stack-8.8.1.yaml"
-#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,6,5,0)))
-  "stack-8.6.5.yaml"
-#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,6,4,0)))
-  "stack-8.6.4.yaml"
-#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,6,3,0)))
-  "stack-8.6.3.yaml"
-#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,6,2,0)))
-  "stack-8.6.2.yaml"
-#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,6,1,0)))
-  "stack-8.6.1.yaml"
-#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,4,0)))
-  "stack-8.4.4.yaml"
-#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,3,0)))
-  "stack-8.4.3.yaml"
-#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,2,0)))
-  "stack-8.4.2.yaml"
-#endif
-
 logFilePath :: String
-logFilePath = "hie-" ++ stackYaml ++ ".log"
+logFilePath = "hie-" ++ show ghcVersion ++ ".log"
 
 -- | The command to execute the version of hie for the current compiler.
 --
@@ -216,92 +173,17 @@ hieCommandVomit = hieCommand ++ " --vomit"
 hieCommandExamplePlugin :: String
 hieCommandExamplePlugin = hieCommand ++ " --example"
 
--- |Choose a resolver based on the current compiler, otherwise HaRe/ghc-mod will
--- not be able to load the files
-readResolver :: IO String
-readResolver = readResolverFrom stackYaml
-
-newtype StackResolver = StackResolver String
-
-instance FromJSON StackResolver where
-  parseJSON (Object x) = StackResolver <$> x .: pack "resolver"
-  parseJSON invalid = typeMismatch "StackResolver" invalid
-
-readResolverFrom :: FilePath -> IO String
-readResolverFrom yamlPath = do
-  result <- decodeFileEither yamlPath
-  case result of
-    Left err -> error $ yamlPath ++ " parsing failed: " ++ show err
-    Right (StackResolver res) -> return res
-
 -- ---------------------------------------------------------------------
 
-hieYamlCradleStackContents :: String
-hieYamlCradleStackContents = unlines
-  [ "# WARNING: THIS FILE IS AUTOGENERATED IN test/utils/TestUtils.hs. IT WILL BE OVERWRITTEN ON EVERY TEST RUN"
-  , "cradle:"
-  , "  stack:"
-  ]
-
-testdataHieYamlCradleStackContents :: String
-testdataHieYamlCradleStackContents = unlines
-  [ "# WARNING: THIS FILE IS AUTOGENERATED IN test/utils/TestUtils.hs. IT WILL BE OVERWRITTEN ON EVERY TEST RUN"
-  , "cradle:"
-  , "  stack:"
-  -- , "    - path: \"ApplyRefact.hs\""
-  -- , "      component: \"testdata:exe:applyrefact\""
-  -- , "    - path: \"ApplyRefact2.hs\""
-  -- , "      component: \"testdata:exe:applyrefact2\""
-  -- , "    - path: \"CodeActionRename.hs\""
-  -- , "      component: \"testdata:exe:codeactionrename\""
-  -- , "    - path: \"Hover.hs\""
-  -- , "      component: \"testdata:exe:hover\""
-  -- , "    - path: \"Symbols.hs\""
-  -- , "      component: \"testdata:exe:symbols\""
-  -- , "    - path: \"ApplyRefact2.hs\""
-  -- , "      component: \"testdata:exe:applyrefact2\""
-  -- , "    - path: \"HlintPragma.hs\""
-  -- , "      component: \"testdata:exe:hlintpragma\""
-  -- , "    - path: \"HaReCase.hs\""
-  -- , "      component: \"testdata:exe:harecase\""
-  -- , "    - path: \"HaReDemote.hs\""
-  -- , "      component: \"testdata:exe:haredemote\""
-  -- , "    - path: \"HaReMoveDef.hs\""
-  -- , "      component: \"testdata:exe:haremovedef\""
-  -- , "    - path: \"HaReRename.hs\""
-  -- , "      component: \"testdata:exe:harerename\""
-  -- , "    - path: \"HaReGA1.hs\""
-  -- , "      component: \"testdata:exe:haregenapplicative\""
-  -- , "    - path: \"FuncTest.hs\""
-  -- , "      component: \"testdata:exe:functests\""
-  -- , "    - path: \"liquid/Evens.hs\""
-  -- , "      component: \"testdata:exe:evens\""
-  -- , "    - path: \"FileWithWarning.hs\""
-  -- , "      component: \"testdata:exe:filewithwarning\""
-  -- , "    - path: ."
-  -- , "      component: \"testdata:exe:filewithwarning\""
-  ]
-
-
 hieYamlCradleDirectContents :: String
 hieYamlCradleDirectContents = unlines
   [ "# WARNING: THIS FILE IS AUTOGENERATED IN test/utils/TestUtils.hs. IT WILL BE OVERWRITTEN ON EVERY TEST RUN"
   , "cradle:"
   , "  direct:"
   , "    arguments:"
-  , "      - -isrc"
+  , "      - -i."
   ]
 
-stackFileContents :: String -> String
-stackFileContents resolver = unlines
-  [ "# WARNING: THIS FILE IS AUTOGENERATED IN test/utils/TestUtils. IT WILL BE OVERWRITTEN ON EVERY TEST RUN"
-  , "resolver: " ++ resolver
-  , "packages:"
-  , "- '.'"
-  , "extra-deps: []"
-  , "flags: {}"
-  , "extra-package-dbs: []"
-  ]
 
 -- ---------------------------------------------------------------------