Merge branch 'haskell:master' into definition_from_multiple_plugins

Author: JiriLojda

ghcide/session-loader/Development/IDE/Session.hs

@@ -268,7 +268,7 @@ loadWithImplicitCradle mHieYaml rootDir = do
 
 getInitialGhcLibDirDefault :: Recorder (WithPriority Log) -> FilePath -> IO (Maybe LibDir)
 getInitialGhcLibDirDefault recorder rootDir = do
-  hieYaml <- findCradle def rootDir
+  hieYaml <- findCradle def (rootDir </> "a")
   cradle <- loadCradle def hieYaml rootDir
   libDirRes <- getRuntimeGhcLibDir (toCologActionWithPrio (cmapWithPrio LogHieBios recorder)) cradle
   case libDirRes of

hls-test-utils/src/Test/Hls.hs

@@ -618,6 +618,7 @@ runSessionWithServer' plugins conf sconf caps root s =  withLock lock $ keepCurr
                 , argsDefaultHlsConfig = conf
                 , argsLogger = argsLogger
                 , argsIdeOptions = ideOptions
+                , argsProjectRoot = Just root
                 }
 
     x <- runSessionWithHandles inW outR sconf' caps root s

src/Ide/Main.hs

@@ -90,7 +90,7 @@ defaultMain recorder args idePlugins = do
 
         BiosMode PrintCradleType -> do
             dir <- IO.getCurrentDirectory
-            hieYaml <- Session.findCradle def dir
+            hieYaml <- Session.findCradle def (dir </> "a")
             cradle <- Session.loadCradle def hieYaml dir
             print cradle