Skip to content

Commit fbcd3a4

Browse files
July541wz1000
andauthored
Enable hls-stylish-haskell-plugin with ghc 9.2 (#2836)
* Enable hls-stylish-haskell-plugin on ghc-9.2 * Remove sha256 notation * Update project file * Update nix file * Enable tests * update index-state * Rerun ci Co-authored-by: wz1000 <[email protected]>
1 parent 4a5d471 commit fbcd3a4

File tree

5 files changed

+6
-13
lines changed

5 files changed

+6
-13
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ jobs:
190190
name: Test hls-splice-plugin
191191
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"
192192

193-
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.2'
193+
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2'
194194
name: Test hls-stylish-haskell-plugin
195195
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"
196196

cabal-ghc92.project

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ package *
3939

4040
write-ghc-environment-files: never
4141

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

4444
constraints:
4545
-- These plugins don't build/work on GHC92 yet
@@ -50,7 +50,6 @@ constraints:
5050
-hlint
5151
-retrie
5252
-splice
53-
-stylishhaskell
5453
-tactic,
5554

5655
allow-newer:
@@ -74,11 +73,6 @@ allow-newer:
7473
-- https://github.com/lspitzner/butcher/pull/8
7574
butcher:base,
7675

77-
stylish-haskell:ghc-lib-parser,
78-
stylish-haskell:Cabal,
79-
stylish-haskell:bytestring,
80-
stylish-haskell:aeson,
81-
8276
ormolu:ghc-lib-parser,
8377

8478
fourmolu:ghc-lib-parser,

configuration-ghc-921.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
let
55
disabledPlugins = [
66
"hls-brittany-plugin"
7-
"hls-stylish-haskell-plugin"
87
"hls-hlint-plugin"
98
"hls-haddock-comments-plugin"
109
"hls-tactics-plugin"
@@ -34,7 +33,6 @@ let
3433
hself.callCabal2nixWithOptions "haskell-language-server" ./.
3534
(pkgs.lib.concatStringsSep " " [
3635
"-f-brittany"
37-
"-f-stylishHaskell"
3836
"-f-hlint"
3937
"-f-haddockComments"
4038
"-f-tactics"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ library
2727
, ghcide ^>=1.6
2828
, hls-plugin-api ^>=1.3
2929
, lsp-types
30-
, stylish-haskell ^>=0.12 || ^>=0.13
30+
, stylish-haskell ^>=0.12 || ^>=0.13 || ^>=0.14
3131
, text
3232

3333
default-language: Haskell2010

stack-9.2.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ packages:
2222
# - ./plugins/hls-splice-plugin
2323
# - ./plugins/hls-tactics-plugin
2424
# - ./plugins/hls-brittany-plugin
25-
# - ./plugins/hls-stylish-haskell-plugin
25+
- ./plugins/hls-stylish-haskell-plugin
2626
- ./plugins/hls-floskell-plugin
2727
- ./plugins/hls-fourmolu-plugin
2828
- ./plugins/hls-pragmas-plugin
@@ -94,6 +94,8 @@ extra-deps:
9494
- unix-2.7.2.2
9595
- Win32-2.12.0.1
9696

97+
- stylish-haskell-0.14.1.0
98+
9799
# currently needed for ghcide>extra, etc.
98100
allow-newer: true
99101

@@ -120,7 +122,6 @@ flags:
120122
hlint: false
121123
retrie: false
122124
splice: false
123-
stylishhaskell: false
124125
tactic: false
125126

126127
retrie:

0 commit comments

Comments
 (0)