Remove some buildability blockers that aren't needed (#3899)

* Floskell buildable on 9.6

* Ormolu supports 9.8

* Fourmolu supports 9.8

* Fix some conditional logic

* Fix stack

* Fix a cabal file

* more fix stack

* More

* Grumble spelling

* More stack

* Argh

* Bump index-state, remove some allow-newers

* boo

* More

* Redo stack deps entirely

Author: michaelpj

cabal.project

@@ -35,7 +35,7 @@ packages:
          ./plugins/hls-refactor-plugin
          ./plugins/hls-overloaded-record-dot-plugin
 
-index-state: 2023-12-10T23:30:17Z
+index-state: 2023-12-13T00:00:00Z
 
 tests: True
 test-show-details: direct
@@ -96,12 +96,6 @@ if impl(ghc >= 9.7)
     ghc-trace-events:text,
     -- https://github.com/haskell-primitive/primitive-unlifted/issues/39
     primitive-unlifted:bytestring,
-    -- https://github.com/obsidiansystems/constraints-extras/issues/54
-    constraints-extras:base,
-    constraints-extras:template-haskell,
     -- https://github.com/obsidiansystems/commutative-semigroups/issues/13
     commutative-semigroups:base,
     commutative-semigroups:template-haskell,
-    -- https://github.com/kcsongor/generic-lens/issues/158
-    generic-lens:text,
-    generic-lens-core:text,

docs/support/plugin-support.md

@@ -52,16 +52,16 @@ For example, a plugin to provide a formatter which has itself been abandoned has
 | `hls-eval-plugin`                   | 2    |                          |
 | `hls-explicit-fixity-plugin`        | 2    |                          |
 | `hls-explicit-record-fields-plugin` | 2    |                          |
-| `hls-fourmolu-plugin`               | 2    | 9.8                      |
+| `hls-fourmolu-plugin`               | 2    |                          |
 | `hls-gadt-plugin`                   | 2    | 9.8                      |
 | `hls-hlint-plugin`                  | 2    | 9.8                      |
 | `hls-module-name-plugin`            | 2    |                          |
 | `hls-qualify-imported-names-plugin` | 2    |                          |
-| `hls-ormolu-plugin`                 | 2    | 9.8                      |
+| `hls-ormolu-plugin`                 | 2    |                          |
 | `hls-rename-plugin`                 | 2    | 9.8                      |
 | `hls-stylish-haskell-plugin`        | 2    | 9.8                      |
 | `hls-overloaded-record-dot-plugin`  | 2    |                          |
-| `hls-floskell-plugin`               | 3    | 9.6, 9.8                 |
+| `hls-floskell-plugin`               | 3    | 9.8                      |
 | `hls-stan-plugin`                   | 3    | 9.2.(4-8)                |
 | `hls-retrie-plugin`                 | 3    | 9.8                      |
 | `hls-splice-plugin`                 | 3    | 9.8                      |

haskell-language-server.cabal

@@ -309,17 +309,17 @@ common overloadedRecordDot
 -- formatters
 
 common floskell
-  if flag(floskell) && impl(ghc < 9.5)
+  if flag(floskell) && (impl(ghc < 9.7) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-floskell-plugin == 2.5.0.0
     cpp-options: -Dhls_floskell
 
 common fourmolu
-  if flag(fourmolu) && (impl(ghc < 9.8.0) || flag(ignore-plugins-ghc-bounds))
+  if flag(fourmolu) 
     build-depends: hls-fourmolu-plugin == 2.5.0.0
     cpp-options: -Dhls_fourmolu
 
 common ormolu
-  if flag(ormolu) && impl(ghc < 9.7)
+  if flag(ormolu) 
     build-depends: hls-ormolu-plugin == 2.5.0.0
     cpp-options: -Dhls_ormolu
 
@@ -556,7 +556,7 @@ test-suite func-test
   if flag(eval)
     cpp-options: -Dhls_eval
 -- formatters
-  if flag(floskell) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
+  if flag(floskell) 
     cpp-options: -Dhls_floskell
   if flag(fourmolu)
     cpp-options: -Dhls_fourmolu

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

@@ -21,14 +21,14 @@ source-repository head
     location: https://github.com/haskell/haskell-language-server.git
 
 library
-  -- Plugins that need exactprint have not been updated for 9.8 yet
-  if impl(ghc >= 9.5)
+  -- floskell does not support GHC 9.8 yet
+  if impl(ghc >= 9.7)
     buildable: False
   exposed-modules:  Ide.Plugin.Floskell
   hs-source-dirs:   src
   build-depends:
     , base            >=4.12 && <5
-    , floskell        ^>=0.10
+    , floskell        ^>=0.10.8
     , ghcide          == 2.5.0.0
     , hls-plugin-api  == 2.5.0.0
     , lsp-types       ^>=2.1
@@ -39,7 +39,7 @@ library
   default-language: Haskell2010
 
 test-suite tests
-  if impl(ghc >= 9.5)
+  if impl(ghc >= 9.7)
     buildable: False
   type:             exitcode-stdio-1.0
   default-language: Haskell2010

plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal

@@ -23,11 +23,6 @@ source-repository head
   location: git://github.com/haskell/haskell-language-server.git
 
 library
-  -- Plugins that need exactprint have not been updated for 9.8 yet
-  if impl(ghc >= 9.8)
-    buildable: False
-  else
-    buildable: True
   exposed-modules:
       Ide.Plugin.Fourmolu
   hs-source-dirs:   src
@@ -48,21 +43,15 @@ library
 
   if impl(ghc >= 9.0) && impl(ghc < 9.2)
     build-depends: fourmolu ^>= 0.11
-  elif impl(ghc >= 9.2) && impl(ghc < 9.8)
+  else 
     build-depends: fourmolu ^>= 0.14
-  else
-    buildable: False
 
   -- fourmolu 0.9.0 fails to build on Windows CI for reasons unknown
   if impl(ghc >= 9.2) && os(windows) && impl(ghc < 9.4)
      build-depends: fourmolu > 0.9.0.0 || < 0.9.0.0
   default-language: Haskell2010
 
 test-suite tests
-  if impl(ghc >= 9.8)
-    buildable: False
-  else
-    buildable: True
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test

plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal

@@ -23,9 +23,6 @@ source-repository head
     location: https://github.com/haskell/haskell-language-server.git
 
 library
-  -- Plugins that need exactprint have not been updated for 9.8 yet
-  if impl(ghc >= 9.7)
-    buildable: False
   exposed-modules:  Ide.Plugin.Ormolu
   hs-source-dirs:   src
   build-depends:
@@ -47,8 +44,6 @@ library
   default-language: Haskell2010
 
 test-suite tests
-  if impl(ghc >= 9.7)
-    buildable: False
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   hs-source-dirs:   test

plugins/hls-overloaded-record-dot-plugin/hls-overloaded-record-dot-plugin.cabal

@@ -22,11 +22,11 @@ common warnings
     ghc-options: -Wall
 
 library
+    import:           warnings
     if impl(ghc < 9.2)
       buildable: False
     else
       buildable: True
-    import:           warnings
     exposed-modules:  Ide.Plugin.OverloadedRecordDot
     build-depends:
       , base                  >=4.16 && <5

stack.yaml

@@ -20,7 +20,7 @@ packages:
   - ./plugins/hls-explicit-fixity-plugin
   - ./plugins/hls-explicit-imports-plugin
   - ./plugins/hls-explicit-record-fields-plugin
-  # - ./plugins/hls-floskell-plugin
+  - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-gadt-plugin
   - ./plugins/hls-hlint-plugin
@@ -42,22 +42,23 @@ ghc-options:
 allow-newer: true
 
 extra-deps:
-- Cabal-syntax-3.10.1.0@sha256:bb835ebab577fd0f9c11dab96210dbb8d68ffc62652576f4b092563c345930e7,7434
-# - floskell-0.10.7
+- floskell-0.10.8
+- retrie-1.2.2
 - hiedb-0.4.4.0
-- hie-bios-0.13.1
 - implicit-hie-0.1.4.0
-- algebraic-graphs-0.6.1
-- retrie-1.2.2
-- hw-fingertree-0.1.2.1
-- hw-prim-0.6.3.2
-- ansi-terminal-0.11.5
+- hie-bios-0.13.1
 - lsp-2.3.0.0
 - lsp-test-0.16.0.1
 - lsp-types-2.1.0.0
+- attoparsec-aeson-2.1.0.0
+- hw-fingertree-0.1.2.1
+- integer-conversion-0.1.0.1
+- monad-dijkstra-0.1.1.4
+- hw-prim-0.6.3.2
+- optparse-applicative-0.17.1.0
 
-# stan dependencies not found in the stackage snapshot
-- stan-0.1.0.2
+# stan and friends
+- stan-0.1.1.0
 - clay-0.14.0
 - colourista-0.1.0.2
 - dir-traverse-0.2.3.0