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

Remove more workarounds for GHCs < 9.0 #4092

Merged
merged 19 commits into from
Feb 27, 2024

Conversation

jhrcek
Copy link
Collaborator

@jhrcek jhrcek commented Feb 24, 2024

No description provided.

@jhrcek
Copy link
Collaborator Author

jhrcek commented Feb 25, 2024

There is more cleanup that can be done w.r.t unsupported ghc versions (e.g. ghcVersion >= GHC92 will also be always True with the versions we support) but I'm going to open separate PR for that to keep things more focused and easy to review.

@jhrcek jhrcek marked this pull request as ready for review February 25, 2024 07:46
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, thanks!

@@ -306,8 +306,7 @@ defToLocation (InR (InR Null)) = []

-- | Ghc 9 doesn't include the $-sign in TH warnings like earlier versions did
thDollarIdx :: UInt
thDollarIdx | ghcVersion >= GHC90 = 1
| otherwise = 0
thDollarIdx = 1
Copy link
Collaborator

Choose a reason for hiding this comment

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

inline?

@michaelpj michaelpj enabled auto-merge (squash) February 25, 2024 14:41
@jhrcek jhrcek marked this pull request as draft February 26, 2024 05:22
auto-merge was automatically disabled February 26, 2024 05:22

Pull request was converted to draft

@jhrcek jhrcek force-pushed the jhrcek/remove-ghc-pre-0.9-workarounds branch from a4650ab to 03c2dcd Compare February 26, 2024 15:44
@jhrcek jhrcek marked this pull request as ready for review February 26, 2024 16:56
@jhrcek jhrcek requested a review from drsooch as a code owner February 26, 2024 16:56
@@ -9,23 +9,29 @@ main = defaultTestRunner $ testGroup "haskell-language-server-wrapper" [projectG

projectGhcVersionTests :: TestTree
projectGhcVersionTests = testGroup "--project-ghc-version"
[ stackTest "9.2.8"
[ testCase "stack with global ghc" $ do
ghcVer <- ghcNumericVersion
Copy link
Collaborator

Choose a reason for hiding this comment

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

nice

@michaelpj michaelpj enabled auto-merge (squash) February 27, 2024 15:51
@michaelpj michaelpj merged commit 50923e5 into haskell:master Feb 27, 2024
39 checks passed
jhrcek added a commit to jhrcek/haskell-language-server that referenced this pull request Feb 27, 2024
michaelpj pushed a commit that referenced this pull request Feb 28, 2024
* Remove more workarounds for GHCs < 9.2 (#4092)

* Delete removed module from cabal file

* Remove unused package
@jhrcek jhrcek deleted the jhrcek/remove-ghc-pre-0.9-workarounds branch March 2, 2024 16:22
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.

3 participants