Merge pull request #58 from alanz/wip/vfs

Match haskell-lsp updates for VFS race condition fixes

diff --git a/README.md b/README.md
index 8a16945bb5730b4f0be3d16c7755b411dd354c97..ce452fe715d8858a995bf5a19230a394e8700492 100644 (file)
--- a/README.md
+++ b/README.md
@@ -46,3 +46,6 @@ The tests are integration tests, so make sure you have the following language se
 `npm i -g javascript-typescript-langserver`
 
 Then run the tests with `stack test` or `cabal new-test`.
+
+## Troubleshooting
+Seeing funny stuff when running lsp-test via stack? If your server is built upon Haskell tooling, [keep in mind that stack sets some environment variables related to GHC, and you may want to unset them.](https://github.com/alanz/haskell-ide-engine/blob/bfb16324d396da71000ef81d51acbebbdaa854ab/test/utils/TestUtils.hs#L290-L298)

diff --git a/lsp-test.cabal b/lsp-test.cabal
index 80283b75b07f32b6844fa2caa3f8445fa86ffd5f..8f0a454d24992db4b8d3910ef5c37f9d76c9a63c 100644 (file)
--- a/lsp-test.cabal
+++ b/lsp-test.cabal
@@ -44,7 +44,7 @@ library
                      , bytestring
                      , conduit
                      , conduit-parse == 0.2.*
-                     , containers
+                     , containers >= 0.5.9
                      , data-default
                      , Diff
                      , directory