fixup! Bump gocui

jesseduffield · Jan 6, 2025 · fe816c7 · fe816c7
1 parent 6f2984e
commit fe816c7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/pkg/integration/tests/patch_building/move_to_index_part_of_adjacent_added_lines.go b/pkg/integration/tests/patch_building/move_to_index_part_of_adjacent_added_lines.go
@@ -64,6 +64,6 @@ var MoveToIndexPartOfAdjacentAddedLines = NewIntegrationTest(NewIntegrationTestA
 			)
 
 		t.Views().Main().
-			Content(Contains("+1st line\n 2nd line\n"))
+			Content(Contains("+1st line\n 2nd line"))
 	},
 })
diff --git a/pkg/integration/tests/stash/stash_staged_partial_file.go b/pkg/integration/tests/stash/stash_staged_partial_file.go
@@ -23,12 +23,12 @@ var StashStagedPartialFile = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.Views().Staging().
 			Content(
-				Contains(" line1\n-line2\n+line2 mod\n line3\n-line4\n+line4 mod\n"),
+				Contains(" line1\n-line2\n+line2 mod\n line3\n-line4\n+line4 mod"),
 			).
 			PressPrimaryAction().
 			PressPrimaryAction().
 			Content(
-				Contains(" line1\n line2 mod\n line3\n-line4\n+line4 mod\n"),
+				Contains(" line1\n line2 mod\n line3\n-line4\n+line4 mod"),
 			).
 			PressEscape()
 
@@ -54,7 +54,7 @@ var StashStagedPartialFile = NewIntegrationTest(NewIntegrationTestArgs{
 			)
 		t.Views().Main().
 			Content(
-				Contains(" line1\n-line2\n+line2 mod\n line3\n line4\n"),
+				Contains(" line1\n-line2\n+line2 mod\n line3\n line4"),
 			)
 
 		t.Views().Files().
@@ -64,7 +64,7 @@ var StashStagedPartialFile = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.Views().Staging().
 			Content(
-				Contains(" line1\n line2\n line3\n-line4\n+line4 mod\n"),
+				Contains(" line1\n line2\n line3\n-line4\n+line4 mod"),
 			)
 	},
 })
diff --git a/pkg/utils/lines.go b/pkg/utils/lines.go
@@ -110,6 +110,7 @@ func ScanLinesAndTruncateWhenLongerThanBuffer(maxBufferSize int) func(data []byt
 // If wrap is false, the text is returned as is.
 // This code needs to behave the same as `gocui.lineWrap` does.
 func WrapViewLinesToWidth(wrap bool, text string, width int) ([]string, []int, []int) {
+	text = strings.TrimSuffix(text, "\n")
 	lines := strings.Split(text, "\n")
 	if !wrap {
 		indices := make([]int, len(lines))

diff --git a/pkg/utils/lines_test.go b/pkg/utils/lines_test.go
@@ -374,10 +374,9 @@ func TestWrapViewLinesToWidth(t *testing.T) {
 				"longer.",
 				"Third",
 				"paragraph",
-				"",
 			},
-			expectedWrappedLinesIndices:  []int{0, 2, 6, 8},
-			expectedOriginalLinesIndices: []int{0, 0, 1, 1, 1, 1, 2, 2, 3},
+			expectedWrappedLinesIndices:  []int{0, 2, 6},
+			expectedOriginalLinesIndices: []int{0, 0, 1, 1, 1, 1, 2, 2},
 		},
 	}
 	for _, tt := range tests {