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

fix(fold): dont highlight search results on folded lines (#13616)

Browse Source 
Behavior may change in future but for now stick to legacy behavior.
This commit is contained in:
Matthieu Coudron
2020-12-29 01:19:24 +01:00
committed by GitHub
parent 93762072d1
commit b0215afc84
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/screen.c
View File

@@ -2013,6 +2013,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
// end-of-line // end-of-line
int lcs_eol_one = wp->w_p_lcs_chars.eol; // 'eol' until it's been used int lcs_eol_one = wp->w_p_lcs_chars.eol; // 'eol' until it's been used
int lcs_prec_todo = wp->w_p_lcs_chars.prec; // 'prec' until it's been used int lcs_prec_todo = wp->w_p_lcs_chars.prec; // 'prec' until it's been used
bool has_fold = foldinfo.fi_level != 0 && foldinfo.fi_lines >= 0;
// saved "extra" items for when draw_state becomes WL_LINE (again) // saved "extra" items for when draw_state becomes WL_LINE (again)
int saved_n_extra = 0; int saved_n_extra = 0;
@@ -2196,7 +2197,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
} }
if (wp->w_p_spell if (wp->w_p_spell
&& foldinfo.fi_lines == 0 && !has_fold
&& *wp->w_s->b_p_spl != NUL && *wp->w_s->b_p_spl != NUL
&& !GA_EMPTY(&wp->w_s->b_langp) && !GA_EMPTY(&wp->w_s->b_langp)
&& *(char **)(wp->w_s->b_langp.ga_data) != NULL) { && *(char **)(wp->w_s->b_langp.ga_data) != NULL) {
@@ -2299,6 +2300,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
// handle 'incsearch' and ":s///c" highlighting // handle 'incsearch' and ":s///c" highlighting
} else if (highlight_match } else if (highlight_match
&& wp == curwin && wp == curwin
&& !has_fold
&& lnum >= curwin->w_cursor.lnum && lnum >= curwin->w_cursor.lnum
&& lnum <= curwin->w_cursor.lnum + search_match_lines) { && lnum <= curwin->w_cursor.lnum + search_match_lines) {
if (lnum == curwin->w_cursor.lnum) { if (lnum == curwin->w_cursor.lnum) {
@@ -2551,7 +2553,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
cur = wp->w_match_head; cur = wp->w_match_head;
shl_flag = false; shl_flag = false;
while ((cur != NULL || !shl_flag) && !number_only while ((cur != NULL || !shl_flag) && !number_only
&& foldinfo.fi_lines == 0 && !has_fold
) { ) {
if (!shl_flag) { if (!shl_flag) {
shl = &search_hl; shl = &search_hl;

16
test/functional/ui/searchhl_spec.lua
View File

@@ -21,6 +21,7 @@ describe('search highlighting', function()
[3] = {reverse = true}, [3] = {reverse = true},
[4] = {foreground = colors.Red}, -- Message [4] = {foreground = colors.Red}, -- Message
[5] = {bold = true, reverse = true}, [5] = {bold = true, reverse = true},
[6] = {foreground = Screen.colors.Blue4, background = Screen.colors.LightGrey}, -- Folded
}) })
end) end)
@@ -39,6 +40,21 @@ describe('search highlighting', function()
]]) ]])
end) end)
it('is disabled in folded text', function()
insert("some text\nmore text")
feed_command('1,2fold')
feed("gg/text")
screen:expect([[
{6:+-- 2 lines: some text·················}|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
/text^ |
]])
end)
it('works', function() it('works', function()
insert([[ insert([[
some text some text