mirror of
https://github.com/macvim-dev/macvim.git
synced 2026-06-11 15:37:29 +02:00
HarshK97
42c6686c78
Problem: When using 'diffopt=inline:word', lines were excessively
fragmented with punctuation creating separate highlight
blocks, making it harder to read the diffs.
Solution: Added 'diff_refine_inline_word_highlight()' to merge
adjacent diff blocks that are separated by small gaps of
non-word characters (up to 5 bytes by default) (HarshK97).
When using inline:word diff mode, adjacent changed words separated by
punctuation or whitespace are now merged into a single highlight block
if the gap between them contains fewer than 5 non-word characters.
This creates more readable diffs and closely matches GitHub's own diff
display.
closes: #19098
Signed-off-by: HarshK97 <harshkapse1234@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
21 lines
1.2 KiB
Plaintext
Generated
21 lines
1.2 KiB
Plaintext
Generated
| +0#0000e05#a8a8a8255@1|a+2#0000000#ff404010|b|c|d|e|f| |g|h|i| |j|k| +0&#ffd7ff255|n| @19||+1&#ffffff0| +0#0000e05#a8a8a8255@1|a+2#0000000#ff404010|B|c|e|f| |g|H|i| |l|m| +0&#ffd7ff255|n| @20
|
|
| +0#0000e05#a8a8a8255@1|x+0#0000000#5fd7ff255| @33||+1&#ffffff0| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34
|
|
| +0#0000e05#a8a8a8255@1|y+0#0000000#ffffff0| @33||+1&&| +0#0000e05#a8a8a8255@1|y+0#0000000#ffffff0| @33
|
|
| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|z+0#0000000#5fd7ff255| @33
|
|
|~+0#4040ff13#ffffff0| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|~| @35||+1#0000000&|~+0#4040ff13&| @35
|
|
|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1
|
|
|:+0&&> @73
|