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

Gracefully fail if stack couldn't be initialized

Browse Source
This commit is contained in:
Nikolay Yakimov 2016-01-08 19:14:10 +03:00
parent 3700fa00e6
commit 9b512c3e6b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,16 +17,17 @@ import Language.Haskell.GhcMod.Types
import Language.Haskell.GhcMod.Utils import Language.Haskell.GhcMod.Utils
import Language.Haskell.GhcMod.Stack import Language.Haskell.GhcMod.Stack
import Language.Haskell.GhcMod.Logging import Language.Haskell.GhcMod.Logging
import Language.Haskell.GhcMod.Error
import Control.Applicative import Control.Applicative
import Control.Monad
import Control.Monad.Trans.Maybe import Control.Monad.Trans.Maybe
import Data.Maybe import Data.Maybe
import System.Directory import System.Directory
import System.FilePath import System.FilePath
import Prelude import Prelude
import Control.Monad.Trans.Journal (runJournalT) import Control.Monad.Trans.Journal (runJournalT)
import Exception
---------------------------------------------------------------- ----------------------------------------------------------------
@ -103,7 +104,12 @@ stackCradle wdir = do
gmLog GmWarning "" $ text "'dist/setup-config' exists, ignoring Stack and using cabal-install instead." gmLog GmWarning "" $ text "'dist/setup-config' exists, ignoring Stack and using cabal-install instead."
mzero mzero
senv <- MaybeT $ getStackEnv cabalDir senv <- MaybeT $
let handler err@(GMEStackBootstrap _) = do
gmLog GmWarning "" $ gmeDoc err
return Nothing
handler err = throw err
in gcatch (getStackEnv cabalDir) handler
return Cradle { return Cradle {
cradleProject = StackProject senv cradleProject = StackProject senv