Merge branch 'master' into tdr-test-impls

diff --git a/.travis.yml b/.travis.yml
index 08e4c20f13d691c0756b7e00ee276f83be6e6797..72ae18679eb619391cd0052fffd19003e670a5eb 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 # Revision history for lsp-test
 
+## 0.5.1.0 -- 2019-04-07
+
+* Add getTypeDefinitions (@fendor) 
+
 ## 0.5.0.2 -- 2018-12-05
 
 * Fix loose threads when exceptions are thrown

diff --git a/ChangeLog.md b/ChangeLog.md
index 797f46082d9255ab0439530f5489584db07ddc21..8a16945bb5730b4f0be3d16c7755b411dd354c97 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -38,17 +38,11 @@ Try out the example tests in the `example` directory with `cabal new-test`.
 For more examples check the [Wiki](https://github.com/bubba/lsp-test/wiki/Introduction)
 
 ## Developing
-To test make sure you have the following language servers installed:
-- [haskell-ide-engine](https://github.com/haskell/haskell-ide-engine)
-- [javascript-typescript-langserver](https://github.com/sourcegraph/javascript-typescript-langserver)
-
-## How to run tests
-
-The present tests are integration tests. Thus, it is required that that the executables `hie` and `javascript-typescript-langserver` are on the path.
-
-The executable `hie` has to have been built using GHC 8.6.3. This can be done by cloning [Haskell-IDE-Engine](https://github.com/haskell/haskell-ide-engine) and invoking `stack install.hs hie-8.6.3`. This will create the executables `hie`, `hie-8.6` and `hie-8.6.3` in your `$HOME/.local/bin`, or respective `stack path --local-bin` location.
-To make sure the test environment is identical to the travis setup, in `.travis.yml` you can find the exact git hash that has been used to execute the tests and build `hie` from that snapshot.
-
-The language server `javascript-typescript-langserver` can be installed by invoking `npm i -g javascript-typescript-langserver`.
-
-When all prerequisites have been met, the tests can be executed by running `stack test` or `cabal new-test`.
+The tests are integration tests, so make sure you have the following language servers installed and on your PATH:
+### [haskell-ide-engine](https://github.com/haskell/haskell-ide-engine)
+- Check out a relatively recent version of the repo, or see `.travis.yml` to get the exact commit used for CI.
+- `stack install`
+### [javascript-typescript-langserver](https://github.com/sourcegraph/javascript-typescript-langserver)
+`npm i -g javascript-typescript-langserver`
+
+Then run the tests with `stack test` or `cabal new-test`.

diff --git a/README.md b/README.md
index 4eff6cf3a37427f3a8a7898e3f0e37753a598548..1c6ca382895b00f9e4f78527b09a4cbee9ab18f4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 name:                lsp-test
-version:             0.5.0.2
+version:             0.5.1.1
 synopsis:            Functional test framework for LSP servers.
 description:
   A test framework for writing tests against
@@ -15,13 +15,13 @@ author:              Luke Lau
 maintainer:          luke_lau@icloud.com
 stability:           experimental
 bug-reports:         https://github.com/Bubba/haskell-lsp-test/issues
-copyright:           2018 Luke Lau
+copyright:           2019 Luke Lau
 category:            Testing
 build-type:          Simple
 cabal-version:       2.0
 extra-source-files:  README.md
                    , ChangeLog.md
-tested-with:         GHC == 8.2.2 , GHC == 8.4.2 , GHC == 8.4.3
+tested-with:         GHC == 8.2.2 , GHC == 8.4.2 , GHC == 8.4.3, GHC == 8.6.4
 
 source-repository head
   type:     git
@@ -35,8 +35,8 @@ library
                      , haskell-lsp:Language.Haskell.LSP.Types.Capabilities
                      , parser-combinators:Control.Applicative.Combinators
   default-language:    Haskell2010
-  build-depends:       base >= 4.7 && < 5
-                     , haskell-lsp >= 0.8 && < 0.9
+  build-depends:       base >= 4.10 && < 5
+                     , haskell-lsp >= 0.8 && < 0.10
                      , aeson
                      , aeson-pretty
                      , ansi-terminal
@@ -75,14 +75,13 @@ test-suite tests
   main-is:             Test.hs
   hs-source-dirs:      test
   ghc-options:         -W
-  build-depends:       base >= 4.7 && < 5
+  build-depends:       base >= 4.10 && < 5
                      , hspec
                      , lens
-                     , haskell-lsp >= 0.8 && < 0.9
+                     , haskell-lsp >= 0.8 && < 0.10
                      , lsp-test
                      , data-default
                      , aeson
                      , unordered-containers
                      , text
   default-language:    Haskell2010
-

diff --git a/lsp-test.cabal b/lsp-test.cabal
index 119fa6a1bf115cc70297ec65b502bcca4c27d7a1..6ee01be904caa33e576ded88aca330b502c13059 100644 (file)
--- a/lsp-test.cabal
+++ b/lsp-test.cabal
@@ -1,4 +1,6 @@
-resolver: lts-13.9
+resolver: lts-13.15
 packages:
   - .
-
+extra-deps:
+- haskell-lsp-0.9.0.0
+- haskell-lsp-types-0.9.0.0

diff --cc stack.yaml
Simple merge