Skip to content

ghc-check 0.4 for hls #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

ghc-check 0.4 for hls #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ import DynFlags (gopt_set, gopt_unset,
updOptLevel)
import DynFlags (PackageFlag(..), PackageArg(..))
import GHC hiding (def)
import GHC.Check ( VersionCheck(..), makeGhcVersionChecker )
import GHC.Check (GhcVersionChecker, InstallationCheck(..), makeGhcVersionChecker)
-- import GhcMonad
import HIE.Bios.Cradle
import HIE.Bios.Environment (addCmdOpts, makeDynFlagsAbsolute)
Expand Down Expand Up @@ -664,17 +664,18 @@ getCacheDir prefix opts = IO.getXdgDirectory IO.XdgCache (cacheDir </> prefix ++
cacheDir :: String
cacheDir = "ghcide"

ghcVersionChecker :: IO VersionCheck
ghcVersionChecker = $$(makeGhcVersionChecker (pure <$> getLibdir))
ghcVersionChecker :: GhcVersionChecker
ghcVersionChecker = $$(makeGhcVersionChecker getLibdir)

checkGhcVersion :: IO (Maybe HscEnvEq)
checkGhcVersion = do
res <- ghcVersionChecker
runtimeLibdir <- getLibdir
res <- ghcVersionChecker runtimeLibdir
case res of
Failure err -> do
putStrLn $ "Error while checking GHC version: " ++ show err
InstallationNotFound libdir -> do
putStrLn $ "Error not found GHC while checking GHC version: " ++ libdir
return Nothing
Mismatch {..} ->
InstallationMismatch {..} ->
return $ Just GhcVersionMismatch {..}
_ ->
InstallationChecked {} ->
return Nothing
2 changes: 1 addition & 1 deletion haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ executable haskell-language-server
-- which works for now.
, ghc
--------------------------------------------------------------
, ghc-check >= 0.3.0.1 && < 0.4
, ghc-check >= 0.4
, ghc-paths
, ghcide
, gitrev
Expand Down