Skip to content

Made diffprettytext replace invisibles with unicode characters #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Made diffprettytext replace invisibles with unicode characters #126

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
127b21c
Made diffprettytext replace invisibles with unicode characters
NickyBoy89 Sep 17, 2021
0137046
Only display whitespace in diff, if the diff is all whitespace
NickyBoy89 Feb 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions diffmatchpatch/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,13 +1149,30 @@ func (dmp *DiffMatchPatch) DiffPrettyText(diffs []Diff) string {
for _, diff := range diffs {
text := diff.Text

var containsCharacters bool
// If the diff only consists of whitespace characters, then pretty-print the whiteshace
for _, char := range text {
if char != ' ' && char != '\n' {
containsCharacters = true
break
}
}

switch diff.Type {
case DiffInsert:
_, _ = buff.WriteString("\x1b[32m")
if !containsCharacters {
text = strings.ReplaceAll(text, " ", "█")
text = strings.ReplaceAll(text, "\n", "⏎")
}
_, _ = buff.WriteString(text)
_, _ = buff.WriteString("\x1b[0m")
case DiffDelete:
_, _ = buff.WriteString("\x1b[31m")
if !containsCharacters {
text = strings.ReplaceAll(text, " ", "█")
text = strings.ReplaceAll(text, "\n", "⏎")
}
_, _ = buff.WriteString(text)
_, _ = buff.WriteString("\x1b[0m")
case DiffEqual:
Expand Down