diff: add color-words toggle with ctrl-x keybinding #5209
+72
−3
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
Enable users to toggle word-level diffs (git --color-words) from within the application without modifying config files. This provides a more granular view of changes for detailed code review by highlighting word-level modifications instead of full-line diffs. - add ColorWordsInDiffView config option to track state across sessions - add --color-words flag to all diff command builders (commit, diff, stash, working tree) - add Ctrl+X keybinding to toggle color-words mode - prevent toggling in staging contexts where word-level diffs are unsupported - show "(color words)" subtitle indicator when mode is active - add translations for keybinding, tooltip, subtitle, and error message Signed-off-by: Eric Wheeler <lazygit@z.ewheeler.org>
Collaborator
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description
Adds runtime toggle for word-level diffs using git's
--color-wordsflag. Complements existing whitespace toggle by providing finer-grained diff visualization.Example
The code in this example is out of context, but it shows how word-level diffing can be used to see what actually changed. This is a sample of what it looks like in lazy git when you apply the word level change and enable it:
Type of Change
Implementation Details
Mirrors whitespace toggle architecture:
git.colorWordsInDiffView(default: false)toggle_color_words_action.gowith context exclusions for staging/patch-building<c-x>registered inglobal_controller.go--color-wordsflag conditionally todiff,show, andstash showcommandsBoth flags can be enabled simultaneously in git commands without conflict.
Testing