Skip to content

Enable hls-stylish-haskell-plugin with ghc 9.2 #2836

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 9 commits into from
Apr 19, 2022
Merged

Enable hls-stylish-haskell-plugin with ghc 9.2 #2836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
90d1b89
Enable hls-stylish-haskell-plugin on ghc-9.2
July541 Apr 15, 2022
2f15c2a
Remove sha256 notation
July541 Apr 18, 2022
07ebb95
Update project file
July541 Apr 18, 2022
fe37d98
Update nix file
July541 Apr 18, 2022
9f70e75
Enable tests
July541 Apr 18, 2022
d8ba18a
Merge branch 'master' into stylish-haskell-9.2
July541 Apr 19, 2022
30ae580
update index-state
July541 Apr 19, 2022
9ef3dee
Rerun ci
July541 Apr 19, 2022
8b3e6ae
Merge branch 'master' into stylish-haskell-9.2
wz1000 Apr 19, 2022
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 @@ -190,7 +190,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" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="$TEST_OPTS"

- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.2'
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2'
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" || 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"

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

write-ghc-environment-files: never

index-state: 2022-03-08T10:53:01Z
index-state: 2022-04-19T07:18:40Z

constraints:
-- These plugins don't build/work on GHC92 yet
Expand All @@ -50,7 +50,6 @@ constraints:
-hlint
-retrie
-splice
-stylishhaskell
-tactic,

allow-newer:
Expand All @@ -74,11 +73,6 @@ allow-newer:
-- https://github.com/lspitzner/butcher/pull/8
butcher:base,

stylish-haskell:ghc-lib-parser,
stylish-haskell:Cabal,
stylish-haskell:bytestring,
stylish-haskell:aeson,

ormolu:ghc-lib-parser,

fourmolu:ghc-lib-parser,
Expand Down
2 changes: 0 additions & 2 deletions configuration-ghc-921.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
let
disabledPlugins = [
"hls-brittany-plugin"
"hls-stylish-haskell-plugin"
"hls-hlint-plugin"
"hls-haddock-comments-plugin"
"hls-tactics-plugin"
Expand Down Expand Up @@ -34,7 +33,6 @@ let
hself.callCabal2nixWithOptions "haskell-language-server" ./.
(pkgs.lib.concatStringsSep " " [
"-f-brittany"
"-f-stylishHaskell"
"-f-hlint"
"-f-haddockComments"
"-f-tactics"
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -27,7 +27,7 @@ library
, ghcide ^>=1.6
, hls-plugin-api ^>=1.3
, lsp-types
, stylish-haskell ^>=0.12 || ^>=0.13
, stylish-haskell ^>=0.12 || ^>=0.13 || ^>=0.14
, text

default-language: Haskell2010
Expand Down
5 changes: 3 additions & 2 deletions stack-9.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ packages:
# - ./plugins/hls-splice-plugin
# - ./plugins/hls-tactics-plugin
# - ./plugins/hls-brittany-plugin
# - ./plugins/hls-stylish-haskell-plugin
- ./plugins/hls-stylish-haskell-plugin
- ./plugins/hls-floskell-plugin
- ./plugins/hls-fourmolu-plugin
- ./plugins/hls-pragmas-plugin
Expand Down Expand Up @@ -94,6 +94,8 @@ extra-deps:
- unix-2.7.2.2
- Win32-2.12.0.1

- stylish-haskell-0.14.1.0

# currently needed for ghcide>extra, etc.
allow-newer: true

Expand All @@ -120,7 +122,6 @@ flags:
hlint: false
retrie: false
splice: false
stylishhaskell: false
tactic: false

retrie:
Expand Down