Implement --mergetool mode #283
Merged
Conversation
This file contains 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
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/formatting-team-meeting-2025-02-18/60511/1 |
infinisil
force-pushed
the
mergetool-hs
branch
from
6a2c935 to
ac278e7
Compare
|
This is now done, please review :) |
piegamesde
reviewed
Feb 24, 2025
main/Main.hs
Outdated
| mergeToolJob :: Nixfmt -> IO Result | ||
| mergeToolJob opts@Nixfmt{files = [base, local, remote, merged]} = runExceptT $ do | ||
| let formatter = toFormatter opts | ||
| joinEithers :: [Either String ()] -> Either String () |
There was a problem hiding this comment.
Why Either String () and not Maybe String?
There was a problem hiding this comment.
It's the return type of formatTarget, I guess using the typealias Result would make in clearer. Edit: Done that
Makes resolving formatting-related conflicts easier. Idea and docs are from @oxij's #277. Code and tests are from @infinisil. By implementing it in Haskell, it's faster (less process spawning) and trivially integrated into build and distribution. Co-Authored-By: Jan Malakhovski <oxij@oxij.org>
infinisil
force-pushed
the
mergetool-hs
branch
from
ac278e7 to
8439892
Compare
piegamesde
approved these changes
Mar 3, 2025
This was referenced Mar 4, 2025
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.
Inspired by @oxij's #277, but implemented in Haskell, therefore faster (less process spawning) and trivially integrated into the build and distribution.
Things done:
This work is funded by Antithesis and Tweag ✨