KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reset styles after half lines

Browse Source
This commit is contained in:
Kovid Goyal 2023-03-23 10:16:54 +05:30
parent 91eaa89b3e
commit f8c83519fe
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/cmd/diff/render.go
View File

@ -44,6 +44,10 @@ func (self *LogicalLine) IncrementScrollPosBy(pos *ScrollPos, amt int) (delta in
return return
} }
func join_half_lines(left, right string) string {
return left + "\x1b[m" + right + "\x1b[m"
}
func fit_in(text string, count int) string { func fit_in(text string, count int) string {
truncated := wcswidth.TruncateToVisualLength(text, count) truncated := wcswidth.TruncateToVisualLength(text, count)
if len(truncated) >= len(text) { if len(truncated) >= len(text) {
@ -376,7 +380,7 @@ func lines_for_diff_chunk(data *DiffData, hunk_num int, chunk *Chunk, chunk_num
} }
logline := LogicalLine{line_type: CHANGE_LINE, src: Reference{path: ref_path, linenum: ref_ln}, is_change_start: i == 0} logline := LogicalLine{line_type: CHANGE_LINE, src: Reference{path: ref_path, linenum: ref_ln}, is_change_start: i == 0}
for l := 0; l < len(ll); l++ { for l := 0; l < len(ll); l++ {
logline.screen_lines = append(logline.screen_lines, ll[l]+rl[l]) logline.screen_lines = append(logline.screen_lines, join_half_lines(ll[l], rl[l]))
} }
ans = append(ans, &logline) ans = append(ans, &logline)
} }
@ -451,9 +455,9 @@ func all_lines(path string, columns, margin_size int, is_add bool, ans []*Logica
} }
var text string var text string
if is_add { if is_add {
text = empty + hl text = join_half_lines(empty, hl)
} else { } else {
text = hl + empty text = join_half_lines(hl, empty)
} }
l.screen_lines = append(l.screen_lines, text) l.screen_lines = append(l.screen_lines, text)
} }