Merge pull request #9 from noborus/without-space

Maximum width excluding spaces
noborus · Jul 14, 2024 · f34f2aa · f34f2aa
2 parents 06ec786 + 551b713
commit f34f2aa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/guesswidth.go b/guesswidth.go
@@ -98,7 +98,7 @@ func (g *GuessWidth) UpdateMaxWidth(columns []string) []Cols {
 	}
 
 	for n, col := range columns {
-		width := runewidth.StringWidth(col)
+		width := runewidth.StringWidth(strings.TrimSpace(col))
 		if width > g.Widths[n].Width {
 			g.Widths[n].Width = width
 		}

diff --git a/guesswidth_test.go b/guesswidth_test.go
@@ -41,8 +41,8 @@ func TestGuessWidth_ReadAll(t *testing.T) {
 			},
 			want2: []Cols{
 				{6, 1, 1},
-				{9, 0, 0},
-				{9, 1, 3},
+				{5, 0, 0},
+				{8, 1, 3},
 				{3, 0, 0},
 			},
 		},
@@ -63,16 +63,16 @@ noborus   721971  0.0  0.0  13716  3524 pts/3    R+   10:39   0:00 ps aux`)),
 				{"noborus  ", " 721971", "  0.0", "  0.0", "  13716", "  3524", " pts/3   ", " R+  ", " 10:39  ", " 0:00", "ps aux"},
 			},
 			want2: []Cols{
-				{9, 0, 0},
-				{7, 1, 4},
-				{5, 1, 4},
-				{5, 1, 4},
-				{11, 1, 4},
-				{7, 1, 4},
-				{9, 0, 0},
-				{5, 0, 1},
-				{8, 0, 0},
-				{5, 1, 4},
+				{7, 0, 0},
+				{6, 1, 4},
+				{4, 1, 4},
+				{4, 1, 4},
+				{10, 1, 4},
+				{6, 1, 4},
+				{5, 0, 0},
+				{4, 0, 1},
+				{5, 0, 0},
+				{4, 1, 4},
 				{25, 0, 0},
 			},
 		},
@@ -93,7 +93,7 @@ noborus   721971  0.0  0.0  13716  3524 pts/3    R+   10:39   0:00 ps aux`)),
 			},
 			want2: []Cols{
 				{6, 1, 1},
-				{9, 0, 0},
+				{5, 0, 0},
 				{12, 1, 1},
 			},
 		},