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

Tell Fourmolu about Foreword operator fixities #1305

Merged
merged 2 commits into from
Nov 27, 2024

Conversation

georgefst
Copy link
Contributor

Basically reverts #1158. I wasn't really actively involved with Fourmolu at the time that Ormolu overhauled its operator handling, or else I would have noticed that the huge diff in that PR was due to an awkward interaction between that new feature and custom preludes (the release notes could have drawn attention to this, and I intend to improve the documentation myself when I get a chance).

@dhess
Copy link
Member

dhess commented Nov 27, 2024

Can you please add style: to the head of each of these commit messages? This helps us keep track of which commits are pure style and can be ignored when chasing bugs or looking for places where functionality changed.

@dhess dhess self-requested a review November 27, 2024 20:54
Copy link
Member

@dhess dhess left a comment

Choose a reason for hiding this comment

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

Personally, I like the leading $ as opposed to the ragged approach, but it's not conventional, so this is fine.

Please change the commit messages to match our conventional commits style, though, and then we're good to merge.

@georgefst georgefst force-pushed the georgefst/fourmolu-foreword-operators branch from 2895656 to 2a0c3ea Compare November 27, 2024 21:02
@georgefst
Copy link
Contributor Author

Ah yes, I'd forgotten about Conventional Commits after not working on this project for a while. My contributions to #1304 have the same problem...

This basically reverts f016a8a.

These changes have been manually reviewed, and some alterations made regarding line breaks, in order to return to the state before that commit, and to improve the formatting of some newer code. For example, see `&& length vs1 == length vs2` in `primer/src/Primer/Core/Utils.hs`.

Signed-off-by: George Thomas <[email protected]>
@georgefst georgefst force-pushed the georgefst/fourmolu-foreword-operators branch from 2a0c3ea to 4353938 Compare November 27, 2024 21:03
@dhess dhess enabled auto-merge November 27, 2024 21:06
@dhess dhess added this pull request to the merge queue Nov 27, 2024
Merged via the queue into main with commit 40054b6 Nov 27, 2024
76 checks passed
@dhess dhess deleted the georgefst/fourmolu-foreword-operators branch November 27, 2024 21:58
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.

2 participants