projects
/
lsp-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add secret
[lsp-test.git]
/
src
/
Language
/
Haskell
/
LSP
/
Test
/
Session.hs
diff --git
a/src/Language/Haskell/LSP/Test/Session.hs
b/src/Language/Haskell/LSP/Test/Session.hs
index bbfdf386ac167bd0f8ab5b9a277b754920aacf57..8e1afa8c62e515b661576fcf43190cced7e47a15 100644
(file)
--- a/
src/Language/Haskell/LSP/Test/Session.hs
+++ b/
src/Language/Haskell/LSP/Test/Session.hs
@@
-198,7
+198,6
@@
runSessionWithHandles :: Handle -- ^ Server in
-> Session a
-> IO a
runSessionWithHandles serverIn serverOut serverProc serverHandler config caps rootDir exitServer session = do
-> Session a
-> IO a
runSessionWithHandles serverIn serverOut serverProc serverHandler config caps rootDir exitServer session = do
-
absRootDir <- canonicalizePath rootDir
hSetBuffering serverIn NoBuffering
absRootDir <- canonicalizePath rootDir
hSetBuffering serverIn NoBuffering
@@
-219,13
+218,16
@@
runSessionWithHandles serverIn serverOut serverProc serverHandler config caps ro
runSession' = runSession context initState
errorHandler = throwTo mainThreadId :: SessionException -> IO()
runSession' = runSession context initState
errorHandler = throwTo mainThreadId :: SessionException -> IO()
- serverLauncher = forkIO $ catch (serverHandler serverOut context) errorHandler
+ serverListenerLauncher =
+ forkIO $ catch (serverHandler serverOut context) errorHandler
server = (Just serverIn, Just serverOut, Nothing, serverProc)
server = (Just serverIn, Just serverOut, Nothing, serverProc)
- serverFinalizer tid = finally (timeout (messageTimeout config * 1000000)
+ serverAndListenerFinalizer tid =
+ finally (timeout (messageTimeout config * 1000000)
(runSession' exitServer))
(runSession' exitServer))
-
(cleanupRunning
Process server >> killThread tid)
+
(cleanup
Process server >> killThread tid)
- (result, _) <- bracket serverLauncher serverFinalizer (const $ runSession' session)
+ (result, _) <- bracket serverListenerLauncher serverAndListenerFinalizer
+ (const $ runSession' session)
return result
updateStateC :: ConduitM FromServerMessage FromServerMessage (StateT SessionState (ReaderT SessionContext IO)) ()
return result
updateStateC :: ConduitM FromServerMessage FromServerMessage (StateT SessionState (ReaderT SessionContext IO)) ()