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:9.1.0183: Wrong display or screenpos() result when toggling diff mode (#27882)

Browse Source 
Problem:  Wrong display or screenpos() result when toggling diff mode.
Solution: Reset w_skipcol when disabling 'wrap'.  Reset w_leftcol when
          enabling 'wrap' (zeertzjq).

fixes: vim/vim#14210
closes: vim/vim#14211

9e7f1fc2f1
This commit is contained in:
zeertzjq 2024-03-16 17:10:20 +08:00 committed by GitHub
parent ead3a1bd7a
commit c0daea3afd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 71 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/diff.c
View File

@ -1429,6 +1429,7 @@ void diff_win_options(win_T *wp, bool addbuf)
wp->w_p_wrap_save = wp->w_p_wrap;
}
wp->w_p_wrap = false;
wp->w_skipcol = 0;
}
if (!wp->w_p_diff) {
@ -1497,8 +1498,9 @@ void ex_diffoff(exarg_T *eap)
wp->w_p_crb = wp->w_p_crb_save;
}
if (!(diff_flags & DIFF_FOLLOWWRAP)) {
if (!wp->w_p_wrap) {
wp->w_p_wrap = wp->w_p_wrap_save;
if (!wp->w_p_wrap && wp->w_p_wrap_save) {
wp->w_p_wrap = true;
wp->w_leftcol = 0;
}
}
free_string_option(wp->w_p_fdm);

67
test/old/testdir/test_diffmode.vim
View File

@ -3,6 +3,7 @@
source shared.vim
source screendump.vim
source check.vim
source view_util.vim
func Test_diff_fold_sync()
enew!
@ -1702,4 +1703,70 @@ func Test_diff_put_and_undo()
endfunc
func Test_diff_toggle_wrap_skipcol_leftcol()
61vnew
call setline(1, 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.')
30vnew
call setline(1, 'ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.')
let win1 = win_getid()
setlocal smoothscroll
exe "normal! $\<C-E>"
wincmd l
let win2 = win_getid()
setlocal smoothscroll
exe "normal! $\<C-E>"
call assert_equal([
\ '<<<sadipscing elitr, sed diam |<<<tetur sadipscing elitr, sed|',
\ 'nonumy eirmod tempor invidunt | diam nonumy eirmod tempor inv|',
\ 'ut labore et dolore magna aliq|idunt ut labore et dolore magn|',
\ 'uyam erat, sed diam voluptua. |a aliquyam erat, sed diam volu|',
\ '~ |ptua. |',
\ ], ScreenLines([1, 5], 62))
call assert_equal({'col': 29, 'row': 4, 'endcol': 29, 'curscol': 29},
\ screenpos(win1, line('.', win1), col('.', win1)))
call assert_equal({'col': 36, 'row': 5, 'endcol': 36, 'curscol': 36},
\ screenpos(win2, line('.', win2), col('.', win2)))
wincmd h
diffthis
wincmd l
diffthis
normal! 0
call assert_equal([
\ ' ipsum dolor sit amet, conset| Lorem ipsum dolor sit amet, |',
\ '~ |~ |',
\ ], ScreenLines([1, 2], 62))
call assert_equal({'col': 3, 'row': 1, 'endcol': 3, 'curscol': 3},
\ screenpos(win1, line('.', win1), col('.', win1)))
call assert_equal({'col': 34, 'row': 1, 'endcol': 34, 'curscol': 34},
\ screenpos(win2, line('.', win2), col('.', win2)))
normal! $
call assert_equal([
\ ' voluptua. | diam voluptua. |',
\ '~ |~ |',
\ ], ScreenLines([1, 2], 62))
call assert_equal({'col': 11, 'row': 1, 'endcol': 11, 'curscol': 11},
\ screenpos(win1, line('.', win1), col('.', win1)))
call assert_equal({'col': 48, 'row': 1, 'endcol': 48, 'curscol': 48},
\ screenpos(win2, line('.', win2), col('.', win2)))
diffoff!
call assert_equal([
\ 'ipsum dolor sit amet, consetet|Lorem ipsum dolor sit amet, co|',
\ 'ur sadipscing elitr, sed diam |nsetetur sadipscing elitr, sed|',
\ 'nonumy eirmod tempor invidunt | diam nonumy eirmod tempor inv|',
\ 'ut labore et dolore magna aliq|idunt ut labore et dolore magn|',
\ 'uyam erat, sed diam voluptua. |a aliquyam erat, sed diam volu|',
\ '~ |ptua. |',
\ ], ScreenLines([1, 6], 62))
call assert_equal({'col': 29, 'row': 5, 'endcol': 29, 'curscol': 29},
\ screenpos(win1, line('.', win1), col('.', win1)))
call assert_equal({'col': 36, 'row': 6, 'endcol': 36, 'curscol': 36},
\ screenpos(win2, line('.', win2), col('.', win2)))
bwipe!
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab