From 567bb36edfb4a184cca69808024b3519620bc508 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 22 Jul 2022 06:55:35 +0800
Subject: [PATCH] fix(grid): don't use utfc_ptr2char_len() when printing until
 NUL

---
 src/nvim/screen.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index c6fd9e5dff..0a0c827855 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -5853,16 +5853,12 @@ void grid_puts_len(ScreenGrid *grid, char_u *text, int textlen, int row, int col
          && *ptr != NUL) {
     c = *ptr;
     // check if this is the first byte of a multibyte
-    if (len > 0) {
-      mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr));
-    } else {
-      mbyte_blen = utfc_ptr2len(ptr);
-    }
-    if (len >= 0) {
-      u8c = utfc_ptr2char_len(ptr, u8cc, (int)((text + len) - ptr));
-    } else {
-      u8c = utfc_ptr2char(ptr, u8cc);
-    }
+    mbyte_blen = len > 0
+      ? utfc_ptr2len_len(ptr, (int)((text + len) - ptr))
+      : utfc_ptr2len(ptr);
+    u8c = len >= 0
+      ? utfc_ptr2char_len(ptr, u8cc, (int)((text + len) - ptr))
+      : utfc_ptr2char(ptr, u8cc);
     mbyte_cells = utf_char2cells(u8c);
     if (p_arshape && !p_tbidi && arabic_char(u8c)) {
       // Do Arabic shaping.
@@ -5871,8 +5867,9 @@ void grid_puts_len(ScreenGrid *grid, char_u *text, int textlen, int row, int col
         nc = NUL;
         nc1 = NUL;
       } else {
-        nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc,
-                               (int)((text + len) - ptr - mbyte_blen));
+        nc = len >= 0
+          ? utfc_ptr2char_len(ptr + mbyte_blen, pcc, (int)((text + len) - ptr - mbyte_blen))
+          : utfc_ptr2char(ptr + mbyte_blen, pcc);
         nc1 = pcc[0];
       }
       pc = prev_c;