diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8199331bef..70d49f958c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: ghc: ['8.10.4', '8.10.3', '8.10.2', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4'] - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-18.04, macOS-latest, windows-latest] exclude: - os: windows-latest ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550 @@ -58,7 +58,7 @@ jobs: echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV - name: Set some linux specific things - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-18.04' env: GHC_VER: ${{ matrix.ghc }} run: | @@ -156,7 +156,7 @@ jobs: # macOS and Linux, used by ghcup tar: needs: build - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 strategy: matrix: os: [Linux, macOS] diff --git a/ChangeLog.md b/ChangeLog.md index 0c82fd40a5..6047b94047 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -34,12 +34,18 @@ As always, there are many internal bug fixes and performance improvements in ghc * test suite of plugins are reorganized, which no longer need to be run with `test-server` executable * two new packages `hls-test-utils` and `hls-stylish-haskell-plugin` are extracted -This version uses `lsp-1.2.0`, `hls-plugin-api-1.1.0`, and `ghcide-1.2.0`. +This version uses `lsp-1.2.0`, `hls-plugin-api-1.1.0`, and `ghcide-1.2.0.2`. ### Pull requests merged for 1.1.0 +- Restore compat. with haddock-library 1.8 +([#1717](https://github.com/haskell/haskell-language-server/pull/1717)) by @pepeiborra +- Don't suggest destruct actions for already-destructed terms +([#1715](https://github.com/haskell/haskell-language-server/pull/1715)) by @isovector - Add keybindings and jump to hole to the Wingman README ([#1712](https://github.com/haskell/haskell-language-server/pull/1712)) by @isovector +- Bracketing for snippet completions +([#1709](https://github.com/haskell/haskell-language-server/pull/1709)) by @OliverMadine - Prepare ghcide 1.2.0 ([#1707](https://github.com/haskell/haskell-language-server/pull/1707)) by @berberman - Adjust bounds diff --git a/ghcide/CHANGELOG.md b/ghcide/CHANGELOG.md index b12a4597f7..0452c4263d 100644 --- a/ghcide/CHANGELOG.md +++ b/ghcide/CHANGELOG.md @@ -1,3 +1,10 @@ +### 1.2.0.2 (2021-04-13) +* Bracketing for snippet completions (#1709) - Oliver Madine +* Don't suggest destruct actions for already-destructed terms (#1715) - Sandy Maguire + +### 1.2.0.1 (2021-04-12) +* restore compat. with haddock-library 1.8 (#1717) - Pepe Iborra + ### 1.2.0 (2021-04-11) * Emit holes as diagnostics (#1653) - Sandy Maguire * Fix ghcide and HLS enter lsp mode by default (#1692) - Potato Hatsue diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index ee1db0c2f2..a80d39ca18 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -2,7 +2,7 @@ cabal-version: 2.4 build-type: Simple category: Development name: ghcide -version: 1.2.0.1 +version: 1.2.0.2 license: Apache-2.0 license-file: LICENSE author: Digital Asset and Ghcide contributors diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index ad73437926..b39fbdff75 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -63,7 +63,7 @@ library , cryptohash-sha1 , data-default , ghc - , ghcide ^>= 1.2.0.0 + , ghcide ^>= 1.2.0.2 , gitrev , lsp , hie-bios diff --git a/hls-test-utils/hls-test-utils.cabal b/hls-test-utils/hls-test-utils.cabal index 427ac80a5a..2442b7ccdd 100644 --- a/hls-test-utils/hls-test-utils.cabal +++ b/hls-test-utils/hls-test-utils.cabal @@ -43,7 +43,7 @@ library , directory , extra , filepath - , ghcide ^>=1.2.0.0 + , ghcide ^>=1.2.0.2 , hls-plugin-api ^>=1.1.0.0 , hspec , hspec-core diff --git a/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal b/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal index e09b720dc8..d9b772e072 100644 --- a/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal +++ b/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal @@ -25,8 +25,8 @@ library , filepath , ghc , ghc-boot-th - , ghcide ^>=1.2.0.0 - , hls-plugin-api ^>=1.1 + , ghcide ^>=1.2.0.2 + , hls-plugin-api ^>=1.1.0.0 , lens , lsp-types , text diff --git a/plugins/hls-class-plugin/hls-class-plugin.cabal b/plugins/hls-class-plugin/hls-class-plugin.cabal index 6befd132df..3030865b5b 100644 --- a/plugins/hls-class-plugin/hls-class-plugin.cabal +++ b/plugins/hls-class-plugin/hls-class-plugin.cabal @@ -29,8 +29,8 @@ library , containers , ghc , ghc-exactprint - , ghcide ^>=1.2.0.0 - , hls-plugin-api ^>=1.1 + , ghcide ^>=1.2.0.2 + , hls-plugin-api ^>=1.1.0.0 , lens , lsp , shake diff --git a/plugins/hls-eval-plugin/hls-eval-plugin.cabal b/plugins/hls-eval-plugin/hls-eval-plugin.cabal index f7a70f4e61..53eba2a53d 100644 --- a/plugins/hls-eval-plugin/hls-eval-plugin.cabal +++ b/plugins/hls-eval-plugin/hls-eval-plugin.cabal @@ -61,9 +61,9 @@ library , ghc , ghc-boot-th , ghc-paths - , ghcide ^>=1.2.0.0 + , ghcide ^>=1.2.0.2 , hashable - , hls-plugin-api ^>=1.1 + , hls-plugin-api ^>=1.1.0.0 , lens , lsp , lsp-types diff --git a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal index 6d7cb0242a..6985aaacf1 100644 --- a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal +++ b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal @@ -21,8 +21,8 @@ library , containers , deepseq , ghc - , ghcide ^>=1.2.0.0 - , hls-plugin-api ^>=1.1 + , ghcide ^>=1.2.0.2 + , hls-plugin-api ^>=1.1.0.0 , lsp , lsp-types , shake diff --git a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal index fda5c3d910..c46ea8b42f 100644 --- a/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal +++ b/plugins/hls-haddock-comments-plugin/hls-haddock-comments-plugin.cabal @@ -29,8 +29,8 @@ library , containers , ghc , ghc-exactprint - , ghcide ^>=1.2.0.0 - , hls-plugin-api ^>=1.1 + , ghcide ^>=1.2.0.2 + , hls-plugin-api ^>=1.1.0.0 , lsp-types , text , unordered-containers diff --git a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal index b23d6745da..158804bc36 100644 --- a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal +++ b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal @@ -41,10 +41,10 @@ library , extra , filepath , ghc-exactprint >=0.6.3.4 - , ghcide ^>=1.2.0.0 + , ghcide ^>=1.2.0.2 , hashable , hlint >=3.2 - , hls-plugin-api ^>=1.1 + , hls-plugin-api ^>=1.1.0.0 , hslogger , lens , lsp diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal index 5f71bba354..3a8ddae850 100644 --- a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal +++ b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal @@ -23,9 +23,9 @@ library , directory , extra , ghc - , ghcide ^>=1.2 + , ghcide ^>=1.2.0.2 , hashable - , hls-plugin-api ^>=1.1 + , hls-plugin-api ^>=1.1.0.0 , lsp , lsp-types , retrie >=0.1.1.0 diff --git a/plugins/hls-splice-plugin/hls-splice-plugin.cabal b/plugins/hls-splice-plugin/hls-splice-plugin.cabal index acf74ead3e..c6a291e174 100644 --- a/plugins/hls-splice-plugin/hls-splice-plugin.cabal +++ b/plugins/hls-splice-plugin/hls-splice-plugin.cabal @@ -40,8 +40,8 @@ library , foldl , ghc , ghc-exactprint - , ghcide ^>=1.2.0.0 - , hls-plugin-api ^>=1.1 + , ghcide ^>=1.2.0.2 + , hls-plugin-api ^>=1.1.0.0 , lens , lsp , retrie diff --git a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal index 0a0206e5f9..f480f71faf 100644 --- a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal +++ b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal @@ -22,8 +22,8 @@ library , filepath , ghc , ghc-boot-th - , ghcide ^>=1.2.0.0 - , hls-plugin-api ^>=1.1 + , ghcide ^>=1.2.0.2 + , hls-plugin-api ^>=1.1.0.0 , lsp-types , mtl , stylish-haskell ^>=0.12 diff --git a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal index 1d19e74aa2..aff9d3f087 100644 --- a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal +++ b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal @@ -72,8 +72,8 @@ library , ghc-boot-th , ghc-exactprint , ghc-source-gen - , ghcide ^>=1.2.0.0 - , hls-plugin-api ^>=1.1 + , ghcide ^>=1.2.0.2 + , hls-plugin-api ^>=1.1.0.0 , lens , lsp , mtl