From 95f5e75458eb471ef7cba3c0b5a39000284e2823 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Fri, 11 Jul 2025 17:25:33 -0300 Subject: [PATCH] ci: fix diffview tests on ci on windows --- internal/tui/exp/diffview/diffview.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/tui/exp/diffview/diffview.go b/internal/tui/exp/diffview/diffview.go index bb51a7e505666e67fd9e914a135a0dd7632bb184..1cb56a678f51d0809c584edc1bedd73befc59966 100644 --- a/internal/tui/exp/diffview/diffview.go +++ b/internal/tui/exp/diffview/diffview.go @@ -365,7 +365,8 @@ func (dv *DiffView) renderUnified() string { shouldWrite := func() bool { return printedLines >= 0 } getContent := func(in string, ls LineStyle) (content string, leadingEllipsis bool) { - content = strings.TrimSuffix(in, "\n") + content = strings.ReplaceAll(in, "\r\n", "\n") + content = strings.TrimSuffix(content, "\n") content = dv.hightlightCode(content, ls.Code.GetBackground()) content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content)) content = ansi.Truncate(content, dv.codeWidth, "…") @@ -488,7 +489,8 @@ func (dv *DiffView) renderSplit() string { shouldWrite := func() bool { return printedLines >= 0 } getContent := func(in string, ls LineStyle) (content string, leadingEllipsis bool) { - content = strings.TrimSuffix(in, "\n") + content = strings.ReplaceAll(in, "\r\n", "\n") + content = strings.TrimSuffix(content, "\n") content = dv.hightlightCode(content, ls.Code.GetBackground()) content = ansi.GraphemeWidth.Cut(content, dv.xOffset, len(content)) content = ansi.Truncate(content, dv.codeWidth, "…")