update Floskell to 0.11.* (#3933)

* update Floskell to 0.11.*

Floskell 0.11.* supports Aeson 2.2.*

* package version 2.5.0.0, Stack Floskell dependency, codeowner

* update GHC 9.4 Stack resolver

https://www.stackage.org/lts-21.25

remove duplicate `extra-deps`

Author: peterbecich

CODEOWNERS

@@ -15,7 +15,7 @@
 /plugins/hls-class-plugin @Ailrun
 /plugins/hls-eval-plugin
 /plugins/hls-explicit-imports-plugin @pepeiborra
-/plugins/hls-floskell-plugin @Ailrun
+/plugins/hls-floskell-plugin @Ailrun @peterbecich
 /plugins/hls-fourmolu-plugin @georgefst
 /plugins/hls-gadt-plugin @July541
 /plugins/hls-hlint-plugin @eddiemundo

plugins/hls-floskell-plugin/CHANGELOG.md

@@ -0,0 +1,4 @@
+# Revision history for hls-floskell-plugin
+
+## 2.5.1.0 -- 2024-01-05
+Updates Floskell dependency to 0.11.*, which supports Aeson 2.2.*

plugins/hls-floskell-plugin/hls-floskell-plugin.cabal

@@ -28,7 +28,7 @@ library
   hs-source-dirs:   src
   build-depends:
     , base            >=4.12 && <5
-    , floskell        ^>=0.10.8
+    , floskell        ^>=0.11.0
     , ghcide          == 2.5.0.0
     , hls-plugin-api  == 2.5.0.0
     , lsp-types       ^>=2.1

plugins/hls-floskell-plugin/src/Ide/Plugin/Floskell.hs

@@ -39,10 +39,10 @@ provider _ideState typ contents fp _ = do
     let (range, selectedContents) = case typ of
           FormatText    -> (fullRange contents, contents)
           FormatRange r -> (normalize r, extractTextInRange (extendToFullLines r) contents)
-        result = reformat config (Just file) . TL.encodeUtf8 $ TL.fromStrict selectedContents
+        result = reformat config (Just file) $ TL.fromStrict selectedContents
     case result of
       Left  err -> throwError $ PluginInternalError $ T.pack $ "floskellCmd: " ++ err
-      Right new -> pure $ InL [TextEdit range . TL.toStrict $ TL.decodeUtf8 new]
+      Right new -> pure $ InL [TextEdit range $ TL.toStrict new]
 
 -- | Find Floskell Config, user and system wide or provides a default style.
 -- Every directory of the filepath will be searched to find a user configuration.

stack-lts21.yaml

@@ -1,4 +1,4 @@
-resolver: lts-21.2 # ghc-9.4
+resolver: lts-21.25 # ghc-9.4
 
 packages:
   - .
@@ -44,12 +44,11 @@ ghc-options:
 allow-newer: true
 
 extra-deps:
-- floskell-0.10.7
+- floskell-0.11.1
 - hiedb-0.4.4.0
 - hie-bios-0.13.1
 - implicit-hie-0.1.4.0
 - monad-dijkstra-0.1.1.3
-- algebraic-graphs-0.6.1
 - retrie-1.2.2
 - stylish-haskell-0.14.4.0
 - lsp-2.3.0.0
@@ -59,11 +58,8 @@ extra-deps:
 # stan dependencies not found in the stackage snapshot
 - stan-0.1.0.2
 - clay-0.14.0
-- colourista-0.1.0.2
 - dir-traverse-0.2.3.0
 - extensions-0.1.0.0
-- relude-1.2.1.0
-- slist-0.2.1.0
 - tomland-1.3.3.2
 - trial-0.0.0.0
 - trial-optparse-applicative-0.0.0.0

stack.yaml

@@ -43,7 +43,7 @@ ghc-options:
 allow-newer: true
 
 extra-deps:
-- floskell-0.10.8
+- floskell-0.11.1
 - retrie-1.2.2
 - hiedb-0.4.4.0
 - implicit-hie-0.1.4.0