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

src/Development/IDE/LSP/LanguageServer.hs

@@ -100,13 +100,17 @@ runLanguageServer options userHandlers getIdeState = do
             -- out of order to be useful. Existing handlers are run afterwards.
     handlers <- parts WithMessage{withResponse, withNotification} def
 
+    let initializeCallbacks = LSP.InitializeCallbacks
+            { LSP.onInitialConfiguration = const $ Right ()
+            , LSP.onConfigurationChange = const $ Right ()
+            , LSP.onStartup = handleInit (signalBarrier clientMsgBarrier ()) clearReqId waitForCancel clientMsgChan
+            }
+
     void $ waitAnyCancel =<< traverse async
         [ void $ LSP.runWithHandles
             stdin
             newStdout
-            ( const $ Right ()
-            , handleInit (signalBarrier clientMsgBarrier ()) clearReqId waitForCancel clientMsgChan
-            )
+            initializeCallbacks
             handlers
             (modifyOptions options)
             Nothing

stack.yaml

@@ -4,12 +4,12 @@ packages:
 
 extra-deps:
 - git: https://github.com/alanz/haskell-lsp.git
-  commit: d73e2ccb518724e6766833ee3d7e73289cbe0018
+  commit: bfbd8630504ebc57b70948689c37b85cfbe589da
   subdirs:
   - .
   - haskell-lsp-types
-- git: https://github.com/digital-asset/lsp-test.git
-  commit: 50c43452e19e494d71ccba1f7922d0b3b3fc69c3
+- git: https://github.com/bubba/lsp-test.git
+  commit: d126623dc6895d325e3d204d74e2a22d4f515587
 - git: https://github.com/mpickering/hie-bios.git
   commit: 8427e424a83c2f3d60bdd26c02478c00d2189a73
 nix: