mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.1992: the search stat moves when wrapping at the end of the buffer

Browse Source 
Problem:    The search stat moves when wrapping at the end of the buffer.
Solution:   Put the "W" in front instead of at the end.
16b58ae9f3
This commit is contained in:
Jan Edmund Lazo
2020-09-29 19:45:32 -04:00
parent a307489a79
commit 83ebe0c998
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/search.c
View File

@@ -4359,7 +4359,9 @@ static void search_stat(int dirc, pos_T *pos,
len = STRLEN(t);
if (show_top_bot_msg && len + 2 < SEARCH_STAT_BUF_LEN) {
STRCPY(t + len, " W");
memmove(t + 2, t, len);
t[0] = 'W';
t[1] = ' ';
len += 2;
}

10
src/nvim/testdir/test_search_stat.vim
View File

@@ -43,7 +43,7 @@ func Test_search_stat()
call assert_match(pat .. stat, g:a)
call cursor(line('$'), 1)
let g:a = execute(':unsilent :norm! n')
let stat = '\[1/>99\] W'
let stat = 'W \[1/>99\]'
call assert_match(pat .. stat, g:a)
" Many matches
@@ -53,7 +53,7 @@ func Test_search_stat()
call assert_match(pat .. stat, g:a)
call cursor(1, 1)
let g:a = execute(':unsilent :norm! N')
let stat = '\[>99/>99\] W'
let stat = 'W \[>99/>99\]'
call assert_match(pat .. stat, g:a)
" right-left
@@ -85,7 +85,7 @@ func Test_search_stat()
call cursor('$',1)
let pat = 'raboof/\s\+'
let g:a = execute(':unsilent :norm! n')
let stat = '\[20/1\]'
let stat = 'W \[20/1\]'
call assert_match(pat .. stat, g:a)
call assert_match('search hit BOTTOM, continuing at TOP', g:a)
set norl
@@ -96,10 +96,10 @@ func Test_search_stat()
let @/ = 'foobar'
let pat = '?foobar\s\+'
let g:a = execute(':unsilent :norm! N')
let stat = '\[20/20\]'
let stat = 'W \[20/20\]'
call assert_match(pat .. stat, g:a)
call assert_match('search hit TOP, continuing at BOTTOM', g:a)
call assert_match('\[20/20\] W', Screenline(&lines))
call assert_match('W \[20/20\]', Screenline(&lines))
" normal, no match
call cursor(1,1)

2
test/functional/ui/messages_spec.lua
View File

@@ -323,7 +323,7 @@ describe('ui/ext_messages', function()
{1:~ }|
{1:~ }|
]], messages={
{content = {{"/line [1/2] W"}}, kind = "search_count"}
{content = {{"/line W [1/2]"}}, kind = "search_count"}
}}
feed('n')