Add git_diff behavior #118
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
|
Cleanup the WIP, with clean code, extended documentation and descriptive commit. |
jreybert
force-pushed
the
git_diff
branch
3 times, most recently
from
7144b53 to
fdcbd03
Compare
rhysd
requested changes
Nov 11, 2021
rhysd
requested changes
Nov 11, 2021
jreybert
force-pushed
the
git_diff
branch
3 times, most recently
from
16291ae to
e591d20
Compare
|
Hi @rhysd , thanks for your complete report. I think I addressed all of your comments. Do you have other concerns about this PR? |
rhysd
requested changes
Nov 17, 2021
|
Thanks for all your comments, my vimscript is actually a bit rusty. I think I answered all your comments, feel free if you have any other requirements. |
rhysd
approved these changes
Nov 25, 2021
When you edit a file tracked in git, it may happend that some tracked lines are not well formatted. If you modify this file, and you auto_format the file, lines with bad indentation will be formatted too. You will be end up with unrelated changes in your commit. It may even appear that these 'bad formatted lines' were indented like this with a purpose. To mitigate this issue, this commit proposes to only format diff'ed lines in a file. It roughly relies on git diff, and on clang-format '-lines' option. clang_format#format function has been modified to accept a list of ranges. It adds three new user options: - g:clang_format#auto_format_git_diff to enable this new behavior - g:clang_format#auto_format_git_diff_fallback to decide what to do in case of untracked file - g:clang_format#git to define non standard git path or options
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.
Hello,
I am deploying the use of clang format in my team, and I am doing some experiments to use this tool, especially in editors.
Your addon is really great, but format the whole file could easily lead to unrelated diffs in some commits. Your option InsertLeave is actually ingenous, but depending on user movement it still could lead to large part of file reformating.
An easy way would be to integrate or mimic the tool clang-format-diff, and only format git diff chunks in the edited file.
This PR is still a work in progress, especially around the git integration and the possible options (for example, what to do in case of untracked file, fallback to whole file format or not). And no tests have been wrtten for the moment.
But I think it fits right in your system.
What do you think about this feature?