cli: underline added/removed lines only in color-words diffs #3974
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
We don't want e.g. `jj diff --git` to have underlined text because it's redundant there. This patch fixes that by adding a new `token` label used only in the color-words diff (for now - it may be used in git diffs in the future). This means we could remove the `line_number` label but I left it because there's little harm in having it and it seems like it can still be useful. Thanks to @yuja for noticing and suggesting the fix.
4 tasks
ilyagr
approved these changes
Jun 26, 2024
There was a problem hiding this comment.
Seems fine to me.
I still think a test would be nice, but it seems like it might show up in another PR.
+1 on keeping "line-number"; I think that would have made the tests in #3914 somewhat more readable.
I wish I could think of a better name than "token", but it's fine if we can't. Perhaps text or content? I'm unsure; we can always change it later if we think of something or once it has more uses.
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.
Checklist
If applicable:
CHANGELOG.md