diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-08-19 03:55:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-19 03:55:11 +0800 |
| commit | 5a6c7c805b8bb1d1ed9fe829ed33f18ffa6f4f47 (patch) | |
| tree | 4f600676df0d9bcbd2787ca44782d6371ada6ab5 /src | |
| parent | f0e6e2ae463aa5f9c5e64e6fe01c1bab82131933 (diff) | |
| download | rneovim-5a6c7c805b8bb1d1ed9fe829ed33f18ffa6f4f47.tar.gz rneovim-5a6c7c805b8bb1d1ed9fe829ed33f18ffa6f4f47.tar.bz2 rneovim-5a6c7c805b8bb1d1ed9fe829ed33f18ffa6f4f47.zip | |
fix(extmarks): make empty "conceal" respect &conceallevel = 1 (#24785)
This treats extmark conceal more like matchadd() conceal.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/decoration.c | 7 | ||||
| -rw-r--r-- | src/nvim/decoration.h | 2 | ||||
| -rw-r--r-- | src/nvim/drawline.c | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/nvim/decoration.c b/src/nvim/decoration.c index 59af433b35..d9d1417d2a 100644 --- a/src/nvim/decoration.c +++ b/src/nvim/decoration.c @@ -332,7 +332,7 @@ next_mark: int attr = 0; size_t j = 0; - bool conceal = 0; + int conceal = 0; int conceal_char = 0; int conceal_attr = 0; TriState spell = kNone; @@ -362,8 +362,9 @@ next_mark: attr = hl_combine_attr(attr, item.attr_id); } if (active && item.decor.conceal) { - conceal = true; - if (item.start_row == state->row && item.start_col == col && item.decor.conceal_char) { + conceal = 1; + if (item.start_row == state->row && item.start_col == col) { + conceal = 2; conceal_char = item.decor.conceal_char; state->col_until = MIN(state->col_until, item.start_col); conceal_attr = item.attr_id; diff --git a/src/nvim/decoration.h b/src/nvim/decoration.h index 565279b21b..3d16aa803e 100644 --- a/src/nvim/decoration.h +++ b/src/nvim/decoration.h @@ -101,7 +101,7 @@ typedef struct { int current; int eol_col; - bool conceal; + int conceal; int conceal_char; int conceal_attr; diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index 4c90a562ce..e531704970 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -2179,11 +2179,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool number_onl if (has_decor && v > 0) { // extmarks take preceedence over syntax.c decor_attr = hl_combine_attr(decor_attr, extmark_attr); - decor_conceal = decor_state.conceal; - if (decor_conceal && decor_state.conceal_char) { - decor_conceal = 2; // really?? - } can_spell = TRISTATE_TO_BOOL(decor_state.spell, can_spell); } |