Skip to content

Commit a2a9991

Browse files
authored
Enable floskell and hlint plugins for ghc 9.8 (#4125)
* Enable floskell and hlint plugins for ghc 9.8 * Update golden extension schema * Renererate default-config.golden.json
1 parent 91098a4 commit a2a9991

File tree

3 files changed

+27
-2
lines changed

3 files changed

+27
-2
lines changed

haskell-language-server.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ flag hlint
606606
manual: True
607607

608608
common hlint
609-
if flag(hlint) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
609+
if flag(hlint)
610610
build-depends: haskell-language-server:hls-hlint-plugin
611611
cpp-options: -Dhls_hlint
612612

@@ -1278,7 +1278,7 @@ flag floskell
12781278
manual: True
12791279

12801280
common floskell
1281-
if flag(floskell) && (impl(ghc < 9.7) || flag(ignore-plugins-ghc-bounds))
1281+
if flag(floskell)
12821282
build-depends: haskell-language-server:hls-floskell-plugin
12831283
cpp-options: -Dhls_floskell
12841284

test/testdata/schema/ghc98/default-config.golden.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,13 @@
7373
},
7474
"globalOn": true
7575
},
76+
"hlint": {
77+
"codeActionsOn": true,
78+
"config": {
79+
"flags": []
80+
},
81+
"diagnosticsOn": true
82+
},
7683
"importLens": {
7784
"codeActionsOn": true,
7885
"codeLensOn": true

test/testdata/schema/ghc98/vscode-extension-schema.golden.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,24 @@
171171
"scope": "resource",
172172
"type": "boolean"
173173
},
174+
"haskell.plugin.hlint.codeActionsOn": {
175+
"default": true,
176+
"description": "Enables hlint code actions",
177+
"scope": "resource",
178+
"type": "boolean"
179+
},
180+
"haskell.plugin.hlint.config.flags": {
181+
"default": [],
182+
"markdownDescription": "Flags used by hlint",
183+
"scope": "resource",
184+
"type": "array"
185+
},
186+
"haskell.plugin.hlint.diagnosticsOn": {
187+
"default": true,
188+
"description": "Enables hlint diagnostics",
189+
"scope": "resource",
190+
"type": "boolean"
191+
},
174192
"haskell.plugin.importLens.codeActionsOn": {
175193
"default": true,
176194
"description": "Enables importLens code actions",

0 commit comments

Comments
 (0)