Skip to content

Enable stylish-haskell for 9.6 #3670

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 25, 2023
Merged

Enable stylish-haskell for 9.6 #3670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ jobs:
name: Test hls-splice-plugin
run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || cabal test hls-splice-plugin --test-options="$TEST_OPTS"

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

Expand Down
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ package *

write-ghc-environment-files: never

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

constraints:
-- For GHC 9.4, older versions of entropy fail to build on Windows
Expand Down
2 changes: 1 addition & 1 deletion docs/support/plugin-support.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ For example, a plugin to provide a formatter which has itself been abandoned has
| `hls-ormolu-plugin` | 2 | |
| `hls-rename-plugin` | 2 | |
| `hls-refine-imports-plugin` | 2 | |
| `hls-stylish-haskell-plugin` | 2 | 9.6 |
| `hls-stylish-haskell-plugin` | 2 | |
| `hls-tactics-plugin` | 2 | 9.2, 9.4, 9.6 |
| `hls-overloaded-recrod-dot-plugin` | 2 | 8.10, 9.0 |
| `hls-haddock-comments-plugin` | 3 | 9.2, 9.4, 9.6 |
Expand Down
2 changes: 1 addition & 1 deletion haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ common ormolu
cpp-options: -Dhls_ormolu

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

Expand Down
4 changes: 0 additions & 4 deletions plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ source-repository head
location: https://github.com/haskell/haskell-language-server.git

library
if impl(ghc >= 9.5)
buildable: False
exposed-modules: Ide.Plugin.StylishHaskell
hs-source-dirs: src
build-depends:
Expand All @@ -39,8 +37,6 @@ library
default-language: Haskell2010

test-suite tests
if impl(ghc >= 9.5)
buildable: False
type: exitcode-stdio-1.0
default-language: Haskell2010
hs-source-dirs: test
Expand Down