diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/drawline.c | 26 | ||||
| -rw-r--r-- | src/nvim/highlight_group.c | 2 | ||||
| -rw-r--r-- | src/nvim/insexpand.c | 5 |
3 files changed, 19 insertions, 14 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index a1d03486ff..35a41f840d 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -955,7 +955,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s bool area_highlighting = false; // Visual or incsearch highlighting in this line int vi_attr = 0; // attributes for Visual and incsearch highlighting int area_attr = 0; // attributes desired by highlighting - int search_attr = 0; // attributes desired by 'hlsearch' + int search_attr = 0; // attributes desired by 'hlsearch' or ComplMatchIns int vcol_save_attr = 0; // saved attr for 'cursorcolumn' int decor_attr = 0; // attributes desired by syntax and extmarks bool has_syntax = false; // this buffer has syntax highl. @@ -969,7 +969,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s int spell_attr = 0; // attributes desired by spelling int word_end = 0; // last byte with same spell_attr int cur_checked_col = 0; // checked column for current line - bool extra_check = 0; // has syntax or linebreak + bool extra_check = false; // has extra highlighting int multi_attr = 0; // attributes desired by multibyte int mb_l = 1; // multi-byte byte length int mb_c = 0; // decoded multi-byte character @@ -1495,6 +1495,10 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s ptr = line + v; // "line" may have been updated } + if ((State & MODE_INSERT) && in_curline && ins_compl_active()) { + area_highlighting = true; + } + win_line_start(wp, &wlv); bool draw_cols = true; int leftcols_width = 0; @@ -1740,6 +1744,14 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s if (*ptr == NUL) { has_match_conc = 0; } + + // Check if ComplMatchIns highlight is needed. + if ((State & MODE_INSERT) && in_curline && ins_compl_active()) { + int ins_match_attr = ins_compl_col_range_attr((int)(ptr - line)); + if (ins_match_attr > 0) { + search_attr = hl_combine_attr(search_attr, ins_match_attr); + } + } } if (wlv.diff_hlf != (hlf_T)0) { @@ -1787,16 +1799,6 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, int col_rows, s wlv.char_attr = hl_combine_attr(char_attr_base, char_attr_pri); } - // Apply ComplMatchIns highlight if needed. - if (wlv.filler_todo <= 0 - && (State & MODE_INSERT) && in_curline && ins_compl_active()) { - int ins_match_attr = ins_compl_col_range_attr((int)(ptr - line)); - if (ins_match_attr > 0) { - char_attr_pri = hl_combine_attr(char_attr_pri, ins_match_attr); - wlv.char_attr = hl_combine_attr(char_attr_base, char_attr_pri); - } - } - if (draw_folded && has_foldtext && wlv.n_extra == 0 && wlv.col == win_col_offset) { const int v = (int)(ptr - line); linenr_T lnume = lnum + foldinfo.fi_lines - 1; diff --git a/src/nvim/highlight_group.c b/src/nvim/highlight_group.c index 636124a698..2ae15254ea 100644 --- a/src/nvim/highlight_group.c +++ b/src/nvim/highlight_group.c @@ -173,7 +173,7 @@ static const char *highlight_init_both[] = { "default link PmenuKind Pmenu", "default link PmenuKindSel PmenuSel", "default link PmenuSbar Pmenu", - "default link ComplMatchIns Normal", + "default link ComplMatchIns NONE", "default link Substitute Search", "default link StatusLineTerm StatusLine", "default link StatusLineTermNC StatusLineNC", diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index 5036ec5e45..872ed2b4c3 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -958,7 +958,7 @@ static void ins_compl_insert_bytes(char *p, int len) } assert(len >= 0); ins_bytes_len(p, (size_t)len); - compl_ins_end_col = curwin->w_cursor.col - 1; + compl_ins_end_col = curwin->w_cursor.col; } /// Checks if the column is within the currently inserted completion text @@ -2147,6 +2147,8 @@ static bool ins_compl_stop(const int c, const int prev_mode, bool retval) && pum_visible()) { word = xstrdup(compl_shown_match->cp_str); retval = true; + // May need to remove ComplMatchIns highlight. + redrawWinline(curwin, curwin->w_cursor.lnum); } // CTRL-E means completion is Ended, go back to the typed text. @@ -3648,6 +3650,7 @@ void ins_compl_delete(bool new_leader) return; } backspace_until_column(col); + compl_ins_end_col = curwin->w_cursor.col; } // TODO(vim): is this sufficient for redrawing? Redrawing everything |