feat: wcwidth: tidy and add more tests

charmbracelet · Oct 21, 2024 · c527e24 · c527e24
1 parent 8140f28
commit c527e24
Showing 1 changed file with 37 additions and 32 deletions.
diff --git a/wcwidth/wcwidth_test.go b/wcwidth/wcwidth_test.go
@@ -31,39 +31,42 @@ func TestStringWidth(t *testing.T) {
 }
 
 var runewidthtests = []struct {
-	in     rune
-	out    int
-	eaout  int
-	nseout int
+	in  rune
+	out int
 }{
-	{'世', 2, 2, 2},
-	{'界', 2, 2, 2},
-	{'ｾ', 1, 1, 1},
-	{'ｶ', 1, 1, 1},
-	{'ｲ', 1, 1, 1},
-	{'☆', 1, 2, 2}, // double width in ambiguous
-	{'☺', 1, 1, 2},
-	{'☻', 1, 1, 2},
-	{'♥', 1, 2, 2},
-	{'♦', 1, 1, 2},
-	{'♣', 1, 2, 2},
-	{'♠', 1, 2, 2},
-	{'♂', 1, 2, 2},
-	{'♀', 1, 2, 2},
-	{'♪', 1, 2, 2},
-	{'♫', 1, 1, 2},
-	{'☼', 1, 1, 2},
-	{'↕', 1, 2, 2},
-	{'‼', 1, 1, 2},
-	{'↔', 1, 2, 2},
-	{'\x00', 0, 0, 0},
-	{'\x01', 0, 0, 0},
-	{'\u0300', 0, 0, 0},
-	{'\u2028', 0, 0, 0},
-	{'\u2029', 0, 0, 0},
-	{'a', 1, 1, 1}, // ASCII classified as "na" (narrow)
-	{'⟦', 1, 1, 1}, // non-ASCII classified as "na" (narrow)
-	{'👁', 1, 1, 2},
+	{'世', 2},
+	{'界', 2},
+	{'ｾ', 1},
+	{'ｶ', 1},
+	{'ｲ', 1},
+	{'☆', 1}, // double width in ambiguous
+	{'☺', 1},
+	{'☻', 1},
+	{'♥', 1},
+	{'♦', 1},
+	{'♣', 1},
+	{'♠', 1},
+	{'♂', 1},
+	{'♀', 1},
+	{'♪', 1},
+	{'♫', 1},
+	{'☼', 1},
+	{'↕', 1},
+	{'‼', 1},
+	{'↔', 1},
+	{'\x00', 0},
+	{'\x01', 0},
+	{'\u0300', 0},
+	{'\u2028', 0},
+	{'\u2029', 0},
+	{'a', 1}, // ASCII classified as "na" (narrow)
+	{'⟦', 1}, // non-ASCII classified as "na" (narrow)
+	{'👁', 1},
+	{'\u0301', 0}, // Combining acute accent
+	{'a', 1},
+	{'Ω', 1},
+	{'好', 2},
+	{'か', 2},
 }
 
 func BenchmarkRuneWidth(b *testing.B) {
@@ -95,6 +98,8 @@ func TestZeroWidthJoiner(t *testing.T) {
 		{"あ👩\u200d🍳い", 8},
 		{"あ\u200d🍳い", 6},
 		{"あ\u200dい", 4},
+		{"abc", 3},
+		{"你好", 4},
 	}
 
 	for _, tt := range tests {