Skip to content

Commit ddc67b2

Browse files
michaelpjmichaelpj
authored
Support stylish-haskell and ormolu in 9.4 (#3446)
* Update index-state * Enable ormolu on 9.4 * Enable stylish-haskell on 9.4 * Update flake.lock * Declare 9.4 to be fully supported * Enable floskell for 9.4
1 parent 6cf5774 commit ddc67b2

File tree

9 files changed

+15
-52
lines changed

9 files changed

+15
-52
lines changed

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ jobs:
169169
name: Test hls-refactor-plugin
170170
run: cabal test hls-refactor-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-refactor-plugin --test-options="$TEST_OPTS"
171171

172-
- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
172+
- if: matrix.test
173173
name: Test hls-floskell-plugin
174174
run: cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-floskell-plugin --test-options="$TEST_OPTS"
175175

@@ -193,11 +193,11 @@ jobs:
193193
name: Test hls-splice-plugin
194194
run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="$TEST_OPTS"
195195

196-
- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
196+
- if: matrix.test
197197
name: Test hls-stylish-haskell-plugin
198198
run: cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS"
199199

200-
- if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
200+
- if: matrix.test
201201
name: Test hls-ormolu-plugin
202202
run: cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-ormolu-plugin --test-options="$TEST_OPTS"
203203

‎cabal.project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ package *
5050

5151
write-ghc-environment-files: never
5252

53-
index-state: 2022-12-19T19:08:33Z
53+
index-state: 2023-01-10T00:00:00Z
5454

5555
constraints:
5656
-- For GHC 9.4, older versions of entropy fail to build on Windows

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Support status (see the support policy below for more details):
1717

1818
| GHC version | Last supporting HLS version | Support status |
1919
|--------------|------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
20-
| 9.4.4 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | basic support |
21-
| 9.4.3 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | basic support |
22-
| 9.4.2 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | basic support |
23-
| 9.4.1 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | basic support |
20+
| 9.4.4 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
21+
| 9.4.3 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
22+
| 9.4.2 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | full support |
23+
| 9.4.1 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | full support |
2424
| 9.2.5 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
2525
| 9.2.4 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | full support |
2626
| 9.2.3 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | full support |

‎docs/support/plugin-support.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ For example, a plugin to provide a formatter which has itself been abandoned has
5252
| `hls-eval-plugin` | 2 | 9.4 |
5353
| `hls-explicit-fixity-plugin` | 2 | |
5454
| `hls-explicit-record-fields-plugin` | 2 | |
55-
| `hls-floskell-plugin` | 2 | 9.4 |
55+
| `hls-floskell-plugin` | 2 | |
5656
| `hls-fourmolu-plugin` | 2 | |
5757
| `hls-gadt-plugin` | 2 | |
5858
| `hls-hlint-plugin` | 2 | |
5959
| `hls-module-name-plugin` | 2 | |
6060
| `hls-qualify-imported-names-plugin` | 2 | |
61-
| `hls-ormolu-plugin` | 2 | 9.4 |
62-
| `hls-rename-plugin` | 2 | 9.4 |
61+
| `hls-ormolu-plugin` | 2 | |
62+
| `hls-rename-plugin` | 2 | |
6363
| `hls-refine-imports-plugin` | 2 | |
64-
| `hls-stylish-haskell-plugin` | 2 | 9.4 |
64+
| `hls-stylish-haskell-plugin` | 2 | |
6565
| `hls-tactics-plugin` | 2 | 9.2, 9.4 |
6666
| `hls-haddock-comments-plugin` | 3 | 9.2, 9.4 |
6767
| `hls-stan-plugin` | 3 | 8.6, 9.0, 9.2, 9.4 |

‎flake.lock‎

Lines changed: 0 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎haskell-language-server.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ common explicitFields
329329
-- formatters
330330

331331
common floskell
332-
if flag(floskell) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
332+
if flag(floskell)
333333
build-depends: hls-floskell-plugin ^>= 1.0
334334
cpp-options: -Dhls_floskell
335335

@@ -339,12 +339,12 @@ common fourmolu
339339
cpp-options: -Dhls_fourmolu
340340

341341
common ormolu
342-
if flag(ormolu) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
342+
if flag(ormolu)
343343
build-depends: hls-ormolu-plugin ^>= 1.0
344344
cpp-options: -Dhls_ormolu
345345

346346
common stylishHaskell
347-
if flag(stylishHaskell) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
347+
if flag(stylishHaskell)
348348
build-depends: hls-stylish-haskell-plugin ^>= 1.0
349349
cpp-options: -Dhls_stylishHaskell
350350

‎plugins/hls-floskell-plugin/hls-floskell-plugin.cabal‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ source-repository head
2121
location: https://github.com/haskell/haskell-language-server.git
2222

2323
library
24-
if impl(ghc >= 9.3)
25-
buildable: False
26-
else
27-
buildable: True
2824
exposed-modules: Ide.Plugin.Floskell
2925
hs-source-dirs: src
3026
build-depends:
@@ -39,10 +35,6 @@ library
3935
default-language: Haskell2010
4036

4137
test-suite tests
42-
if impl(ghc >= 9.3)
43-
buildable: False
44-
else
45-
buildable: True
4638
type: exitcode-stdio-1.0
4739
default-language: Haskell2010
4840
hs-source-dirs: test

‎plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ source-repository head
2121
location: https://github.com/haskell/haskell-language-server.git
2222

2323
library
24-
if impl(ghc >= 9.3)
25-
buildable: False
26-
else
27-
buildable: True
2824
exposed-modules: Ide.Plugin.Ormolu
2925
hs-source-dirs: src
3026
build-depends:
@@ -42,10 +38,6 @@ library
4238
default-language: Haskell2010
4339

4440
test-suite tests
45-
if impl(ghc >= 9.3)
46-
buildable: False
47-
else
48-
buildable: True
4941
type: exitcode-stdio-1.0
5042
default-language: Haskell2010
5143
hs-source-dirs: test

‎plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ source-repository head
2020
location: https://github.com/haskell/haskell-language-server.git
2121

2222
library
23-
if impl(ghc >= 9.3)
24-
buildable: False
25-
else
26-
buildable: True
2723
exposed-modules: Ide.Plugin.StylishHaskell
2824
hs-source-dirs: src
2925
build-depends:
@@ -41,10 +37,6 @@ library
4137
default-language: Haskell2010
4238

4339
test-suite tests
44-
if impl(ghc >= 9.3)
45-
buildable: False
46-
else
47-
buildable: True
4840
type: exitcode-stdio-1.0
4941
default-language: Haskell2010
5042
hs-source-dirs: test

0 commit comments

Comments
 (0)