mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.1.1511: matches in a popup window are not displayed properly
Problem: Matches in a popup window are not displayed properly. Solution: Do display matches in a popup window. (closes #4517)
This commit is contained in:
@@ -3957,12 +3957,11 @@ win_line(
|
|||||||
/*
|
/*
|
||||||
* Handle highlighting the last used search pattern and matches.
|
* Handle highlighting the last used search pattern and matches.
|
||||||
* Do this for both search_hl and the match list.
|
* Do this for both search_hl and the match list.
|
||||||
* Not in a popup window.
|
* Do not use search_hl in a popup window.
|
||||||
*/
|
*/
|
||||||
cur = wp->w_match_head;
|
cur = wp->w_match_head;
|
||||||
shl_flag = FALSE;
|
shl_flag = (screen_line_flags & SLF_POPUP);
|
||||||
while ((cur != NULL || shl_flag == FALSE) && !number_only
|
while ((cur != NULL || shl_flag == FALSE) && !number_only)
|
||||||
&& !(screen_line_flags & SLF_POPUP))
|
|
||||||
{
|
{
|
||||||
if (shl_flag == FALSE)
|
if (shl_flag == FALSE)
|
||||||
{
|
{
|
||||||
@@ -4438,7 +4437,7 @@ win_line(
|
|||||||
*/
|
*/
|
||||||
v = (long)(ptr - line);
|
v = (long)(ptr - line);
|
||||||
cur = wp->w_match_head;
|
cur = wp->w_match_head;
|
||||||
shl_flag = FALSE;
|
shl_flag = (screen_line_flags & SLF_POPUP);
|
||||||
while (cur != NULL || shl_flag == FALSE)
|
while (cur != NULL || shl_flag == FALSE)
|
||||||
{
|
{
|
||||||
if (shl_flag == FALSE
|
if (shl_flag == FALSE
|
||||||
|
10
src/testdir/dumps/Test_popupwin_matches.dump
Normal file
10
src/testdir/dumps/Test_popupwin_matches.dump
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
|1+0#ffffff16#e000002@2| +0#0000000#ffffff0|2@2| |3@2| @63
|
||||||
|
>4+0#ffffff16#e000002@2| +0#0000000#ffffff0|5@2| |6+0&#ffff4012@2| +0&#ffffff0@63
|
||||||
|
|~+0#4040ff13&| @7|╔+0#0000001#ffd7ff255|═@10|╗| +0#4040ff13#ffffff0@52
|
||||||
|
|~| @7|║+0#0000001#ffd7ff255|1+0#ffffff16#e000002@2| +0#0000001#ffd7ff255|2@2| |3@2|║| +0#4040ff13#ffffff0@52
|
||||||
|
|~| @7|║+0#0000001#ffd7ff255|4@2| |5+0#ffffff16#e000002@2| +0#0000001#ffd7ff255|6@2|║| +0#4040ff13#ffffff0@52
|
||||||
|
|~| @7|╚+0#0000001#ffd7ff255|═@10|╝| +0#4040ff13#ffffff0@52
|
||||||
|
|~| @73
|
||||||
|
|~| @73
|
||||||
|
|~| @73
|
||||||
|
| +0#0000000&@56|2|,|1| @10|A|l@1|
|
@@ -188,6 +188,32 @@ func Test_popup_with_syntax_setbufvar()
|
|||||||
call delete('XtestPopup')
|
call delete('XtestPopup')
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_popup_with_matches()
|
||||||
|
if !CanRunVimInTerminal()
|
||||||
|
throw 'Skipped: cannot make screendumps'
|
||||||
|
endif
|
||||||
|
let lines =<< trim END
|
||||||
|
call setline(1, ['111 222 333', '444 555 666'])
|
||||||
|
let winid = popup_create([
|
||||||
|
\ '111 222 333',
|
||||||
|
\ '444 555 666',
|
||||||
|
\], {'line': 3, 'col': 10, 'border': []})
|
||||||
|
set hlsearch
|
||||||
|
/666
|
||||||
|
call matchadd('ErrorMsg', '111')
|
||||||
|
call matchadd('ErrorMsg', '444')
|
||||||
|
call win_execute(winid, "call matchadd('ErrorMsg', '111')")
|
||||||
|
call win_execute(winid, "call matchadd('ErrorMsg', '555')")
|
||||||
|
END
|
||||||
|
call writefile(lines, 'XtestPopupMatches')
|
||||||
|
let buf = RunVimInTerminal('-S XtestPopupMatches', {'rows': 10})
|
||||||
|
call VerifyScreenDump(buf, 'Test_popupwin_matches', {})
|
||||||
|
|
||||||
|
" clean up
|
||||||
|
call StopVimInTerminal(buf)
|
||||||
|
call delete('XtestPopupMatches')
|
||||||
|
endfunc
|
||||||
|
|
||||||
func Test_popup_all_corners()
|
func Test_popup_all_corners()
|
||||||
if !CanRunVimInTerminal()
|
if !CanRunVimInTerminal()
|
||||||
throw 'Skipped: cannot make screendumps'
|
throw 'Skipped: cannot make screendumps'
|
||||||
|
@@ -777,6 +777,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 */
|
||||||
|
/**/
|
||||||
|
1511,
|
||||||
/**/
|
/**/
|
||||||
1510,
|
1510,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user