Skip to content

Commit d983c89

Browse files
wz1000mergify[bot]
wz1000
and
mergify[bot]
authored
Release 2.3.0.0 (#3818)
* Prepare release 2.3.0.0 * release ci: respect ADD_CABAL_ARGS on non-windows builds * release ci: disable simdutf text for centos * release ci: disable simdutf text for freebsd * Fix cabal file of hls-fourmolu-plugin to allow it to be uploaded to hackage Fixes #3819 * Update ghc version support docs --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent b9e78cf commit d983c89

File tree

36 files changed

+216
-149
lines changed

36 files changed

+216
-149
lines changed

‎.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ build_task:
1717
ARTIFACT: "x86_64-freebsd"
1818
DISTRO: "na"
1919
RUNNER_OS: "FreeBSD"
20-
ADD_CABAL_ARGS: "--enable-split-sections"
20+
ADD_CABAL_ARGS: "--enable-split-sections --constraint='text -simdutf'"
2121
GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
2222
CABAL_CACHE_NONFATAL: "yes"
2323
matrix:

‎.github/workflows/release.yaml

+15-6
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
ghc: ["9.6.2", "9.4.7", "9.2.8", "9.0.2"]
33+
ghc: ["9.6.3", "9.6.2", "9.4.7", "9.2.8", "9.0.2"]
3434
platform: [ { image: "debian:9"
3535
, installCmd: "sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list && sed -i /-updates/d /etc/apt/sources.list && apt-get update && apt-get install -y"
3636
, toolRequirements: "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
@@ -106,7 +106,7 @@ jobs:
106106
, toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
107107
, DISTRO: "CentOS"
108108
, ARTIFACT: "x86_64-linux-centos7"
109-
, ADD_CABAL_ARGS: "--enable-split-sections"
109+
, ADD_CABAL_ARGS: "--enable-split-sections --constraint='text -simdutf'" # centos7 gcc is too old to build text +simdutf
110110
}
111111
]
112112
# TODO: rm
@@ -154,6 +154,15 @@ jobs:
154154
, ARTIFACT: "x86_64-linux-unknown"
155155
, ADD_CABAL_ARGS: "--enable-split-sections"
156156
}
157+
- ghc: 9.6.3
158+
platform:
159+
{ image: "rockylinux:8"
160+
, installCmd: "yum -y install epel-release && yum install -y --allowerasing"
161+
, toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
162+
, DISTRO: "Unknown"
163+
, ARTIFACT: "x86_64-linux-unknown"
164+
, ADD_CABAL_ARGS: "--enable-split-sections"
165+
}
157166
container:
158167
image: ${{ matrix.platform.image }}
159168
steps:
@@ -213,7 +222,7 @@ jobs:
213222
strategy:
214223
fail-fast: true
215224
matrix:
216-
ghc: ["9.6.2", "9.4.7", "9.2.8", "9.0.2"]
225+
ghc: ["9.6.3", "9.6.2", "9.4.7", "9.2.8", "9.0.2"]
217226
steps:
218227
- uses: docker://arm64v8/ubuntu:focal
219228
name: Cleanup (aarch64 linux)
@@ -273,7 +282,7 @@ jobs:
273282
strategy:
274283
fail-fast: false
275284
matrix:
276-
ghc: ["9.6.2", "9.4.7", "9.2.8", "9.0.2"]
285+
ghc: ["9.6.3", "9.6.2", "9.4.7", "9.2.8", "9.0.2"]
277286
steps:
278287
- name: Checkout code
279288
uses: actions/checkout@v3
@@ -318,7 +327,7 @@ jobs:
318327
strategy:
319328
fail-fast: false
320329
matrix:
321-
ghc: ["9.6.2", "9.4.7", "9.2.8"]
330+
ghc: ["9.6.3", "9.6.2", "9.4.7", "9.2.8"]
322331
steps:
323332
- name: Checkout code
324333
uses: actions/checkout@v3
@@ -363,7 +372,7 @@ jobs:
363372
strategy:
364373
fail-fast: false
365374
matrix:
366-
ghc: ["9.6.2", "9.4.7", "9.2.8", "9.0.2"]
375+
ghc: ["9.6.3", "9.6.2", "9.4.7", "9.2.8", "9.0.2"]
367376
steps:
368377
- name: install windows deps
369378
shell: pwsh

