diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/drawline.c | 7 | ||||
| -rw-r--r-- | src/nvim/move.c | 2 | ||||
| -rw-r--r-- | src/nvim/plines.c | 71 |
3 files changed, 42 insertions, 38 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index fa2aecff86..3638ea19f4 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -877,7 +877,8 @@ static bool has_more_inline_virt(winlinevars_T *wlv, ptrdiff_t v) DecorRange *item = &kv_A(state->active, i); if (item->start_row != state->row || !kv_size(item->decor.virt_text) - || item->decor.virt_text_pos != kVTInline) { + || item->decor.virt_text_pos != kVTInline + || item->decor.virt_text_width == 0) { continue; } if (item->draw_col >= -1 && item->start_col >= v) { @@ -899,7 +900,8 @@ static void handle_inline_virtual_text(win_T *wp, winlinevars_T *wlv, ptrdiff_t DecorRange *item = &kv_A(state->active, i); if (item->start_row != state->row || !kv_size(item->decor.virt_text) - || item->decor.virt_text_pos != kVTInline) { + || item->decor.virt_text_pos != kVTInline + || item->decor.virt_text_width == 0) { continue; } if (item->draw_col >= -1 && item->start_col == v) { @@ -935,6 +937,7 @@ static void handle_inline_virtual_text(win_T *wp, winlinevars_T *wlv, ptrdiff_t // If the text didn't reach until the first window // column we need to skip cells. if (wlv->skip_cells > 0) { + // FIXME: this should use virt_text_width instead int virt_text_len = wlv->n_attr; if (virt_text_len > wlv->skip_cells) { int len = mb_charlen2bytelen(wlv->p_extra, wlv->skip_cells); diff --git a/src/nvim/move.c b/src/nvim/move.c index 3f4ba3c811..993e5bf495 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -879,7 +879,7 @@ void curs_columns(win_T *wp, int may_scroll) // column char *const sbr = get_showbreak_value(wp); if (*sbr && *get_cursor_pos_ptr() == NUL - && wp->w_wcol == vim_strsize(sbr)) { + && wp->w_wcol == (wp->w_width_inner - width2) + vim_strsize(sbr)) { wp->w_wcol = 0; } } diff --git a/src/nvim/plines.c b/src/nvim/plines.c index c2447103dc..526c2f8e08 100644 --- a/src/nvim/plines.c +++ b/src/nvim/plines.c @@ -319,6 +319,7 @@ void init_chartabsize_arg(chartabsize_T *cts, win_T *wp, linenr_T lnum, colnr_T cts->cts_vcol = col; cts->cts_line = line; cts->cts_ptr = ptr; + cts->cts_max_head_vcol = 0; cts->cts_cur_text_width_left = 0; cts->cts_cur_text_width_right = 0; cts->cts_has_virt_text = false; @@ -404,8 +405,13 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp) return win_chartabsize(wp, s, vcol); } + bool has_lcs_eol = wp->w_p_list && wp->w_p_lcs_chars.eol != NUL; + // First get normal size, without 'linebreak' or inline virtual text int size = win_chartabsize(wp, s, vcol); + if (*s == NUL && !has_lcs_eol) { + size = 0; // NUL is not displayed + } if (cts->cts_has_virt_text) { int tab_size = size; @@ -491,14 +497,11 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp) } // May have to add something for 'breakindent' and/or 'showbreak' - // string at start of line. - // Do not use 'showbreak' at the NUL after the text. + // string at the start of a screen line. int head = mb_added; - char *const sbr - // XXX: there should be a better check deeper below - = ((c == NUL && cts->cts_cur_text_width_left + cts->cts_cur_text_width_right == 0) - ? empty_option : get_showbreak_value(wp)); - if ((*sbr != NUL || wp->w_p_bri) && wp->w_p_wrap) { + char *const sbr = get_showbreak_value(wp); + // When "size" is 0, no new screen line is started. + if (size > 0 && wp->w_p_wrap && (*sbr != NUL || wp->w_p_bri)) { int col_off_prev = win_col_off(wp); int width2 = wp->w_width_inner - col_off_prev + win_col_off2(wp); colnr_T wcol = vcol + col_off_prev; @@ -542,35 +545,33 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp) if (wp->w_p_bri) { head_mid += get_breakindent_win(wp, line); } - if (head_mid > 0) { - if (wcol + size > wp->w_width_inner) { - // Calculate effective window width. - int prev_rem = wp->w_width_inner - wcol; - int width = width2 - head_mid; - - if (width <= 0) { - width = 1; + if (head_mid > 0 && wcol + size > wp->w_width_inner) { + // Calculate effective window width. + int prev_rem = wp->w_width_inner - wcol; + int width = width2 - head_mid; + + if (width <= 0) { + width = 1; + } + // divide "size - prev_width" by "width", rounding up + int cnt = (size - prev_rem + width - 1) / width; + added += cnt * head_mid; + + if (max_head_vcol == 0 || vcol + size + added < max_head_vcol) { + head += cnt * head_mid; + } else if (max_head_vcol > vcol + head_prev + prev_rem) { + head += (max_head_vcol - (vcol + head_prev + prev_rem) + + width2 - 1) / width2 * head_mid; + } else if (max_head_vcol < 0) { + int off = 0; + if (c != NUL || !(State & MODE_NORMAL)) { + off += cts->cts_cur_text_width_left; } - // divide "size - prev_width" by "width", rounding up - int cnt = (size - prev_rem + width - 1) / width; - added += cnt * head_mid; - - if (max_head_vcol == 0 || vcol + size + added < max_head_vcol) { - head += cnt * head_mid; - } else if (max_head_vcol > vcol + head_prev + prev_rem) { - head += (max_head_vcol - (vcol + head_prev + prev_rem) - + width2 - 1) / width2 * head_mid; - } else if (max_head_vcol < 0) { - int off = 0; - if (c != NUL || !(State & MODE_NORMAL)) { - off += cts->cts_cur_text_width_left; - } - if (c != NUL && (State & MODE_NORMAL)) { - off += cts->cts_cur_text_width_right; - } - if (off >= prev_rem) { - head += (1 + (off - prev_rem) / width) * head_mid; - } + if (c != NUL && (State & MODE_NORMAL)) { + off += cts->cts_cur_text_width_right; + } + if (off >= prev_rem) { + head += (1 + (off - prev_rem) / width) * head_mid; } } } |