diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-11-24 18:37:52 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-11-24 18:52:27 +0800 |
| commit | 81c87857f632d1afe147e9b77a97da38f8f3a887 (patch) | |
| tree | b9fbaa4fbc0bc9f8b89249574ccc92da2ec97552 /src/nvim/drawline.c | |
| parent | 868d8d69627c4b8fd5225da0dff5905f75645946 (diff) | |
| download | rneovim-81c87857f632d1afe147e9b77a97da38f8f3a887.tar.gz rneovim-81c87857f632d1afe147e9b77a97da38f8f3a887.tar.bz2 rneovim-81c87857f632d1afe147e9b77a97da38f8f3a887.zip | |
vim-patch:8.2.3698: match highlighting continues over breakindent
Problem: Match highlighting continues over breakindent.
Solution: Stop before the end column. (closes vim/vim#9242)
https://github.com/vim/vim/commit/0c359af5c0fd106d3f57cc0bb7cef1c89b5e1e10
Cherry-pick Test_matchdelete_redraw() from patch 8.2.1077.
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src/nvim/drawline.c')
| -rw-r--r-- | src/nvim/drawline.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index 93f3ea569e..b926f2da83 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -618,6 +618,8 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange, LineDrawState draw_state = WL_START; // what to draw next + int match_conc = 0; ///< cchar for match functions + bool on_last_col = false; int syntax_flags = 0; int syntax_seqnr = 0; int prev_syntax_id = 0; @@ -627,7 +629,6 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange, ///< force wrapping int vcol_off = 0; ///< offset for concealed characters int did_wcol = false; - int match_conc = 0; ///< cchar for match functions int old_boguscols = 0; #define VCOL_HLC (vcol - vcol_off) #define FIX_FOR_BOGUSCOLS \ @@ -1429,8 +1430,8 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange, // When another match, have to check for start again. v = (ptr - line); search_attr = update_search_hl(wp, lnum, (colnr_T)v, &line, &screen_search_hl, - &has_match_conc, - &match_conc, lcs_eol_one, &search_attr_from_match); + &has_match_conc, &match_conc, lcs_eol_one, + &on_last_col, &search_attr_from_match); ptr = line + v; // "line" may have been changed // Do not allow a conceal over EOL otherwise EOL will be missed @@ -1843,6 +1844,11 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange, n_extra = 0; } } + if (on_last_col) { + // Do not continue search/match highlighting over the + // line break. + search_attr = 0; + } if (c == TAB && n_extra + col > grid->cols) { n_extra = tabstop_padding((colnr_T)vcol, wp->w_buffer->b_p_ts, |