Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare ghcide 1.2.0.2 and HLS 1.1.0 #1722

Merged
merged 3 commits into from
Apr 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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]
Expand Down
8 changes: 7 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions ghcide/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ghcide/ghcide.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion haskell-language-server.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ library
, cryptohash-sha1
, data-default
, ghc
, ghcide ^>= 1.2.0.0
, ghcide ^>= 1.2.0.2
, gitrev
, lsp
, hie-bios
Expand Down
2 changes: 1 addition & 1 deletion hls-test-utils/hls-test-utils.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-brittany-plugin/hls-brittany-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-class-plugin/hls-class-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-eval-plugin/hls-eval-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-retrie-plugin/hls-retrie-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-splice-plugin/hls-splice-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-tactics-plugin/hls-tactics-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down