@@ -1428,16 +1428,20 @@ private const val ELLIPSIZE_MAX_CHARS = 500
 
 private fun ellipsize(value: String, paint: Paint, width: Float): String {
   val truncated = value.length > ELLIPSIZE_MAX_CHARS
-  val text = if (truncated) value.substring(0, surrogateSafeEnd(value, ELLIPSIZE_MAX_CHARS)) else value
+  val capEnd = surrogateSafeEnd(value, ELLIPSIZE_MAX_CHARS)
+  val text = if (truncated) value.substring(0, capEnd) else value
   if (!truncated && paint.measureText(text) <= width) return value
   val suffix = "..."
   val available = max(0f, width - paint.measureText(suffix))
   val end = surrogateSafeEnd(text, paint.breakText(text, true, available, null))
   return text.substring(0, end) + suffix
 }
 
-private fun surrogateSafeEnd(value: String, end: Int): Int =
-  if (end in 1 until value.length && Character.isSurrogatePair(value[end - 1], value[end])) end - 1 else end
+private fun surrogateSafeEnd(value: String, end: Int): Int {
+  val splitsPair = end in 1 until value.length &&
+    Character.isSurrogatePair(value[end - 1], value[end])
+  return if (splitsPair) end - 1 else end
+}
 
 private fun indexFileHeaders(rows: List<DiffRow>): IntArray {
   val headers = ArrayList<Int>()