hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stack: honor --with-stack when reading StackEnv

Browse Source
This commit is contained in:
Daniel Gröber 2016-08-27 14:05:44 +02:00
parent 637f73ec80
commit 90bcf63d6c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Language/Haskell/GhcMod/Cradle.hs
View File

@ -134,7 +134,7 @@ stackCradle stackProg wdir = do
(True, False) -> return () (True, False) -> return ()
senv <- MaybeT $ getStackEnv cabalDir senv <- MaybeT $ getStackEnv cabalDir stackProg
gmLog GmInfo "" $ text "Using Stack project at" <+>: text cabalDir gmLog GmInfo "" $ text "Using Stack project at" <+>: text cabalDir
return Cradle { return Cradle {

14
Language/Haskell/GhcMod/Stack.hs
View File

@ -48,9 +48,10 @@ patchStackPrograms Cradle { cradleProject = (StackProject senv) } progs = do
} }
patchStackPrograms _crdl progs = return progs patchStackPrograms _crdl progs = return progs
getStackEnv :: (IOish m, GmOut m, GmLog m) => FilePath -> m (Maybe StackEnv) getStackEnv :: (IOish m, GmOut m, GmLog m)
getStackEnv projdir = U.withDirectory_ projdir $ runMaybeT $ do => FilePath -> FilePath -> m (Maybe StackEnv)
env <- map (liToTup . splitOn ": ") . lines <$> readStack ["path"] getStackEnv projdir stackProg = U.withDirectory_ projdir $ runMaybeT $ do
env <- map (liToTup . splitOn ": ") . lines <$> readStack stackProg ["path"]
let look k = fromJustNote "getStackEnv" $ lookup k env let look k = fromJustNote "getStackEnv" $ lookup k env
return StackEnv { return StackEnv {
seDistDir = look "dist-dir" seDistDir = look "dist-dir"
@ -82,9 +83,10 @@ findExecutablesInDirectories' path binary =
exeExtension' = if isWindows then "exe" else "" exeExtension' = if isWindows then "exe" else ""
readStack :: (IOish m, GmOut m, GmLog m) => [String] -> MaybeT m String readStack :: (IOish m, GmOut m, GmLog m)
readStack args = do => FilePath -> [String] -> MaybeT m String
stack <- MaybeT $ liftIO $ findExecutable "stack" readStack exe args = do
stack <- MaybeT $ liftIO $ findExecutable exe
readProc <- lift gmReadProcess readProc <- lift gmReadProcess
flip gcatch handler $ do flip gcatch handler $ do
liftIO $ evaluate =<< readProc stack args "" liftIO $ evaluate =<< readProc stack args ""