diff options
| author | erw7 <erw7.github@gmail.com> | 2020-07-14 05:13:26 +0900 |
|---|---|---|
| committer | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2020-07-23 10:29:36 +0900 |
| commit | 6b521ceeaf7dd3ad3169355c1c106139291e82e8 (patch) | |
| tree | 2702bf6df750d8974dd27f3969a91b65dcaa4c9d | |
| parent | bfe94d0a0814eab5e9f9b6c6b06e770ba904da9f (diff) | |
| download | rneovim-6b521ceeaf7dd3ad3169355c1c106139291e82e8.tar.gz rneovim-6b521ceeaf7dd3ad3169355c1c106139291e82e8.tar.bz2 rneovim-6b521ceeaf7dd3ad3169355c1c106139291e82e8.zip | |
vim-patch:8.1.1712: signs in number column cause text to be misaligned
Problem: Signs in number column cause text to be misaligned.
Solution: Improve alignment. (Yasuhiro Matsumoto, closes vim/vim#4694)
https://github.com/vim/vim/commit/d6bcff457799e491c3d27880858ec08e758e1849
| -rw-r--r-- | src/nvim/screen.c | 9 | ||||
| -rw-r--r-- | src/nvim/testdir/test_signs.vim | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 92a34dfc42..fddcedf449 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -4518,8 +4518,13 @@ static void get_sign_display_info( *c_finalp = NUL; if (nrcol) { - snprintf((char *)extra, extra_size, "%-*s ", - number_width(wp), *pp_extra); + int n, width = number_width(wp) - 2; + for (n = 0; n < width; n++) { + extra[n] = ' '; + } + extra[n] = NUL; + STRCAT(extra, *pp_extra); + STRCAT(extra, " "); *pp_extra = extra; *n_extrap = (int)STRLEN(*pp_extra); } else { diff --git a/src/nvim/testdir/test_signs.vim b/src/nvim/testdir/test_signs.vim index 9d1146453a..48a885c0a1 100644 --- a/src/nvim/testdir/test_signs.vim +++ b/src/nvim/testdir/test_signs.vim @@ -1765,6 +1765,7 @@ func Test_sign_numcol() set signcolumn=number sign define sign1 text==> sign place 10 line=1 name=sign1 + sign define sign2 text=Ｖ redraw! call assert_equal("=> 01234", s:ScreenLine(1, 1, 8)) @@ -1844,6 +1845,12 @@ func Test_sign_numcol() redraw! call assert_equal("=> 01234", s:ScreenLine(1, 1, 8)) call assert_equal(" 2 abcde", s:ScreenLine(2, 1, 8)) + " Add sign with multi-byte text + set numberwidth=4 + sign place 40 line=2 name=sign2 + redraw! + call assert_equal(" => 01234", s:ScreenLine(1, 1, 9)) + call assert_equal(" Ｖ abcde", s:ScreenLine(2, 1, 9)) sign unplace * group=* sign undefine sign1 |