Support `fourmolu ^>= 0.7` #2944

parsonsmatt · 2022-06-08T16:08:41Z

This PR adds support for fourmolu-0.7

parsonsmatt · 2022-06-08T16:09:21Z

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

+homepage:           https://github.com/haskell/haskell-language-server
+bug-reports:        https://github.com/haskell/haskell-language-server/issues


It took me a minute to figure out the Git repository for this package, so I added these fields to the .cabal file. Technically an unrelated change, would be easy to put somewhere else.

parsonsmatt · 2022-06-08T16:12:17Z

plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs

@@ -1,9 +1,10 @@
+{-# LANGUAGE CPP                      #-}


This is used to provide backwards compatibility.

parsonsmatt · 2022-06-08T16:12:53Z

plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs

@@ -1,9 +1,10 @@
+{-# LANGUAGE CPP                      #-}
+{-# LANGUAGE DataKinds                #-}


This extension is reshuffled because I ran stylish-haskell (which appears to be how this file is formatted) and it automatically did that change.

Same for the reordered imports below.

So stylish-haskell isn't enforced by CI? If not, I'd be tempted to go back to fourmolu.

This file was formatted with stylish-haskell when it looked like that was becoming necessary (#693, #1439). But I lost track of where the decision on formatting this codebase ended up.

We have a pre-commit hook that runs stylish-haskell, mentioned in the contributing guidelines. But it is not enforced by CI:

haskell-language-server/docs/contributing/contributing.md

Lines 171 to 214 in 7431cea

### Formatter pre-commit hook

We are using [pre-commit-hook.nix](https://github.com/cachix/pre-commit-hooks.nix) to configure git pre-commit hook for formatting. Although it is possible to run formatting manually, we recommend you to use it to set pre-commit hook as our CI checks pre-commit hook is applied or not.

You can configure the pre-commit-hook by running

``` bash

nix-shell

```

If you don't want to use [nix](https://nixos.org/guides/install-nix.html), you can instead use [pre-commit](https://pre-commit.com) with the following config.

```json

{

"repos": [

{

"hooks": [

{

"entry": "stylish-haskell --inplace",

"exclude": "(^Setup.hs$|test/testdata/.*$|test/data/.*$|test/manual/lhs/.*$|^hie-compat/.*$|^plugins/hls-tactics-plugin/.*$|^ghcide/src/Development/IDE/GHC/Compat.hs$|^ghcide/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs$|^ghcide/src/Development/IDE/GHC/Compat/Core.hs$|^ghcide/src/Development/IDE/Spans/Pragmas.hs$|^ghcide/src/Development/IDE/LSP/Outline.hs$|^plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs$|^ghcide/test/exe/Main.hs$|ghcide/src/Development/IDE/Core/Rules.hs|^hls-test-utils/src/Test/Hls/Util.hs$)",

"files": "\\.l?hs$",

"id": "stylish-haskell",

"language": "system",

"name": "stylish-haskell",

"pass_filenames": true,

"types": [

"file"

]

}

],

"repo": "local"

},

{

"repo": "https://github.com/pre-commit/pre-commit-hooks",

"rev": "v4.1.0",

"hooks": [

{

"id": "mixed-line-ending",

"args": ["--fix", "lf"],

"exclude": "test/testdata/.*CRLF*.hs$"

}

]

}

]

parsonsmatt · 2022-06-08T16:13:25Z

plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs

 import           Ide.Types
 import           Language.LSP.Server             hiding (defaultConfig)
 import           Language.LSP.Types
 import           Language.LSP.Types.Lens         (HasTabSize (tabSize))
 import           Ormolu
+import           Ormolu.Config


This is redundant for fourmolu <= 0.7. I didn't gate it behind CPP because CPP is ugly.

georgefst

Commit history is a bit weird, but this otherwise looks good!

georgefst · 2022-06-08T23:28:29Z

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

 library
  exposed-modules:  Ide.Plugin.Fourmolu
  hs-source-dirs:   src
  ghc-options:      -Wall
  build-depends:
    , base            >=4.12 && <5
    , filepath
-    , fourmolu        ^>=0.3 || ^>=0.4 || ^>= 0.6
+    , fourmolu        ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7


This is in the wrong commit, right? Not necessarily actually worth changing now.

I am regrettably a complete git noob and generally just squash+merge all my stuff 😅

Ha, I'm very much in the "git is a wonderful concept with a horrible CLI" camp. Since I finally got around to setting up good editor integration, I haven't looked back.

georgefst · 2022-06-08T23:39:14Z

plugins/hls-fourmolu-plugin/src/Ide/Plugin/Fourmolu.hs

@@ -1,9 +1,10 @@
+{-# LANGUAGE CPP                      #-}
+{-# LANGUAGE DataKinds                #-}


So stylish-haskell isn't enforced by CI? If not, I'd be tempted to go back to fourmolu.

This file was formatted with stylish-haskell when it looked like that was becoming necessary (#693, #1439). But I lost track of where the decision on formatting this codebase ended up.

georgefst · 2022-06-08T23:39:42Z

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

@@ -29,7 +29,8 @@ library
  build-depends:
    , base            >=4.12 && <5
    , filepath
-    , fourmolu        ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7
+    -- , fourmolu        ^>=0.3 || ^>=0.4 || ^>= 0.6 || ^>= 0.7


Eugh, I take it we still can't drop support for old versions due to stylish-haskell: #2254 (comment)?

(if we could, we could obviously remove all the CPP)

stylish-haskell has been updated since #2254 and I think it's very likely that this can be removed. Do you want to check in a follow-up PR?

See #2950.

CI failed because we have a longer support window than I thought. So the commit was force-pushed away from that branch. See #2951 instead.

July541 · 2022-06-12T02:27:52Z

I checked the test detail and found all tests are run for fourmolu 0.3.0.0-0.6.0.0 :(

Some of these have genuine bugs, as discussed in #2254 (comment). We also get to drop a load of CPP introduced in #2944. Users can still use older versions via CLI mode. This wasn't possible until recently because `stylish-haskell`'s `ghc-lib-parser` bounds were holding us back.

georgefst · 2022-06-12T14:14:14Z

I checked the test detail and found all tests are run for fourmolu 0.3.0.0-0.6.0.0 :(

Yep, #2950 fixes the test, and optimistically drops support for old versions (lets see if that passes CI...).

Some of these have genuine bugs, as discussed in #2254 (comment). We also get to drop a load of CPP introduced in #2944. Users can still use older versions via CLI mode. This wasn't possible until recently because `stylish-haskell`'s `ghc-lib-parser` bounds were holding us back.

parsonsmatt added 3 commits June 8, 2022 08:43

Add metadata to cabal file

f40d1c6

Support fourmolu 0.7

c968e54

ok

abf8535

parsonsmatt requested a review from georgefst as a code owner June 8, 2022 16:08

stylish haskell

1f14e74

parsonsmatt commented Jun 8, 2022

View reviewed changes

parsonsmatt mentioned this pull request Jun 8, 2022

Rollup edits MercuryTechnologies/haskell-language-server#1

Closed

georgefst approved these changes Jun 8, 2022

View reviewed changes

July541 mentioned this pull request Jun 11, 2022

Support ghc-9.2.3 #2936

Merged

pepeiborra merged commit bb6b4e1 into haskell:master Jun 11, 2022

hololeap pushed a commit to hololeap/haskell-language-server that referenced this pull request Aug 26, 2022

Support fourmolu ^>= 0.7 (haskell#2944)

6fb929d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support `fourmolu ^>= 0.7` #2944

Support `fourmolu ^>= 0.7` #2944

parsonsmatt commented Jun 8, 2022 •

edited by gitpod-io bot

Loading

parsonsmatt Jun 8, 2022

parsonsmatt Jun 8, 2022

parsonsmatt Jun 8, 2022

georgefst Jun 8, 2022

pepeiborra Jun 10, 2022

parsonsmatt Jun 8, 2022

georgefst left a comment

georgefst Jun 8, 2022

parsonsmatt Jun 9, 2022

georgefst Jun 12, 2022

georgefst Jun 8, 2022

georgefst Jun 8, 2022

pepeiborra Jun 10, 2022

georgefst Jun 12, 2022

georgefst Jun 13, 2022 •

edited

Loading

July541 commented Jun 12, 2022

georgefst commented Jun 12, 2022

		homepage: https://github.com/haskell/haskell-language-server
		bug-reports: https://github.com/haskell/haskell-language-server/issues

		@@ -1,9 +1,10 @@
		{-# LANGUAGE CPP #-}
		{-# LANGUAGE DataKinds #-}

	### Formatter pre-commit hook

	We are using [pre-commit-hook.nix](https://github.com/cachix/pre-commit-hooks.nix) to configure git pre-commit hook for formatting. Although it is possible to run formatting manually, we recommend you to use it to set pre-commit hook as our CI checks pre-commit hook is applied or not.

	You can configure the pre-commit-hook by running

	``` bash
	nix-shell
	```

	If you don't want to use [nix](https://nixos.org/guides/install-nix.html), you can instead use [pre-commit](https://pre-commit.com) with the following config.

	```json
	{
	"repos": [
	{
	"hooks": [
	{
	"entry": "stylish-haskell --inplace",
	"exclude": "(^Setup.hs$\|test/testdata/.$\|test/data/.$\|test/manual/lhs/.$\|^hie-compat/.$\|^plugins/hls-tactics-plugin/.*$\|^ghcide/src/Development/IDE/GHC/Compat.hs$\|^ghcide/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs$\|^ghcide/src/Development/IDE/GHC/Compat/Core.hs$\|^ghcide/src/Development/IDE/Spans/Pragmas.hs$\|^ghcide/src/Development/IDE/LSP/Outline.hs$\|^plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs$\|^ghcide/test/exe/Main.hs$\|ghcide/src/Development/IDE/Core/Rules.hs\|^hls-test-utils/src/Test/Hls/Util.hs$)",
	"files": "\\.l?hs$",
	"id": "stylish-haskell",
	"language": "system",
	"name": "stylish-haskell",
	"pass_filenames": true,
	"types": [
	"file"
	]
	}
	],
	"repo": "local"
	},
	{
	"repo": "https://github.com/pre-commit/pre-commit-hooks",
	"rev": "v4.1.0",
	"hooks": [
	{
	"id": "mixed-line-ending",
	"args": ["--fix", "lf"],
	"exclude": "test/testdata/.CRLF.hs$"
	}
	]
	}
	]

Support fourmolu ^>= 0.7 #2944

Support fourmolu ^>= 0.7 #2944

Conversation

parsonsmatt commented Jun 8, 2022 • edited by gitpod-io bot Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

georgefst left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

georgefst Jun 13, 2022 • edited Loading

Choose a reason for hiding this comment

July541 commented Jun 12, 2022

georgefst commented Jun 12, 2022

Support `fourmolu ^>= 0.7` #2944

Support `fourmolu ^>= 0.7` #2944

parsonsmatt commented Jun 8, 2022 •

edited by gitpod-io bot

Loading

georgefst Jun 13, 2022 •

edited

Loading