Merge pull request #1155 from VXNCXNX/fix/wordwrap-long-word-row

fix: a word longer than the screen advances the wrap row by one

Author: noborus

oviewer/convert_wordwrap.go

@@ -80,10 +80,12 @@ func (c *wordwrapConverter) convertWordWrap(src contents) contents {
 
 // processWord handles the placement of a word in the output.
 func (proc *wordWrapProcessor) processWord(srcWord contents) {
-	// Word is longer than screen width, add as-is and move to next line.
+	// Word is longer than screen width, add as-is and move to the row it ends on.
+	// The word can span several rows, so the row is recalculated from the output length
+	// instead of being incremented by one.
 	if len(srcWord) > proc.screenWidth {
 		proc.dst = append(proc.dst, srcWord...)
-		proc.row++
+		proc.row = (len(proc.dst) / proc.screenWidth) + 1
 		return
 	}
 

oviewer/convert_wordwrap_test.go

@@ -96,6 +96,20 @@ func TestConvertWordwrap(t *testing.T) {
 			tabWidth:    4,
 			wantStr:     "01234567890123456789",
 		},
+		{
+			name:        "long word spanning multiple rows followed by a word",
+			screenWidth: 5,
+			str:         "abcdefghijklmn op",
+			tabWidth:    4,
+			wantStr:     "abcdefghijklmn op",
+		},
+		{
+			name:        "long word spanning multiple rows then wrap to a new row",
+			screenWidth: 10,
+			str:         "aa bbbbbbbbbbbbbbbbbbbbbbbbb cc",
+			tabWidth:    4,
+			wantStr:     "aa bbbbbbbbbbbbbbbbbbbbbbbbb  cc",
+		},
 		{
 			name:        "escape sequence",
 			str:         "abc\x1b[31mdef\x1b[0mghi",