File tree 1 file changed +6
-6
lines changed
ghcide/session-loader/Development/IDE/Session
1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -43,18 +43,18 @@ implicitConfig = (fmap . first) (CradleConfig noDeps) . inferCradleTree
43
43
44
44
45
45
inferCradleTree :: FilePath -> MaybeT IO (CradleTree a , FilePath )
46
- inferCradleTree fp =
46
+ inferCradleTree start_dir =
47
47
maybeItsBios
48
48
-- If we have both a config file (cabal.project/stack.yaml) and a work dir
49
49
-- (dist-newstyle/.stack-work), prefer that
50
- <|> (cabalExecutable >> cabalConfigDir fp >>= \ dir -> cabalWorkDir dir >> pure (cabalCradle dir))
51
- <|> (stackExecutable >> stackConfigDir fp >>= \ dir -> stackWorkDir dir >> stackCradle dir)
50
+ <|> (cabalExecutable >> cabalConfigDir start_dir >>= \ dir -> cabalWorkDir dir >> pure (cabalCradle dir))
51
+ <|> (stackExecutable >> stackConfigDir start_dir >>= \ dir -> stackWorkDir dir >> stackCradle dir)
52
52
-- Redo the checks, but don't check for the work-dir, maybe the user hasn't run a build yet
53
- <|> (cabalExecutable >> cabalConfigDir fp >>= pure . cabalCradle)
54
- <|> (stackExecutable >> stackConfigDir fp >>= stackCradle)
53
+ <|> (cabalExecutable >> cabalConfigDir start_dir >>= pure . cabalCradle)
54
+ <|> (stackExecutable >> stackConfigDir start_dir >>= stackCradle)
55
55
56
56
where
57
- maybeItsBios = (\ wdir -> (Bios (Program $ wdir </> " .hie-bios" ) Nothing Nothing , wdir)) <$> biosWorkDir fp
57
+ maybeItsBios = (\ wdir -> (Bios (Program $ wdir </> " .hie-bios" ) Nothing Nothing , wdir)) <$> biosWorkDir start_dir
58
58
59
59
stackCradle :: FilePath -> MaybeT IO (CradleTree a , FilePath )
60
60
stackCradle fp = do
You can’t perform that action at this time.
0 commit comments