Skip to content

Commit 84e6731

Browse files
committed
fix
1 parent ceb7020 commit 84e6731

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

ghcide/src/Development/IDE/Core/Service.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ initialise recorder defaultConfig plugins mainRule lspEnv debouncer options with
9393
mainRule
9494

9595
-- | Shutdown the Compiler Service.
96-
shutdown :: IdeState -> IO ()
96+
-- shutdown :: Recorder (WithPriority Log) -> IdeState -> IO ()
97+
shutdown :: Recorder (WithPriority Shake.Log) -> IdeState -> IO ()
9798
shutdown = shakeShut
9899

99100
-- This will return as soon as the result of the action is

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import qualified Colog.Core as Colog
3535
import Control.Monad.IO.Unlift (MonadUnliftIO)
3636
import Development.IDE.Core.IdeConfiguration
3737
import Development.IDE.Core.Shake hiding (Log, Priority)
38+
import qualified Development.IDE.Core.Shake as Shake
3839
import Development.IDE.Core.Tracing
3940
import qualified Development.IDE.Session as Session
4041
import Development.IDE.Types.Shake (WithHieDb)
@@ -49,6 +50,7 @@ data Log
4950
| LogReactorThreadStopped
5051
| LogCancelledRequest !SomeLspId
5152
| LogSession Session.Log
53+
| LogShake Shake.Log
5254
| LogLspServer LspServerLog
5355
| LogServerShutdownMessage
5456
deriving Show
@@ -265,7 +267,7 @@ shutdownHandler recorder stopReactor = LSP.requestHandler SMethod_Shutdown $ \_
265267
-- stop the reactor to free up the hiedb connection
266268
liftIO stopReactor
267269
-- flush out the Shake session to record a Shake profile if applicable
268-
liftIO $ shakeShut ide
270+
liftIO $ shakeShut (cmapWithPrio LogShake recorder) ide
269271
resp $ Right Null
270272

271273
exitHandler :: IO () -> LSP.Handlers (ServerM c)

0 commit comments

Comments
 (0)