aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-07 10:17:28 -05:00
Code Activity

patch 9.0.1691: wrong viewport restored for incsearch and smoothscroll

Browse Source 
Problem: wrong viewport restored for incsearch and smoothscroll
Solution: Save and restore skipcol as well

closes: #12713

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
This commit is contained in:
zeertzjq
2023-08-11 23:48:27 +02:00
committed by Christian Brabandt
parent f6cdab3704
commit 7b7b4cb6f2
5 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ex_getln.c
View File

@@ -122,6 +122,7 @@ empty_pattern_magic(char_u *p, size_t len, magic_T magic_val)
typedef struct { typedef struct {
colnr_T vs_curswant; colnr_T vs_curswant;
colnr_T vs_leftcol; colnr_T vs_leftcol;
colnr_T vs_skipcol;
linenr_T vs_topline; linenr_T vs_topline;
# ifdef FEAT_DIFF # ifdef FEAT_DIFF
int vs_topfill; int vs_topfill;
@@ -135,6 +136,7 @@ save_viewstate(viewstate_T *vs)
{ {
vs->vs_curswant = curwin->w_curswant; vs->vs_curswant = curwin->w_curswant;
vs->vs_leftcol = curwin->w_leftcol; vs->vs_leftcol = curwin->w_leftcol;
vs->vs_skipcol = curwin->w_skipcol;
vs->vs_topline = curwin->w_topline; vs->vs_topline = curwin->w_topline;
# ifdef FEAT_DIFF # ifdef FEAT_DIFF
vs->vs_topfill = curwin->w_topfill; vs->vs_topfill = curwin->w_topfill;
@@ -148,6 +150,7 @@ restore_viewstate(viewstate_T *vs)
{ {
curwin->w_curswant = vs->vs_curswant; curwin->w_curswant = vs->vs_curswant;
curwin->w_leftcol = vs->vs_leftcol; curwin->w_leftcol = vs->vs_leftcol;
curwin->w_skipcol = vs->vs_skipcol;
curwin->w_topline = vs->vs_topline; curwin->w_topline = vs->vs_topline;
# ifdef FEAT_DIFF # ifdef FEAT_DIFF
curwin->w_topfill = vs->vs_topfill; curwin->w_topfill = vs->vs_topfill;

6
src/testdir/dumps/Test_incsearch_restore_view_01.dump Normal file
View File

@@ -0,0 +1,6 @@
|<+0#4040ff13#ffffff0@2| +0#0000000&|1|8| |1|9| |2|0| |2|1| |2@1| |2
>3| |2|4| @15
@20
@20
@20
@10|1|,|6|1| @1|T|o|p|

6
src/testdir/dumps/Test_incsearch_restore_view_02.dump Normal file
View File

@@ -0,0 +1,6 @@
| +0&#ffffff0@19
@20
@20
@20
|x+1&&@2| +0&&@16
|/|x@2> @15

22
src/testdir/test_search.vim
View File

@@ -2080,6 +2080,28 @@ func Test_incsearch_substitute_dump2()
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
endfunc endfunc
func Test_incsearch_restore_view()
CheckOption incsearch
CheckScreendump
let lines =<< trim [CODE]
set incsearch nohlsearch
setlocal scrolloff=0 smoothscroll
call setline(1, [join(range(25), ' '), '', '', '', '', 'xxx'])
call feedkeys("2\<C-E>", 't')
[CODE]
call writefile(lines, 'Xincsearch_restore_view', 'D')
let buf = RunVimInTerminal('-S Xincsearch_restore_view', {'rows': 6, 'cols': 20})
call VerifyScreenDump(buf, 'Test_incsearch_restore_view_01', {})
call term_sendkeys(buf, '/xxx')
call VerifyScreenDump(buf, 'Test_incsearch_restore_view_02', {})
call term_sendkeys(buf, "\<Esc>")
call VerifyScreenDump(buf, 'Test_incsearch_restore_view_01', {})
call StopVimInTerminal(buf)
endfunc
func Test_pattern_is_uppercase_smartcase() func Test_pattern_is_uppercase_smartcase()
new new
let input=['abc', 'ABC', 'Abc', 'abC'] let input=['abc', 'ABC', 'Abc', 'abC']

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1691,
/**/ /**/
1690, 1690,
/**/ /**/