diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/api/buffer.c | 2 | ||||
| -rw-r--r-- | src/nvim/ops.c | 33 |
2 files changed, 24 insertions, 11 deletions
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c index a396693a61..665c622c98 100644 --- a/src/nvim/api/buffer.c +++ b/src/nvim/api/buffer.c @@ -442,7 +442,7 @@ void nvim_buf_set_lines(uint64_t channel_id, goto end; } - bcount_t deleted_bytes = MAX(get_region_bytecount(start, end, 0, 0)-1, 0); + bcount_t deleted_bytes = get_region_bytecount(curbuf, start, end, 0, 0); // If the size of the range is reducing (ie, new_len < old_len) we // need to delete some old_len. We do this at the start, by diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 569ed167d2..ca68ef04b0 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -1677,8 +1677,8 @@ int op_delete(oparg_T *oap) curbuf_splice_pending++; pos_T startpos = curwin->w_cursor; // start position for delete bcount_t deleted_bytes = get_region_bytecount( - startpos.lnum, oap->end.lnum, startpos.col, - oap->end.col) - !oap->inclusive; + curbuf, startpos.lnum, oap->end.lnum, startpos.col, + oap->end.col) + oap->inclusive; truncate_line(true); // delete from cursor to end of line curpos = curwin->w_cursor; // remember curwin->w_cursor @@ -6300,19 +6300,32 @@ bool op_reg_set_previous(const char name) return true; } -bcount_t get_region_bytecount(linenr_T start_lnum, linenr_T end_lnum, - colnr_T start_col, colnr_T end_col) +/// Get the byte count of buffer region. End-exclusive. +/// +/// @return number of bytes +bcount_t get_region_bytecount(buf_T *buf, linenr_T start_lnum, + linenr_T end_lnum, colnr_T start_col, + colnr_T end_col) { - const char *first = (const char *)ml_get(start_lnum); - bcount_t deleted_bytes = (bcount_t)STRLEN(first) - start_col + 1; - + linenr_T max_lnum = buf->b_ml.ml_line_lnum; + if (start_lnum > max_lnum) { + return 0; + } if (start_lnum == end_lnum) { - return deleted_bytes - ((bcount_t)STRLEN(first) - end_col + 1); + return end_col - start_col; } + const char *first = (const char *)ml_get_buf(buf, start_lnum, false); + bcount_t deleted_bytes = (bcount_t)STRLEN(first) - start_col + 1; for (linenr_T i = 1; i <= end_lnum-start_lnum-1; i++) { + if (start_lnum + i > max_lnum) { + return deleted_bytes; + } deleted_bytes += (bcount_t)STRLEN( - ml_get(start_lnum + i)) + 1; + ml_get_buf(buf, start_lnum + i, false)) + 1; + } + if (end_lnum > max_lnum) { + return deleted_bytes; } - return deleted_bytes + end_col + 1; + return deleted_bytes + end_col; } |