mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-23 11:38:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3580: gj does not move properly with a wide character

Browse Source 
Problem:    gj does not move properly with a wide character.
Solution:   Move one to the right. (Christian Brabandt, closes vim/vim#8702)
aaec1d4fb1
This commit is contained in:
zeertzjq
2021-12-27 11:49:22 +08:00
parent fcf5dd34fd
commit 176df92bd7
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/normal.c
View File

@@ -3281,7 +3281,7 @@ static bool nv_screengo(oparg_T *oap, int dir, long dist)
int col_off1; // margin offset for first screen line int col_off1; // margin offset for first screen line
int col_off2; // margin offset for wrapped screen line int col_off2; // margin offset for wrapped screen line
int width1; // text width for first screen line int width1; // text width for first screen line
int width2; // test width for wrapped screen line int width2; // text width for wrapped screen line
oap->motion_type = kMTCharWise; oap->motion_type = kMTCharWise;
oap->inclusive = (curwin->w_curswant == MAXCOL); oap->inclusive = (curwin->w_curswant == MAXCOL);
@@ -3405,6 +3405,13 @@ static bool nv_screengo(oparg_T *oap, int dir, long dist)
virtcol -= vim_strsize(get_showbreak_value(curwin)); virtcol -= vim_strsize(get_showbreak_value(curwin));
} }
int c = utf_ptr2char(get_cursor_pos_ptr());
if (dir == FORWARD && virtcol < curwin->w_curswant
&& (curwin->w_curswant <= (colnr_T)width1)
&& !vim_isprintc(c) && c > 255) {
oneright();
}
if (virtcol > curwin->w_curswant if (virtcol > curwin->w_curswant
&& (curwin->w_curswant < (colnr_T)width1 && (curwin->w_curswant < (colnr_T)width1
? (curwin->w_curswant > (colnr_T)width1 / 2) ? (curwin->w_curswant > (colnr_T)width1 / 2)

12
src/nvim/testdir/test_normal.vim
View File

@@ -2759,4 +2759,16 @@ func Test_normal_count_after_operator()
bw! bw!
endfunc endfunc
func Test_normal_gj_on_extra_wide_char()
new | 25vsp
let text='1 foooooooo ar e ins‍zwe1 foooooooo ins‍zwei' .
\ ' i drei vier fünf sechs sieben acht un zehn elf zwöfl' .
\ ' dreizehn v ierzehn fünfzehn'
put =text
call cursor(2,1)
norm! gj
call assert_equal([0,2,25,0], getpos('.'))
bw!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab