Bump Ormolu and Fourmolu to GHC-9.2-compatible versions (#2579)

* Bump Ormolu and Fourmolu to latest versions (resp. 0.4 and 0.5)

* Enable Ormolu and Fourmolu on GHC 9.2

* Bump index-state

* enable tests for ghc-9.2.1

* enable fourmolu and ormolu

* Allow newer ghc-lib-parser for *molu

* Fix ormolu

Co-authored-by: Michael Peyton Jones <[email protected]>
Co-authored-by: Javier Neira <[email protected]>
Co-authored-by: Junyoung "Clare" Jang <[email protected]>

Author: 4 people

Diff for: .github/workflows/test.yml

@@ -178,11 +178,11 @@ jobs:
         name: Test hls-stylish-haskell-plugin
         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"
 
-      - if: matrix.test && matrix.ghc != '9.2.1'
+      - if: matrix.test
         name: Test hls-ormolu-plugin
         run: cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-ormolu-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.2.1'
+      - if: matrix.test
         name: Test hls-fourmolu-plugin
         run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
 

Diff for: cabal-ghc901.project

@@ -37,7 +37,7 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2021-12-29T12:30:08Z
+index-state: 2022-01-10T17:57:05Z
 
 constraints:
   -- These plugins don't work on GHC9 yet

Diff for: cabal-ghc921.project

@@ -9,7 +9,7 @@ packages:
         --  ./plugins/hls-tactics-plugin
         --  ./plugins/hls-brittany-plugin
         --  ./plugins/hls-stylish-haskell-plugin
-        --  ./plugins/hls-fourmolu-plugin
+         ./plugins/hls-fourmolu-plugin
          ./plugins/hls-class-plugin
         -- ./plugins/hls-eval-plugin
          ./plugins/hls-explicit-imports-plugin
@@ -23,7 +23,7 @@ packages:
         -- ./plugins/hls-floskell-plugin
          ./plugins/hls-pragmas-plugin
          ./plugins/hls-module-name-plugin
-        -- ./plugins/hls-ormolu-plugin
+         ./plugins/hls-ormolu-plugin
          ./plugins/hls-call-hierarchy-plugin
         -- ./plugins/hls-alternate-number-format-plugin
 
@@ -54,7 +54,8 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2022-01-03T18:45:00Z
+
+index-state: 2022-01-10T17:57:05Z
 
 constraints:
   -- These plugins don't build/work on GHC92 yet
@@ -66,11 +67,9 @@ constraints:
     -class
     -eval
     -floskell
-    -fourmolu
     -haddockComments
     -hlint
     -moduleName
-    -ormolu
     -qualifyImportedNames
     -refineImports
     -retrie
@@ -112,7 +111,7 @@ allow-newer:
   SVGFonts:diagrams-core,
 
   -- for head.hackage
-  primitive-unlifted:base
+  primitive-unlifted:base,
 
 allow-older:
   primitive-extras:primitive-unlifted

Diff for: cabal.project

@@ -40,7 +40,7 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2021-12-29T12:30:08Z
+index-state: 2022-01-10T17:57:05Z
 
 constraints:
     hyphenation +embed

Diff for: haskell-language-server.cabal

@@ -288,7 +288,7 @@ common floskell
     cpp-options: -Dfloskell
 
 common fourmolu
-  if flag(fourmolu) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
+  if flag(fourmolu) && flag(ignore-plugins-ghc-bounds)
     build-depends: hls-fourmolu-plugin ^>=1.0.0.0
     cpp-options: -Dfourmolu
 
@@ -475,7 +475,7 @@ test-suite func-test
 -- formatters
   if flag(floskell) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
     cpp-options: -Dfloskell
-  if flag(fourmolu) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
+  if flag(fourmolu) && flag(ignore-plugins-ghc-bounds)
     cpp-options: -Dfourmolu
   if flag(ormolu)
     cpp-options: -Dormolu

Diff for: plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal

@@ -23,7 +23,7 @@ library
   build-depends:
     , base            >=4.12 && <5
     , filepath
-    , fourmolu        ^>=0.3 || ^>=0.4
+    , fourmolu        ^>=0.3 || ^>=0.4 || ^>= 0.5
     , ghc
     , ghc-boot-th
     , ghcide          ^>=1.5.0

Diff for: plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal

@@ -28,7 +28,7 @@ library
     , hls-plugin-api  >=1.1   && <1.3
     , lens
     , lsp
-    , ormolu          ^>=0.1.2 || ^>= 0.2 || ^>= 0.3
+    , ormolu          ^>=0.1.2 || ^>= 0.2 || ^>= 0.3 || ^>= 0.4
     , text
 
   default-language: Haskell2010