neovim

commit bcf077414cf6f1a5701d68f848320008d6d89919
parent 4a3594f60e854db56589f30cec4fc16c8a46fe30
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri,  3 Mar 2023 07:44:11 +0800

vim-patch:9.0.1373: wrong text displayed when using both 'linebreak' and 'list'

Problem:    Wrong text displayed when using both 'linebreak' and 'list'.
Solution:   Only set "c_extra" to NUL when "p_extra" is not empty. (Hirohito
            Higashi, closes vim/vim#12065)

https://github.com/vim/vim/commit/194555c001f2b8576483ef34511450b6e9b5e3fd

Cherry-pick a change from patch 9.0.0153.

Co-authored-by: h-east <h.east.727@gmail.com>

Diffstat:
M
src/nvim/drawline.c
 | 
5
+----
M
src/nvim/testdir/test_listlbr.vim
 | 
24
++++++++++++++++++++++++

2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c
@@ -1691,12 +1691,9 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange, 
     } else if (foldinfo.fi_lines > 0) {
       // skip writing the buffer line itself
       c = NUL;
-      XFREE_CLEAR(p_extra_free);
     } else {
       int c0;
 
-      XFREE_CLEAR(p_extra_free);
-
       // Get a character from the line itself.
       c0 = c = (uint8_t)(*ptr);
       mb_c = c;
@@ -2170,7 +2167,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange, 
             c = (n_extra == 0 && wp->w_p_lcs_chars.tab3)
                  ? wp->w_p_lcs_chars.tab3
                  : wp->w_p_lcs_chars.tab1;
-            if (wp->w_p_lbr && p_extra != NULL) {
+            if (wp->w_p_lbr && p_extra != NULL && *p_extra != NUL) {
               c_extra = NUL;  // using p_extra from above
             } else {
               c_extra = wp->w_p_lcs_chars.tab2;
diff --git a/src/nvim/testdir/test_listlbr.vim b/src/nvim/testdir/test_listlbr.vim
@@ -73,6 +73,30 @@ func Test_linebreak_with_nolist()
   call s:close_windows()
 endfunc
 
+func Test_linebreak_with_list_and_number()
+  call s:test_windows('setl list listchars+=tab:>-')
+  call setline(1, ["abcdefg\thijklmnopqrstu", "v"])
+  let lines = s:screen_lines([1, 4], winwidth(0))
+  let expect_nonumber = [
+\ "abcdefg>------------",
+\ "hijklmnopqrstu$     ",
+\ "v$                  ",
+\ "~                   ",
+\ ]
+  call s:compare_lines(expect_nonumber, lines)
+
+  setl number
+  let lines = s:screen_lines([1, 4], winwidth(0))
+  let expect_number = [
+\ "  1 abcdefg>--------",
+\ "    hijklmnopqrstu$ ",
+\ "  2 v$              ",
+\ "~                   ",
+\ ]
+  call s:compare_lines(expect_number, lines)
+  call s:close_windows()
+endfunc
+
 func Test_should_break()
   call s:test_windows('setl sbr=+ nolist')
   call setline(1, "1\t" . repeat('a', winwidth(0)-2))