Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 13, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5b7e2ef
Bump Ormolu and Fourmolu to latest versions (resp. 0.4 and 0.5)
georgefst Jan 10, 2022
fbf556e
Enable Ormolu and Fourmolu on GHC 9.2
georgefst Jan 10, 2022
71ae3e0
Bump index-state
georgefst Jan 10, 2022
764094e
Merge branch 'master' into ghc-9.2-ormolu-fourmolu
michaelpj Jan 12, 2022
2f09525
enable tests for ghc-9.2.1
jneira Jan 13, 2022
6136b79
enable fourmolu and ormolu
jneira Jan 13, 2022
77cbc0c
Merge branch 'master' into ghc-9.2-ormolu-fourmolu
Ailrun Jan 13, 2022
eccde13
Allow newer ghc-lib-parser for *molu
jneira Jan 13, 2022
e1e47dc
Fix ormolu
georgefst Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cabal-ghc901.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions cabal-ghc921.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -66,11 +67,9 @@ constraints:
-class
-eval
-floskell
-fourmolu
-haddockComments
-hlint
-moduleName
-ormolu
-qualifyImportedNames
-refineImports
-retrie
Expand Down Expand Up @@ -112,7 +111,7 @@ allow-newer:
SVGFonts:diagrams-core,

-- for head.hackage
primitive-unlifted:base
primitive-unlifted:base,

allow-older:
primitive-extras:primitive-unlifted
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should have been

if flag(fourmolu)

corrected in #2567 51db994

build-depends: hls-fourmolu-plugin ^>=1.0.0.0
cpp-options: -Dfourmolu

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down