IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.1110: composing chars on space wrong when 'listchars' is set

Browse Source 
Problem:    Composing chars on space wrong when 'listchars' is set.
Solution:   Do not use "space" and "nbsp" entries of 'listchars' when there is
            a composing character.  (Yee Cheng Chin, closes vim/vim#4197)
e5e4e22c1c
This commit is contained in:
zeertzjq 2021-09-19 13:13:44 +08:00
parent c14dc616bf
commit 59e80c4dfc
2 changed files with 60 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/nvim/screen.c
View File

@ -3580,29 +3580,31 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool noc
} }
} }
// 'list': change char 160 to 'nbsp' and space to 'space'. // 'list': Change char 160 to 'nbsp' and space to 'space'.
if (wp->w_p_list) { // But not when the character is followed by a composing
if ((c == 160 || (mb_utf8 && (mb_c == 160 || mb_c == 0x202f))) // character (use mb_l to check that).
&& wp->w_p_lcs_chars.nbsp) { if (wp->w_p_list
c = wp->w_p_lcs_chars.nbsp; && ((((c == 160 && mb_l == 1)
mb_c = c; || (mb_utf8
if (utf_char2len(c) > 1) { && ((mb_c == 160 && mb_l == 2)
mb_utf8 = true; || (mb_c == 0x202f && mb_l == 3))))
u8cc[0] = 0; && wp->w_p_lcs_chars.nbsp)
c = 0xc0; || (c == ' '
} else { && mb_l == 1
mb_utf8 = false; && wp->w_p_lcs_chars.space
} && ptr - line >= leadcol
} else if (c == ' ' && ptr - line <= trailcol))) {
&& wp->w_p_lcs_chars.space c = (c == ' ') ? wp->w_p_lcs_chars.space : wp->w_p_lcs_chars.nbsp;
&& ptr - line >= leadcol n_attr = 1;
&& ptr - line <= trailcol) { extra_attr = win_hl_attr(wp, HLF_0);
c = wp->w_p_lcs_chars.space; saved_attr2 = char_attr; // save current attr
if (mb_utf8 == false) { mb_c = c;
n_attr = 1; if (utf_char2len(c) > 1) {
extra_attr = win_hl_attr(wp, HLF_0); mb_utf8 = true;
saved_attr2 = char_attr; // save current attr u8cc[0] = 0;
} c = 0xc0;
} else {
mb_utf8 = false;
} }
} }

41
src/nvim/testdir/test_listchars.vim
View File

@ -182,6 +182,33 @@ func Test_listchars()
set listchars& ff& set listchars& ff&
endfunc endfunc
" Test that unicode listchars characters get properly inserted
func Test_listchars_unicode()
enew!
let oldencoding=&encoding
set encoding=utf-8
set ff=unix
set listchars=eol:⇔,space:␣,nbsp:≠,tab:←↔→
set list
let nbsp = nr2char(0xa0)
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('$')))
let &encoding=oldencoding
enew!
set listchars& ff&
endfunction
" Tests that space characters following composing character won't get replaced
" by listchars.
func Test_listchars_composing() func Test_listchars_composing()
enew! enew!
let oldencoding=&encoding let oldencoding=&encoding
@ -189,18 +216,20 @@ func Test_listchars_composing()
set ff=unix set ff=unix
set list set list
set listchars=eol:$,space:_ set listchars=eol:$,space:_,nbsp:=
let nbsp1 = nr2char(0xa0)
let nbsp2 = nr2char(0x202f)
call append(0, [ call append(0, [
\ " \u3099 \u309A" \ " \u3099\t \u309A".nbsp1.nbsp1."\u0302".nbsp2.nbsp2."\u0302",
\ ]) \ ])
let expected = [ let expected = [
\ "_ \u3099^I \u309A$" \ "_ \u3099^I \u309A=".nbsp1."\u0302=".nbsp2."\u0302$"
\ ] \ ]
redraw! redraw!
call cursor(1, 1) call cursor(1, 1)
let got = ScreenLinesUtf8(1, virtcol('$')) call assert_equal(expected, ScreenLines(1, virtcol('$')))
bw!
call assert_equal(expected, got)
let &encoding=oldencoding let &encoding=oldencoding
enew!
set listchars& ff& set listchars& ff&
endfunction endfunction