on master help sign in
Upgrade haskell-lsp and lsp-test (#2474)

* Upgrade haskell-lsp and lsp-test There have been some fixes upstream that should hopefully mean that we no longer need to mark the lsp-tests as flaky on Windows. I am having trouble reproducing the flakiness locally, so let’s see what happens on CI. * Also bump stack.yaml

commit79c04cd2027f987590ed7b7090e65975b7e07362 authorMoritz Kiefer <moritz.kiefer@purelyfunctional.org> dateFri 9 Aug 2019, 15:09 (7 years ago) parent92e62ea
2 files changed+10−6
src/Development/IDE/LSP/LanguageServer.hs+7−3 stack.yaml+3−3
src/Development/IDE/LSP/LanguageServer.hs+7−3
@@ -100,13 +100,17 @@ runLanguageServer options userHandlers getIdeState = do
100100 -- out of order to be useful. Existing handlers are run afterwards.
101101 handlers <- parts WithMessage{withResponse, withNotification} def
102102
103+ let initializeCallbacks = LSP.InitializeCallbacks
104+ { LSP.onInitialConfiguration = const $ Right ()
105+ , LSP.onConfigurationChange = const $ Right ()
106+ , LSP.onStartup = handleInit (signalBarrier clientMsgBarrier ()) clearReqId waitForCancel clientMsgChan
107+ }
108+
103109 void $ waitAnyCancel =<< traverse async
104110 [ void $ LSP.runWithHandles
105111 stdin
106112 newStdout
107− ( const $ Right ()
108− , handleInit (signalBarrier clientMsgBarrier ()) clearReqId waitForCancel clientMsgChan
109− )
113+ initializeCallbacks
110114 handlers
111115 (modifyOptions options)
112116 Nothing
stack.yaml+3−3
@@ -4,12 +4,12 @@ packages:
44
55extra-deps:
66- git: https://github.com/alanz/haskell-lsp.git
7− commit: d73e2ccb518724e6766833ee3d7e73289cbe0018
7+ commit: bfbd8630504ebc57b70948689c37b85cfbe589da
88 subdirs:
99 - .
1010 - haskell-lsp-types
11−- git: https://github.com/digital-asset/lsp-test.git
12− commit: 50c43452e19e494d71ccba1f7922d0b3b3fc69c3
11+- git: https://github.com/bubba/lsp-test.git
12+ commit: d126623dc6895d325e3d204d74e2a22d4f515587
1313- git: https://github.com/mpickering/hie-bios.git
1414 commit: 8427e424a83c2f3d60bdd26c02478c00d2189a73
1515nix: