From 99418f03033291b0f0be7b076d0a10c0d8340021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= <honza.hrk@gmail.com>
Date: Sat, 9 Mar 2024 16:19:01 +0100
Subject: [PATCH 1/3] Enable floskell and hlint plugins for ghc 9.8

---
 haskell-language-server.cabal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
index 574f86f2ef..613323b361 100644
--- a/haskell-language-server.cabal
+++ b/haskell-language-server.cabal
@@ -606,7 +606,7 @@ flag hlint
   manual:      True
 
 common hlint
-  if flag(hlint) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
+  if flag(hlint)
     build-depends: haskell-language-server:hls-hlint-plugin
     cpp-options: -Dhls_hlint
 
@@ -1278,7 +1278,7 @@ flag floskell
   manual:      True
 
 common floskell
-  if flag(floskell) && (impl(ghc < 9.7) || flag(ignore-plugins-ghc-bounds))
+  if flag(floskell)
     build-depends: haskell-language-server:hls-floskell-plugin
     cpp-options: -Dhls_floskell
 

From 596b8a41a4b970a5f58401b647bab68442a68280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= <honza.hrk@gmail.com>
Date: Sat, 9 Mar 2024 17:02:19 +0100
Subject: [PATCH 2/3] Update golden extension schema

---
 .../ghc98/vscode-extension-schema.golden.json  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/testdata/schema/ghc98/vscode-extension-schema.golden.json b/test/testdata/schema/ghc98/vscode-extension-schema.golden.json
index d7e33d9e7d..9bf9808fa6 100644
--- a/test/testdata/schema/ghc98/vscode-extension-schema.golden.json
+++ b/test/testdata/schema/ghc98/vscode-extension-schema.golden.json
@@ -171,6 +171,24 @@
         "scope": "resource",
         "type": "boolean"
     },
+    "haskell.plugin.hlint.codeActionsOn": {
+        "default": true,
+        "description": "Enables hlint code actions",
+        "scope": "resource",
+        "type": "boolean"
+    },
+    "haskell.plugin.hlint.config.flags": {
+        "default": [],
+        "markdownDescription": "Flags used by hlint",
+        "scope": "resource",
+        "type": "array"
+    },
+    "haskell.plugin.hlint.diagnosticsOn": {
+        "default": true,
+        "description": "Enables hlint diagnostics",
+        "scope": "resource",
+        "type": "boolean"
+    },
     "haskell.plugin.importLens.codeActionsOn": {
         "default": true,
         "description": "Enables importLens code actions",

From 2329d60fddabe91cc687bfbbf7aded685a540af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= <honza.hrk@gmail.com>
Date: Sat, 9 Mar 2024 17:28:04 +0100
Subject: [PATCH 3/3] Renererate default-config.golden.json

---
 test/testdata/schema/ghc98/default-config.golden.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/testdata/schema/ghc98/default-config.golden.json b/test/testdata/schema/ghc98/default-config.golden.json
index 86c99b6b9d..a214839857 100644
--- a/test/testdata/schema/ghc98/default-config.golden.json
+++ b/test/testdata/schema/ghc98/default-config.golden.json
@@ -73,6 +73,13 @@
             },
             "globalOn": true
         },
+        "hlint": {
+            "codeActionsOn": true,
+            "config": {
+                "flags": []
+            },
+            "diagnosticsOn": true
+        },
         "importLens": {
             "codeActionsOn": true,
             "codeLensOn": true