‎ChangeLog.md

+57
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,62 @@
11
# Changelog for haskell-language-server
22

3+
## 2.3.0.0.0
4+
5+
* Binaries for GHC 9.6.3
6+
* Drop support for GHC 8.10
7+
* Remove `hls-haddock-comments-plugin`, `hls-stan-plugin`, and `hls-tactics-plugin`
8+
* Don't suggest bogus modules names in `hls-module-name-plugin` (#3784)
9+
* Add support for external Ormolu (#3771)
10+
* Improve refine imports behaviour for qualified imports (#3806)
11+
12+
### Pull Requests
13+
14+
- Switch chat room to matrix
15+
([#3817](https://github.com/haskell/haskell-language-server/pull/3817)) by @July541
16+
- Fix flaky hie bios test
17+
([#3814](https://github.com/haskell/haskell-language-server/pull/3814)) by @fendor
18+
- Revert "Bump actions/checkout from 3 to 4"
19+
([#3813](https://github.com/haskell/haskell-language-server/pull/3813)) by @wz1000
20+
- Add test directories to hls-retrie-plugin
21+
([#3808](https://github.com/haskell/haskell-language-server/pull/3808)) by @Vekhir
22+
- Change refine imports behaviour for qualified imports
23+
([#3806](https://github.com/haskell/haskell-language-server/pull/3806)) by @joyfulmantis
24+
- Update links to Nix documentation
25+
([#3805](https://github.com/haskell/haskell-language-server/pull/3805)) by @maralorn
26+
- Bump actions/checkout from 3 to 4
27+
([#3802](https://github.com/haskell/haskell-language-server/pull/3802)) by @dependabot[bot]
28+
- Bump cachix/install-nix-action from 22 to 23
29+
([#3801](https://github.com/haskell/haskell-language-server/pull/3801)) by @dependabot[bot]
30+
- Add support for Fourmolu 0.14.0.0
31+
([#3796](https://github.com/haskell/haskell-language-server/pull/3796)) by @brandonchinn178
32+
- Add code lens and fix code actions experiments
33+
([#3791](https://github.com/haskell/haskell-language-server/pull/3791)) by @joyfulmantis
34+
- Bump lsp versions in flake
35+
([#3790](https://github.com/haskell/haskell-language-server/pull/3790)) by @colonelpanic8
36+
- Clean up Release CI
37+
([#3787](https://github.com/haskell/haskell-language-server/pull/3787)) by @fendor
38+
- Do not suggest bogus module names
39+
([#3784](https://github.com/haskell/haskell-language-server/pull/3784)) by @Bodigrim
40+
- Delete `hls-haddock-comments-plugin`, `hls-stan-plugin`, and `hls-tactics-plugin`
41+
([#3782](https://github.com/haskell/haskell-language-server/pull/3782)) by @michaelpj
42+
- Enhance/releasing checklist
43+
([#3781](https://github.com/haskell/haskell-language-server/pull/3781)) by @fendor
44+
- Add cradle dependencies to session loading errors
45+
([#3779](https://github.com/haskell/haskell-language-server/pull/3779)) by @VeryMilkyJoe
46+
- Prepare release 2.2.0.0
47+
([#3775](https://github.com/haskell/haskell-language-server/pull/3775)) by @fendor
48+
- Add support for external Ormolu
49+
([#3771](https://github.com/haskell/haskell-language-server/pull/3771)) by @sir4ur0n
50+
- Support for resolve for class-plugin lenses
51+
([#3769](https://github.com/haskell/haskell-language-server/pull/3769)) by @joyfulmantis
52+
- Introduce declarative test project definition for plugin tests
53+
([#3767](https://github.com/haskell/haskell-language-server/pull/3767)) by @fendor
54+
- Use latest version of fourmolu possible
55+
([#3764](https://github.com/haskell/haskell-language-server/pull/3764)) by @brandonchinn178
56+
- Drop support for GHC 8.10
57+
([#3434](https://github.com/haskell/haskell-language-server/pull/3434)) by @michaelpj
58+
59+
360
## 2.2.0.0
461

562
* Binaries for GHC 9.4.7

‎GNUmakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ BINDIST_BASE_DIR := out/bindist/$(ARTIFACT)
6060
BINDIST_OUT_DIR := $(BINDIST_BASE_DIR)/haskell-language-server-$(HLS_VERSION)
6161

6262
CABAL_BASE_ARGS ?= --store-dir=$(ROOT_DIR)/$(STORE_DIR)
63-
CABAL_ARGS ?= --disable-tests --disable-profiling -O2
63+
CABAL_ARGS ?= --disable-tests --disable-profiling -O2 $(ADD_CABAL_ARGS)
6464
CABAL_INSTALL_ARGS ?= --overwrite-policy=always --install-method=copy
6565
CABAL_INSTALL := $(CABAL) $(CABAL_BASE_ARGS) v2-install
6666
PROJECT_FILE := cabal.project

‎docs/support/ghc-version-support.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ Support status (see the support policy below for more details):
1717

1818
| GHC version | Last supporting HLS version | Support status |
1919
|--------------|--------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
20-
| 9.6.2 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | basic support |
20+
| 9.6.3 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | basic support |
21+
| 9.6.2 | [2.2.0.0](https://github.com/haskell/haskell-language-server/releases/latest) | basic support |
2122
| 9.6.1 | [2.0.0.0](https://github.com/haskell/haskell-language-server/releases/tag/2.0.0.0) | basic support |
2223
| 9.4.7 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
23-
| 9.4.6 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
24-
| 9.4.5 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
24+
| 9.4.6 | [2.2.0.0](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
25+
| 9.4.5 | [2.2.0.0](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
2526
| 9.4.4 | [1.10.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.10.0.0) | deprecated |
2627
| 9.4.3 | [1.9.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.9.1.0) | deprecated |
2728
| 9.4.(1,2) | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated |

‎ghcide-bench/ghcide-bench.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cabal-version: 3.0
22
build-type: Simple
33
category: Development
44
name: ghcide-bench
5-
version: 2.2.0.0
5+
version: 2.3.0.0
66
license: Apache-2.0
77
license-file: LICENSE
88
author: The Haskell IDE team

‎ghcide/ghcide.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cabal-version: 3.0
22
build-type: Simple
33
category: Development
44
name: ghcide
5-
version: 2.2.0.0
5+
version: 2.3.0.0
66
license: Apache-2.0
77
license-file: LICENSE
88
author: Digital Asset and Ghcide contributors
@@ -69,7 +69,7 @@ library
6969
haddock-library >= 1.8 && < 1.12,
7070
hashable,
7171
hie-compat ^>= 0.3.0.0,
72-
hls-plugin-api == 2.2.0.0,
72+
hls-plugin-api == 2.3.0.0,
7373
lens,
7474
list-t,
7575
hiedb == 0.4.3.*,
@@ -85,7 +85,7 @@ library
8585
row-types,
8686
text-rope,
8787
safe-exceptions,
88-
hls-graph == 2.2.0.0,
88+
hls-graph == 2.3.0.0,
8989
sorted-list,
9090
sqlite-simple,
9191
stm,

‎haskell-language-server.cabal

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22
category: Development
33
name: haskell-language-server
4-
version: 2.2.0.0
4+
version: 2.3.0.0
55
synopsis: LSP server for GHC
66
description:
77
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -198,129 +198,129 @@ flag cabalfmt
198198

199199
common cabalfmt
200200
if flag(cabalfmt)
201-
build-depends: hls-cabal-fmt-plugin == 2.2.0.0
201+
build-depends: hls-cabal-fmt-plugin == 2.3.0.0
202202
cpp-options: -Dhls_cabalfmt
203203

204204
common cabal
205205
if flag(cabal)
206-
build-depends: hls-cabal-plugin == 2.2.0.0
206+
build-depends: hls-cabal-plugin == 2.3.0.0
207207
cpp-options: -Dhls_cabal
208208

209209
common class
210210
if flag(class)
211-
build-depends: hls-class-plugin == 2.2.0.0
211+
build-depends: hls-class-plugin == 2.3.0.0
212212
cpp-options: -Dhls_class
213213

214214
common callHierarchy
215215
if flag(callHierarchy)
216-
build-depends: hls-call-hierarchy-plugin == 2.2.0.0
216+
build-depends: hls-call-hierarchy-plugin == 2.3.0.0
217217
cpp-options: -Dhls_callHierarchy
218218

219219
common eval
220220
if flag(eval)
221-
build-depends: hls-eval-plugin == 2.2.0.0
221+
build-depends: hls-eval-plugin == 2.3.0.0
222222
cpp-options: -Dhls_eval
223223

224224
common importLens
225225
if flag(importLens)
226-
build-depends: hls-explicit-imports-plugin == 2.2.0.0
226+
build-depends: hls-explicit-imports-plugin == 2.3.0.0
227227
cpp-options: -Dhls_importLens
228228

229229
common rename
230230
if flag(rename)
231-
build-depends: hls-rename-plugin == 2.2.0.0
231+
build-depends: hls-rename-plugin == 2.3.0.0
232232
cpp-options: -Dhls_rename
233233

234234
common retrie
235235
if flag(retrie)
236-
build-depends: hls-retrie-plugin == 2.2.0.0
236+
build-depends: hls-retrie-plugin == 2.3.0.0
237237
cpp-options: -Dhls_retrie
238238

239239
common hlint
240240
if flag(hlint)
241-
build-depends: hls-hlint-plugin == 2.2.0.0
241+
build-depends: hls-hlint-plugin == 2.3.0.0
242242
cpp-options: -Dhls_hlint
243243

244244
common moduleName
245245
if flag(moduleName)
246-
build-depends: hls-module-name-plugin == 2.2.0.0
246+
build-depends: hls-module-name-plugin == 2.3.0.0
247247
cpp-options: -Dhls_moduleName
248248

249249
common pragmas
250250
if flag(pragmas)
251-
build-depends: hls-pragmas-plugin == 2.2.0.0
251+
build-depends: hls-pragmas-plugin == 2.3.0.0
252252
cpp-options: -Dhls_pragmas
253253

254254
common splice
255255
if flag(splice)
256-
build-depends: hls-splice-plugin == 2.2.0.0
256+
build-depends: hls-splice-plugin == 2.3.0.0
257257
cpp-options: -Dhls_splice
258258

259259
common alternateNumberFormat
260260
if flag(alternateNumberFormat)
261-
build-depends: hls-alternate-number-format-plugin == 2.2.0.0
261+
build-depends: hls-alternate-number-format-plugin == 2.3.0.0
262262
cpp-options: -Dhls_alternateNumberFormat
263263

264264
common qualifyImportedNames
265265
if flag(qualifyImportedNames)
266-
build-depends: hls-qualify-imported-names-plugin == 2.2.0.0
266+
build-depends: hls-qualify-imported-names-plugin == 2.3.0.0
267267
cpp-options: -Dhls_qualifyImportedNames
268268

269269
common codeRange
270270
if flag(codeRange)
271-
build-depends: hls-code-range-plugin == 2.2.0.0
271+
build-depends: hls-code-range-plugin == 2.3.0.0
272272
cpp-options: -Dhls_codeRange
273273

274274
common changeTypeSignature
275275
if flag(changeTypeSignature)
276-
build-depends: hls-change-type-signature-plugin == 2.2.0.0
276+
build-depends: hls-change-type-signature-plugin == 2.3.0.0
277277
cpp-options: -Dhls_changeTypeSignature
278278

279279
common gadt
280280
if flag(gadt)
281-
build-depends: hls-gadt-plugin == 2.2.0.0
281+
build-depends: hls-gadt-plugin == 2.3.0.0
282282
cpp-options: -Dhls_gadt
283283

284284
common explicitFixity
285285
if flag(explicitFixity)
286-
build-depends: hls-explicit-fixity-plugin == 2.2.0.0
286+
build-depends: hls-explicit-fixity-plugin == 2.3.0.0
287287
cpp-options: -DexplicitFixity
288288

289289
common explicitFields
290290
if flag(explicitFields)
291-
build-depends: hls-explicit-record-fields-plugin == 2.2.0.0
291+
build-depends: hls-explicit-record-fields-plugin == 2.3.0.0
292292
cpp-options: -DexplicitFields
293293

294294
common overloadedRecordDot
295295
if flag(overloadedRecordDot) && (impl(ghc >= 9.2.0) || flag(ignore-plugins-ghc-bounds))
296-
build-depends: hls-overloaded-record-dot-plugin == 2.2.0.0
296+
build-depends: hls-overloaded-record-dot-plugin == 2.3.0.0
297297
cpp-options: -Dhls_overloaded_record_dot
298298

299299
-- formatters
300300

301301
common floskell
302302
if flag(floskell) && impl(ghc < 9.5)
303-
build-depends: hls-floskell-plugin == 2.2.0.0
303+
build-depends: hls-floskell-plugin == 2.3.0.0
304304
cpp-options: -Dhls_floskell
305305

306306
common fourmolu
307307
if flag(fourmolu)
308-
build-depends: hls-fourmolu-plugin == 2.2.0.0
308+
build-depends: hls-fourmolu-plugin == 2.3.0.0
309309
cpp-options: -Dhls_fourmolu
310310

311311
common ormolu
312312
if flag(ormolu) && impl(ghc < 9.7)
313-
build-depends: hls-ormolu-plugin == 2.2.0.0
313+
build-depends: hls-ormolu-plugin == 2.3.0.0
314314
cpp-options: -Dhls_ormolu
315315

316316
common stylishHaskell
317317
if flag(stylishHaskell)
318-
build-depends: hls-stylish-haskell-plugin == 2.2.0.0
318+
build-depends: hls-stylish-haskell-plugin == 2.3.0.0
319319
cpp-options: -Dhls_stylishHaskell
320320

321321
common refactor
322322
if flag(refactor)
323-
build-depends: hls-refactor-plugin == 2.2.0.0
323+
build-depends: hls-refactor-plugin == 2.3.0.0
324324
cpp-options: -Dhls_refactor
325325

326326
library
@@ -372,12 +372,12 @@ library
372372
, cryptohash-sha1
373373
, data-default
374374
, ghc
375-
, ghcide == 2.2.0.0
375+
, ghcide == 2.3.0.0
376376
, githash >=0.1.6.1
377377
, lsp >= 2.2.0.0
378378
, hie-bios
379379
, hiedb
380-
, hls-plugin-api == 2.2.0.0
380+
, hls-plugin-api == 2.3.0.0
381381
, optparse-applicative
382382
, optparse-simple
383383
, process
@@ -516,7 +516,7 @@ test-suite func-test
516516
, lens-aeson
517517
, ghcide
518518
, ghcide-test-utils
519-
, hls-test-utils == 2.2.0.0
519+
, hls-test-utils == 2.3.0.0
520520
, lsp-types
521521
, aeson
522522
, hls-plugin-api

‎hls-graph/hls-graph.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: hls-graph
3-
version: 2.2.0.0
3+
version: 2.3.0.0
44
synopsis: Haskell Language Server internal graph API
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server/tree/master/hls-graph#readme>

0 commit comments

Comments
 (0)