Skip to content
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.

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

update Floskell to 0.11.* #3933

Merged

Conversation

peterbecich
Copy link
Member

@peterbecich peterbecich commented Jan 6, 2024

Closes: #3927

hls-floskell-plugin updated to floskell 0.11.* . The reason is that floskell 0.11.* supports aeson 2.2.* : https://hackage.haskell.org/package/floskell-0.11.0

There is a small change required in plugins/hls-floskell-plugin/src/Ide/Plugin/Floskell.hs. The easy change breaks compatibility with floskell 0.10. So I have bumped the version of hls-floskell-plugin from 2.5.0.0 to 2.5.1.0.

haskell-language-server 2.5.0.0 is pinned to hls-floskell-plugin 2.5.0.0 exactly. This PR changes the bound on hls-floskell-plugin to 2.5.*.

  • This could be a revision to haskell-language-server 2.5.0.0
  • or a fix version, haskell-language-server 2.5.0.1.
    • I believe haskell-language-server 2.5.0.1 is compatible with both:
      • hls-floskell-plugin 2.5.0.0 and floskell 0.10.*
        • first test
      • hls-floskell-plugin 2.5.1.0 and floskell 0.11.*
        • second test

What do you think?

I suppose this PR should target the tag 2.5.0.0 https://github.com/haskell/haskell-language-server/tree/2.5.0.0 instead of master


First test
git reset to master. Apply only the change to haskell-language-server.cabal. Build haskell-language-server 2.5.0.1 and all other packages.

This builds successfully:

cabal build --constraint 'floskell == 0.10.*' --enable-tests

Second test
In this PR, this builds successfully:

cabal build --constraint 'floskell == 0.11.*' --enable-tests

These tests were run in the nix develop shell.

Copy link
Collaborator

@fendor fendor left a comment

Choose a reason for hiding this comment

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

LGTM, just dont do the the version bumps :)

version: 2.5.0.0
version: 2.5.0.1
Copy link
Collaborator

@fendor fendor Jan 6, 2024

Choose a reason for hiding this comment

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

HLS and all its plugins use lockstep versioning. Thus, all versions get universally bumped on release and you shouldn't bump versions in PRs, as this throws off our automation.
Just keep it at 2.5.0.0 :)

version: 2.5.0.0
version: 2.5.1.0
Copy link
Collaborator

Choose a reason for hiding this comment

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

Just keep it as 2.5.0.0 :)

@michaelpj
Copy link
Collaborator

The stack.yamls need to be adjusted to pull in the newer floskell.

Please also add yourself to CODEOWNERS, thanks!

@peterbecich peterbecich force-pushed the update-hls-floskell-plugin-dependency branch from 674bc86 to 24d64da Compare January 6, 2024 19:50
@peterbecich
Copy link
Member Author

peterbecich commented Jan 6, 2024

Thanks @fendor and @michaelpj

Can we squash and cherry-pick this onto https://github.com/haskell/haskell-language-server/tree/2.5.0.0 and release a revision of haskell-language-server 2.5.0.0? Or will it wait until 2.6.0.0 to go out?


stack.yaml build succeeds

stack build hls-floskell-plugin

Looking at lts-21 now

stack build --stack-yaml stack-lts21.yaml hls-floskell-plugin

@michaelpj
Copy link
Collaborator

We're not generally doing backports, so it'll just be in the next release. That will probably be soon, since there's a GHC release coming.

@peterbecich peterbecich force-pushed the update-hls-floskell-plugin-dependency branch from fec0f54 to b81e2ff Compare January 6, 2024 20:19
@peterbecich
Copy link
Member Author

this succeeds:

stack build --stack-yaml stack-lts21.yaml 

Copy link
Collaborator

@michaelpj michaelpj left a comment

Choose a reason for hiding this comment

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

Great stuff, thanks!

@michaelpj michaelpj merged commit 92d3ba9 into haskell:master Jan 6, 2024
40 checks passed
@peterbecich peterbecich deleted the update-hls-floskell-plugin-dependency branch January 6, 2024 22:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

request for floskell 11 support in hls-floskell-plugin
3 participants