Skip to content

Commit 2ebfafc

Browse files
committed
use lsp root dir
1 parent 2baa0c9 commit 2ebfafc

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

ghcide/src/Development/IDE/LSP/LanguageServer.hs

+4-2
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,9 @@ handleInit
197197
-> LSP.LanguageContextEnv config -> TRequestMessage Method_Initialize -> IO (Either err (LSP.LanguageContextEnv config, IdeState))
198198
handleInit rootDir recorder getHieDbLoc getIdeState lifetime exitClientMsg clearReqId waitForCancel clientMsgChan env (TRequestMessage _ _ m params) = otTracedHandler "Initialize" (show m) $ \sp -> do
199199
traceWithSpan sp params
200-
dbLoc <- getHieDbLoc rootDir
200+
let rootMaybe = LSP.resRootPath env
201+
let root = fromMaybe rootDir rootMaybe
202+
dbLoc <- getHieDbLoc root
201203
let initConfig = parseConfiguration params
202204
logWith recorder Info $ LogRegisteringIdeConfig initConfig
203205
dbMVar <- newEmptyMVar
@@ -240,7 +242,7 @@ handleInit rootDir recorder getHieDbLoc getIdeState lifetime exitClientMsg clear
240242
logWith recorder Info LogReactorThreadStopped
241243

242244
(WithHieDbShield withHieDb,hieChan) <- takeMVar dbMVar
243-
ide <- getIdeState env rootDir withHieDb hieChan
245+
ide <- getIdeState env root withHieDb hieChan
244246
registerIdeConfiguration (shakeExtras ide) initConfig
245247
pure $ Right (env,ide)
246248

0 commit comments

Comments
 (0)