From e07f2df8d08150be192b8ca7e023f33edc611926 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 3 Apr 2023 11:07:51 +0530 Subject: [PATCH] Fix rendering of file added/removed lines --- kittens/diff/render.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kittens/diff/render.go b/kittens/diff/render.go index 055310a3e..ff6239ba7 100644 --- a/kittens/diff/render.go +++ b/kittens/diff/render.go @@ -650,15 +650,19 @@ func all_lines(path string, columns, margin_size int, is_add bool, ans []*Logica sl := ScreenLine{} if is_add { sl.right = hl - if i < len(msg_lines) { + if len(msg_lines) > 0 { sl.left.marked_up_text = msg_lines[i] + sl.left.is_filler = true + msg_lines = msg_lines[1:] } else { sl.left.is_filler = true } } else { sl.left = hl - if i < len(msg_lines) { + if len(msg_lines) > 0 { sl.right.marked_up_text = msg_lines[i] + sl.right.is_filler = true + msg_lines = msg_lines[1:] } else { sl.right.is_filler = true }