-
Notifications
You must be signed in to change notification settings - Fork 44
Format code with fourmolu #2382
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
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If we decide to adopt fourmolu, we should remove the separation between "groups" in our import lists, so we can take advantage of automatically managing imports. |
ttuegel
commented
Feb 1, 2021
ttuegel
commented
Feb 1, 2021
ttuegel
commented
Feb 1, 2021
ttuegel
commented
Feb 1, 2021
ttuegel
commented
Feb 2, 2021
ttuegel
commented
Feb 2, 2021
aaef26b
to
5730e66
Compare
bf1cec4
to
000f13d
Compare
When this is merged, here is how to resolve conflicts with your pull request branch. git switch master
git pull upstream # Replace 'upstream' with however you call kframework/kore.
git log # Find the commit hash of this pull request after it is merged; it is called '$commit' below.
git switch pr-branch # Replace 'pr-branch' with the name of your branch.
git merge $commit~1
# Resolve conflicts in the usual way.
git merge $commit # The only conflicts will be due to formatting.
./scripts/resolve-conflicts.sh pr-branch
git commit
# There may still be some conflicts due to files that were deleted.
# Resolve these conflicts the normal way.
git push # Push changes to GitHub. They will be reformatted automatically. |
# Conflicts: # kore/src/Kore/Builtin.hs # kore/src/Kore/Builtin/AssociativeCommutative.hs # kore/src/Kore/Builtin/Builtin.hs # kore/src/Kore/Builtin/External.hs # kore/src/Kore/Builtin/Int.hs # kore/src/Kore/Builtin/InternalBytes.hs # kore/src/Kore/Builtin/KEqual.hs # kore/src/Kore/Builtin/Krypto.hs # kore/src/Kore/Builtin/Map.hs # kore/src/Kore/Builtin/Set.hs # kore/src/Kore/Builtin/String.hs # kore/src/Kore/Equation/Application.hs # kore/src/Kore/Internal/SideCondition.hs # kore/src/Kore/Internal/Substitution.hs # kore/src/Kore/Internal/TermLike.hs # kore/src/Kore/Internal/TermLike/TermLike.hs # kore/src/Kore/Reachability/Claim.hs # kore/src/Kore/Step/Axiom/Matcher.hs # kore/src/Kore/Step/SMT/Evaluator.hs # kore/src/Kore/Step/SMT/Lemma.hs # kore/src/Kore/Step/SMT/Translate.hs # kore/src/Kore/Step/Simplification/AndTerms.hs # kore/src/Kore/Step/Simplification/Ceil.hs # kore/src/Kore/Step/Simplification/Defined.hs # kore/src/Kore/Step/Simplification/Exists.hs # kore/src/Kore/Step/Simplification/Pattern.hs # kore/src/Kore/Step/Simplification/Simplify.hs # kore/src/Kore/Step/Simplification/TermLike.hs # kore/test/Test/ConsistentKore.hs # kore/test/Test/Kore/Builtin/AssociativeCommutative.hs # kore/test/Test/Kore/Builtin/Map.hs # kore/test/Test/Kore/Builtin/Set.hs # kore/test/Test/Kore/Internal/SideCondition.hs # kore/test/Test/Kore/Internal/TermLike.hs # kore/test/Test/Kore/Step/Axiom/Matcher.hs # kore/test/Test/Kore/Step/SMT/Evaluator.hs # kore/test/Test/Kore/Step/SMT/Symbols.hs # kore/test/Test/Kore/Step/SMT/Translate.hs # kore/test/Test/Kore/Step/Simplification/AndTerms.hs # kore/test/Test/Kore/Step/Simplification/Condition.hs # kore/test/Test/Kore/Step/Simplification/Integration.hs
andreiburdusa
approved these changes
Mar 17, 2021
emarzion
approved these changes
Mar 18, 2021
MirceaS
approved these changes
Mar 19, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request would apply formatting with Fourmolu automatically. This avoids problems with stylish-haskell and it removes the need for us to manually attend to the style guide. I think the advantages of perfectly-consistent formatting for readability and code review outweigh the disadvantage that the code will sometimes be formatted differently than we would have chosen ourselves.
Fixes #2415.
Review checklist
The author performs the actions on the checklist. The reviewer evaluates the work and checks the boxes as they are completed.