fix build

Author: soulomoon

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

@@ -80,8 +80,8 @@ withWorkerQueue recorder title workerAction = ContT $ \mainAction -> do
     -- if we want to debug the exact location the worker swallows an async exception, we can
     -- temporarily comment out the `finally` clause.
         `finally` atomically (putTMVar b ())
-    logWith log Debug (LogThreadEnding title)
-  logWith log Debug (LogThreadEnded title)
+    logWith recorder Debug (LogThreadEnding title)
+  logWith recorder Debug (LogThreadEnded title)
   where
     writerThread q b =
       -- See above: check stop flag before dequeuing, exit if set, otherwise run next job.
@@ -96,9 +96,9 @@ withWorkerQueue recorder title workerAction = ContT $ \mainAction -> do
         case task of
           Exit -> return ()
           Task t -> do
-                logWith log Debug $ LogSingleWorkStarting title
+                logWith recorder Debug $ LogSingleWorkStarting title
                 workerAction t
-                logWith log Debug $ LogSingleWorkEnded title
+                logWith recorder Debug $ LogSingleWorkEnded title
                 writerThread q b
 
 

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

@@ -255,7 +255,7 @@ setupLSP recorder defaultRoot getHieDbLoc userHandlers getIdeState clientMsgVar
         , ctxGetHieDbLoc = getHieDbLoc
         , ctxGetIdeState = getIdeState
         , ctxUntilReactorStopSignal = untilReactorStopSignal
-        , ctxconfirmReactorShutdown = confirmReactorShutdown
+        , ctxConfirmReactorShutdown = confirmReactorShutdown
         , ctxForceShutdown = exit
         , ctxClearReqId = clearReqId
         , ctxWaitForCancel = waitForCancel
@@ -281,7 +281,7 @@ handleInit initParams env (TRequestMessage _ _ m params) = otTracedHandler "Init
       recorder = ctxRecorder initParams
       defaultRoot = ctxDefaultRoot initParams
       untilReactorStopSignal = ctxUntilReactorStopSignal initParams
-      lifetimeConfirm = ctxconfirmReactorShutdown initParams
+      lifetimeConfirm = ctxConfirmReactorShutdown initParams
     root <- case LSP.resRootPath env of
       Just lspRoot | lspRoot /= defaultRoot -> setCurrentDirectory lspRoot >> return lspRoot
       _ -> pure defaultRoot
@@ -290,38 +290,40 @@ handleInit initParams env (TRequestMessage _ _ m params) = otTracedHandler "Init
     logWith recorder Info $ LogRegisteringIdeConfig initConfig
     ideMVar <- newEmptyMVar
 
-    let 
+    let
       handleServerExceptionOrShutDown me = do
         -- shutdown shake
         tryReadMVar ideMVar >>= mapM_ shutdown
-          case me of
-            Left e -> do
-              lifetimeConfirm "due to exception in reactor thread"
-              logWith recorder Error $ LogReactorThreadException e
-              ctxForceShutdown initParams
-            _ -> do
-              lifetimeConfirm "due to shutdown message"
-              return ()
-
-        exceptionInHandler e = do
-            logWith recorder Error $ LogReactorMessageActionException e
-
-        checkCancelled :: forall m . LspId m -> IO () -> (TResponseError m -> IO ()) -> IO ()
-        checkCancelled _id act k =
-            let sid = SomeLspId _id
-            in flip finally (ctxClearReqId initParams sid) $
-                catch (do
-                    -- We could optimize this by first checking if the id
-                    -- is in the cancelled set. However, this is unlikely to be a
-                    -- bottleneck and the additional check might hide
-                    -- issues with async exceptions that need to be fixed.
-                    cancelOrRes <- race (ctxWaitForCancel initParams sid) act
-                    case cancelOrRes of
-                        Left () -> do
-                            logWith recorder Debug $ LogCancelledRequest sid
-                            k $ TResponseError (InL LSPErrorCodes_RequestCancelled) "" Nothing
-                        Right res -> pure res
-                ) $ \(e :: SomeException) -> do
+        case me of
+          Left e -> do
+            lifetimeConfirm "due to exception in reactor thread"
+            logWith recorder Error $ LogReactorThreadException e
+            ctxForceShutdown initParams
+          _ -> do
+            lifetimeConfirm "due to shutdown message"
+            return ()
+
+      exceptionInHandler e = do
+        logWith recorder Error $ LogReactorMessageActionException e
+
+      checkCancelled :: forall m . LspId m -> IO () -> (TResponseError m -> IO ()) -> IO ()
+      checkCancelled _id act k =
+        let sid = SomeLspId _id
+         in flip finally (ctxClearReqId initParams sid) $
+              catch
+                (do
+                  -- We could optimize this by first checking if the id
+                  -- is in the cancelled set. However, this is unlikely to be a
+                  -- bottleneck and the additional check might hide
+                  -- issues with async exceptions that need to be fixed.
+                  cancelOrRes <- race (ctxWaitForCancel initParams sid) act
+                  case cancelOrRes of
+                    Left () -> do
+                      logWith recorder Debug $ LogCancelledRequest sid
+                      k $ TResponseError (InL LSPErrorCodes_RequestCancelled) "" Nothing
+                    Right res -> pure res
+                )
+                $ \(e :: SomeException) -> do
                     exceptionInHandler e
                     k $ TResponseError (InR ErrorCodes_InternalError) (T.pack $ show e) Nothing
     _ <- flip forkFinally handleServerExceptionOrShutDown $ do
@@ -386,4 +388,3 @@ modifyOptions x = x{ LSP.optTextDocumentSync   = Just $ tweakTDS origTDS
         tweakTDS tds = tds{_openClose=Just True, _change=Just TextDocumentSyncKind_Incremental, _save=Just $ InR $ SaveOptions Nothing}
         origTDS = fromMaybe tdsDefault $ LSP.optTextDocumentSync x
         tdsDefault = TextDocumentSyncOptions Nothing Nothing Nothing Nothing Nothing
-