Skip to content

Integrate stylish-haskell into hls executable with ghc 9.8 #4124

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 3 commits into from
Mar 9, 2024
Merged

Integrate stylish-haskell into hls executable with ghc 9.8 #4124

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26cd065
Enable stylish-haskell with ghc 9.8
jhrcek Mar 9, 2024
4b098ef
Fix index-state warnings
jhrcek Mar 9, 2024
ecc4d92
Simplify
jhrcek Mar 9, 2024
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 cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ packages:
./hls-plugin-api
./hls-test-utils

index-state: 2024-02-25T00:00:00Z
index-state: 2024-03-09T08:17:00Z
Copy link
Collaborator Author

@jhrcek jhrcek Mar 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumping index state just to silence this warning:

Warning: Requested index-state 2024-02-25T00:00:00Z is newer than 
'hackage.haskell.org'! Falling back to older state (2024-02-24T17:42:44Z).


tests: True
test-show-details: direct
Expand Down
4 changes: 2 additions & 2 deletions haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ flag stylishHaskell
manual: True

common stylishHaskell
if flag(stylishHaskell) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
if flag(stylishHaskell)
build-depends: haskell-language-server:hls-stylish-haskell-plugin
cpp-options: -Dhls_stylishHaskell

Expand All @@ -1433,7 +1433,7 @@ library hls-stylish-haskell-plugin
, hls-plugin-api == 2.7.0.0
, lsp-types
, mtl
, stylish-haskell ^>=0.12 || ^>=0.13 || ^>=0.14.2
, stylish-haskell ^>=0.12 || ^>=0.13 || ^>=0.14.2 || ^>=0.14.6
, text


Expand Down