Merge pull request #4291 from greatroar/widechars

ui/termstatus: Optimize Truncate

internal/ui/termstatus/status.go

@@ -303,26 +303,35 @@ func Truncate(s string, w int) string {
 		return s
 	}
 
-	for i, r := range s {
+	for i := uint(0); i < uint(len(s)); {
+		utfsize := uint(1) // UTF-8 encoding size of first rune in s.
 		w--
-		if r > unicode.MaxASCII && wideRune(r) {
+
-			w--
+		if s[i] > unicode.MaxASCII {
+			var wide bool
+			if wide, utfsize = wideRune(s[i:]); wide {
+				w--
+			}
 		}
 
 		if w < 0 {
 			return s[:i]
 		}
+		i += utfsize
 	}
 
 	return s
 }
 
-// Guess whether r would occupy two terminal cells instead of one.
+// Guess whether the first rune in s would occupy two terminal cells
-// This cannot be determined exactly without knowing the terminal font,
+// instead of one. This cannot be determined exactly without knowing
-// so we treat all ambigous runes as full-width, i.e., two cells.
+// the terminal font, so we treat all ambigous runes as full-width,
-func wideRune(r rune) bool {
+// i.e., two cells.
-	kind := width.LookupRune(r).Kind()
+func wideRune(s string) (wide bool, utfsize uint) {
-	return kind != width.Neutral && kind != width.EastAsianNarrow
+	prop, size := width.LookupString(s)
+	kind := prop.Kind()
+	wide = kind != width.Neutral && kind != width.EastAsianNarrow
+	return wide, uint(size)
 }
 
 // SetStatus updates the status lines.

internal/ui/termstatus/status_test.go

@@ -79,11 +79,15 @@ func BenchmarkTruncateASCII(b *testing.B) {
 func BenchmarkTruncateUnicode(b *testing.B) {
 	s := "Hello World or Καλημέρα κόσμε or こんにちは 世界"
 	w := 0
-	for _, r := range s {
+	for i := 0; i < len(s); {
 		w++
-		if wideRune(r) {
+		wide, utfsize := wideRune(s[i:])
+		if wide {
 			w++
 		}
+		i += int(utfsize)
 	}
+	b.ResetTimer()
+
 	benchmarkTruncate(b, s, w-1)
 }