From d5a459457e4acc5586415e2cc964c8d6f16d1446 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Mon, 27 Dec 2021 13:59:48 +0000 Subject: [PATCH 1/5] Bump lsp major version to 1.2.0.2 For the changed `lsp-types` dep. Major bump since it re-exports a lot of lsp-types. --- lsp/lsp.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lsp/lsp.cabal b/lsp/lsp.cabal index 7ae40103d..71be91815 100644 --- a/lsp/lsp.cabal +++ b/lsp/lsp.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: lsp -version: 1.2.0.1 +version: 1.4.0.0 synopsis: Haskell library for the Microsoft Language Server Protocol description: An implementation of the types, and basic message server to From 2fb8e62c458e9f2716e091fa0bcd10dbb0c01501 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Mon, 27 Dec 2021 14:01:13 +0000 Subject: [PATCH 2/5] Bump lsp-test minor version to 0.14.0.2 --- lsp-test/lsp-test.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lsp-test/lsp-test.cabal b/lsp-test/lsp-test.cabal index 111b57b3b..cd400e28c 100644 --- a/lsp-test/lsp-test.cabal +++ b/lsp-test/lsp-test.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: lsp-test -version: 0.14.0.1 +version: 0.14.0.2 synopsis: Functional test framework for LSP servers. description: A test framework for writing tests against @@ -81,7 +81,7 @@ test-suite tests build-depends: base >= 4.10 && < 5 , hspec , lens - , lsp == 1.2.* + , lsp == 1.4.* , lsp-test , data-default , aeson From dbb416deef92d30f45ebf9768d23a9aeb18f170a Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Tue, 28 Dec 2021 12:33:53 +0000 Subject: [PATCH 3/5] Changelogs --- lsp-test/ChangeLog.md | 4 ++++ lsp-types/ChangeLog.md | 18 ++++++++++++++++++ lsp/ChangeLog.md | 5 +++++ 3 files changed, 27 insertions(+) diff --git a/lsp-test/ChangeLog.md b/lsp-test/ChangeLog.md index 5ae2803d5..8b7ce0d88 100644 --- a/lsp-test/ChangeLog.md +++ b/lsp-test/ChangeLog.md @@ -1,5 +1,9 @@ # Revision history for lsp-test +## 0.14.0.2 + +* Compatibility with new lsp-types major version. + ## 0.14.0.1 -- 2021-07-30 * Catch IO exception when sending messages to server (#317) (@berberman) diff --git a/lsp-types/ChangeLog.md b/lsp-types/ChangeLog.md index 955737f9c..c6aaedda2 100644 --- a/lsp-types/ChangeLog.md +++ b/lsp-types/ChangeLog.md @@ -1,5 +1,23 @@ # Revision history for lsp-types +## 1.4.0.0 + +* Aeson 2 compatibility (#360) (@michaelpj) +* Reduced dependency footprint (#383, #384) (@Bodigrim) +* Use appropriate number types (#366) (@michaelpj) +* Fix for #374 (#376) (@pepeiborra) +* Fix virtual file name adding .hs extension (#364) (@heitor-lassarote, @jneira) +* Fix the Semigroup instance for MarkupContent (#361) (@michaelpj) +* Various improvements to spec conformance (@michaelpj) + +## 1.3.0.1 + +* Rollback NFP interning (#344) (@pepeiborra) + +## 1.3.0.0 + +* Intern NormalizedFilePaths (#340) (@pepeiborra) + ## 1.2.0.1 * Add compatibility with GHC 9.2 (#345) (@fendor) diff --git a/lsp/ChangeLog.md b/lsp/ChangeLog.md index a380bc796..55e0184cb 100644 --- a/lsp/ChangeLog.md +++ b/lsp/ChangeLog.md @@ -1,5 +1,10 @@ # Revision history for lsp +## 1.4.0.0 + +* Fix extraneous `asdf` in `withProgress` output (#372) (@heitor-lassarote) +* Use appropriate number types (#366) (@michaelpj) + ## 1.2.0.1 * Add exception instances to LspT (#315) (@pepeiborra) From b8ce0f7f1cf5cb76cb9c81b1d86c20be85eba488 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Tue, 28 Dec 2021 13:29:34 +0000 Subject: [PATCH 4/5] Add CONTRIBUTING with some basic info --- CONTRIBUTING.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..9eff55b44 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,22 @@ +# Contributing + +## Versioning policy + +`lsp` and `lsp-types` should typically have identical versions and be released in lockstep. +This is for two reasons: +1. They are morally one package, and may become one again once multiple public libraries are better supported. +2. `lsp` exports many types from `lsp-types`, so in practice will need a major verison bump when `lsp-types` does anyway. + +`lsp-test` can evolve independently. + +## Git tags + +The tagging scheme is `$package-$version`, e.g. `lsp-types-1.0.0`. + +## Making a release + +1. Bump version numbers as needed (see 'Versioning policy') +2. Update changelogs (currently manual, sadly) +3. Once the above is in master, create git tags following 'Git tags' +4. Create package candidates for the packages, and check that they all look good. +5. Finalize the package candidates. From f3219362184c85fe6686c80e79c4a019215d3547 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Tue, 28 Dec 2021 13:39:06 +0000 Subject: [PATCH 5/5] Purge unused deps --- lsp-test/lsp-test.cabal | 2 -- lsp/lsp.cabal | 8 -------- 2 files changed, 10 deletions(-) diff --git a/lsp-test/lsp-test.cabal b/lsp-test/lsp-test.cabal index cd400e28c..43eba012f 100644 --- a/lsp-test/lsp-test.cabal +++ b/lsp-test/lsp-test.cabal @@ -102,12 +102,10 @@ test-suite func-test build-depends: base , lsp-test , lsp - , data-default , process , lens , unliftio , hspec - , async default-language: Haskell2010 test-suite example diff --git a/lsp/lsp.cabal b/lsp/lsp.cabal index 71be91815..0b1d86f6e 100644 --- a/lsp/lsp.cabal +++ b/lsp/lsp.cabal @@ -68,18 +68,10 @@ executable lsp-demo-reactor-server build-depends: base , aeson - , bytestring - , containers - , directory - , filepath , hslogger , lens >= 4.15.2 - , mtl , stm , text - , transformers - , unordered-containers - , unliftio -- the package library. Comment this out if you want repl changes to propagate , lsp if !flag(demo)