commit f1387285e2ebe5cb3688d729fc6fd01a169a76c1
author Bram Moolenaar <Bram@vim.org> Mon Mar 22 17:11:15 2021 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Mar 22 17:11:15 2021 +0100
tree 3adfa05958b52b53b2b69e325be4a677955c77f1
parent 5ea79a2599d35f75e1ae8a75d2711c754c4cb7c4

patch 8.2.2640: screenstring() returns non-existing composing characters

Problem:    screenstring() returns non-existing composing characters.
Solution:   Only use composing characters if there is a base character.

src/testdir/test_listchars.vim

diff --git a/src/testdir/test_listchars.vim b/src/testdir/test_listchars.vim
index 172407a..9aca080 100644
--- a/src/testdir/test_listchars.vim
+++ b/src/testdir/test_listchars.vim
@@ -146,7 +146,7 @@
   set list
   " Non-breaking space
   let nbsp = nr2char(0xa0)
-  call append(0, [ ">".nbsp."<" ])
+  call append(0, [ ">" .. nbsp .. "<" ])
 
   let expected = '>X< '
 
@@ -193,12 +193,8 @@
   set list
 
   let nbsp = nr2char(0xa0)
-  call append(0, [
-        \ "a\tb c".nbsp."d"
-        \ ])
-  let expected = [
-        \ 'a←↔↔↔↔↔→b␣c≠d⇔'
-        \ ]
+  call append(0, ["a\tb c" .. nbsp .. "d"])
+  let expected = ['a←↔↔↔↔↔→b␣c≠d⇔']
   redraw!
   call cursor(1, 1)
   call assert_equal(expected, ScreenLines(1, virtcol('$')))
@@ -221,10 +217,10 @@
   let nbsp1 = nr2char(0xa0)
   let nbsp2 = nr2char(0x202f)
   call append(0, [
-        \ "  \u3099\t \u309A".nbsp1.nbsp1."\u0302".nbsp2.nbsp2."\u0302",
+        \ "  \u3099\t \u309A" .. nbsp1 .. nbsp1 .. "\u0302" .. nbsp2 .. nbsp2 .. "\u0302",
         \ ])
   let expected = [
-        \ "_ \u3099^I \u309A=".nbsp1."\u0302=".nbsp2."\u0302$"
+        \ "_ \u3099^I \u309A=" .. nbsp1 .. "\u0302=" .. nbsp2 .. "\u0302$"
         \ ]
   redraw!
   call cursor(1, 1)