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

Merge pull request #18234 from zeertzjq/cursearch-reduce-redraw

Browse Source 
perf: only redraw for CurSearch when it is currently in use
This commit is contained in:
zeertzjq
2022-04-25 10:53:54 +08:00
committed by GitHub
parent 0648100fed 38ee2a41df
commit 89df042a89
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/move.c
View File

@@ -31,6 +31,7 @@
#include "nvim/plines.h" #include "nvim/plines.h"
#include "nvim/popupmnu.h" #include "nvim/popupmnu.h"
#include "nvim/screen.h" #include "nvim/screen.h"
#include "nvim/search.h"
#include "nvim/strings.h" #include "nvim/strings.h"
#include "nvim/window.h" #include "nvim/window.h"
@@ -95,30 +96,27 @@ static void comp_botline(win_T *wp)
win_check_anchored_floats(wp); win_check_anchored_floats(wp);
} }
/// Redraw when w_cline_row changes and 'relativenumber' or 'cursorline' is set /// Redraw when w_cline_row changes and 'relativenumber' or 'cursorline' is set.
/// or if the 'CurSearch' highlight is defined.
/// Also when concealing is on and 'concealcursor' is not active. /// Also when concealing is on and 'concealcursor' is not active.
void redraw_for_cursorline(win_T *wp) void redraw_for_cursorline(win_T *wp)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
if ((wp->w_valid & VALID_CROW) == 0 && !pum_visible() if ((wp->w_valid & VALID_CROW) == 0 && !pum_visible()
&& (wp->w_p_rnu || win_cursorline_standout(wp) && (wp->w_p_rnu || win_cursorline_standout(wp))) {
|| HL_ATTR(HLF_LC) || wp->w_hl_ids[HLF_LC])) { // win_line() will redraw the number column and cursorline only.
// win_line() will redraw the number column and cursorline only
// and also update the CurSearch highlight (if needed).
redraw_later(wp, VALID); redraw_later(wp, VALID);
} }
} }
/// Redraw when w_virtcol changes and 'cursorcolumn' is set or 'cursorlineopt' /// Redraw when w_virtcol changes and 'cursorcolumn' is set or 'cursorlineopt'
/// contains "screenline" or when the 'CurSearch' highlight is defined. /// contains "screenline" or when the 'CurSearch' highlight is in use.
/// Also when concealing is on and 'concealcursor' is active. /// Also when concealing is on and 'concealcursor' is active.
static void redraw_for_cursorcolumn(win_T *wp) static void redraw_for_cursorcolumn(win_T *wp)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
if ((wp->w_valid & VALID_VIRTCOL) == 0 && !pum_visible()) { if ((wp->w_valid & VALID_VIRTCOL) == 0 && !pum_visible()) {
if (wp->w_p_cuc || HL_ATTR(HLF_LC) || wp->w_hl_ids[HLF_LC]) { if (wp->w_p_cuc || ((HL_ATTR(HLF_LC) || wp->w_hl_ids[HLF_LC]) && using_hlsearch())) {
// When 'cursorcolumn' is set or 'CurSearch' is defined // When 'cursorcolumn' is set or 'CurSearch' is in use
// need to redraw with SOME_VALID. // need to redraw with SOME_VALID.
redraw_later(wp, SOME_VALID); redraw_later(wp, SOME_VALID);
} else if (wp->w_p_cul && (wp->w_p_culopt_flags & CULOPT_SCRLINE)) { } else if (wp->w_p_cul && (wp->w_p_culopt_flags & CULOPT_SCRLINE)) {

6
src/nvim/search.c
View File

@@ -6017,3 +6017,9 @@ bool search_was_last_used(void)
{ {
return last_idx == 0; return last_idx == 0;
} }
/// @return true if 'hlsearch' highlight is currently in use.
bool using_hlsearch(void)
{
return spats[last_idx].pat != NULL && p_hls && !no_hlsearch;
}