Skip to content

Commit aff3d2e

Browse files
authored
Enable stylish-haskell for 9.6 (#3670)
There is a 9.6-compatible release now.
1 parent 1edc757 commit aff3d2e

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jobs:
162162
name: Test hls-splice-plugin
163163
run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || cabal test hls-splice-plugin --test-options="$TEST_OPTS"
164164

165-
- if: matrix.test && matrix.ghc != '9.6'
165+
- if: matrix.test
166166
name: Test hls-stylish-haskell-plugin
167167
run: cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS"
168168

cabal.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ package *
5656

5757
write-ghc-environment-files: never
5858

59-
index-state: 2023-06-17T12:00:00Z
59+
index-state: 2023-06-25T00:00:00Z
6060

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

docs/support/plugin-support.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ For example, a plugin to provide a formatter which has itself been abandoned has
6161
| `hls-ormolu-plugin` | 2 | |
6262
| `hls-rename-plugin` | 2 | |
6363
| `hls-refine-imports-plugin` | 2 | |
64-
| `hls-stylish-haskell-plugin` | 2 | 9.6 |
64+
| `hls-stylish-haskell-plugin` | 2 | |
6565
| `hls-tactics-plugin` | 2 | 9.2, 9.4, 9.6 |
6666
| `hls-overloaded-recrod-dot-plugin` | 2 | 8.10, 9.0 |
6767
| `hls-haddock-comments-plugin` | 3 | 9.2, 9.4, 9.6 |

haskell-language-server.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ common ormolu
354354
cpp-options: -Dhls_ormolu
355355

356356
common stylishHaskell
357-
if flag(stylishHaskell) && impl(ghc < 9.5)
357+
if flag(stylishHaskell)
358358
build-depends: hls-stylish-haskell-plugin == 2.1.0.0
359359
cpp-options: -Dhls_stylishHaskell
360360

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

-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ source-repository head
2020
location: https://github.com/haskell/haskell-language-server.git
2121

2222
library
23-
if impl(ghc >= 9.5)
24-
buildable: False
2523
exposed-modules: Ide.Plugin.StylishHaskell
2624
hs-source-dirs: src
2725
build-depends:
@@ -39,8 +37,6 @@ library
3937
default-language: Haskell2010
4038

4139
test-suite tests
42-
if impl(ghc >= 9.5)
43-
buildable: False
4440
type: exitcode-stdio-1.0
4541
default-language: Haskell2010
4642
hs-source-dirs: test

0 commit comments

Comments
 (0)