diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-03-28 18:20:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-28 18:20:38 +0800 |
| commit | 08b8ccd733ca2a7888ad221d5cc6e1f1e994a02d (patch) | |
| tree | 644e0a0eedb2fe8bc76d1065fd165e0754a3f940 /src/nvim/edit.c | |
| parent | 6364fc617ded29100c1aa3103e189fd983dd5e64 (diff) | |
| download | rneovim-08b8ccd733ca2a7888ad221d5cc6e1f1e994a02d.tar.gz rneovim-08b8ccd733ca2a7888ad221d5cc6e1f1e994a02d.tar.bz2 rneovim-08b8ccd733ca2a7888ad221d5cc6e1f1e994a02d.zip | |
vim-patch:9.1.0218: Unnecessary multiplications in backspace code (#28075)
Problem: Unnecessary multiplications in backspace code, as
"col / ts * ts" is the same as "col - col % ts".
Solution: Change "col / ts * ts" to "col - col % ts". Adjust the loop
and the comments ins_bs() to be easier to understand. Update
tests to reset 'smarttab' properly.
(zeertzjq)
closes: vim/vim#14308
https://github.com/vim/vim/commit/8ede7a069419e0e01368c65a2d0c79d6332aa6cd
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 5ae5267364..8e9649b6b1 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -3838,7 +3838,7 @@ static bool ins_bs(int c, int mode, int *inserted_space_p) bool const use_ts = !curwin->w_p_list || curwin->w_p_lcs_chars.tab1; char *const line = get_cursor_line_ptr(); - char *const end_ptr = line + curwin->w_cursor.col; + char *const cursor_ptr = line + curwin->w_cursor.col; colnr_T vcol = 0; colnr_T space_vcol = 0; @@ -3846,9 +3846,10 @@ static bool ins_bs(int c, int mode, int *inserted_space_p) StrCharInfo space_sci = sci; bool prev_space = false; - // Find the last whitespace that is preceded by non-whitespace. + // Compute virtual column of cursor position, and find the last + // whitespace before cursor that is preceded by non-whitespace. // Use charsize_nowrap() so that virtual text and wrapping are ignored. - while (sci.ptr < end_ptr) { + while (sci.ptr < cursor_ptr) { bool cur_space = ascii_iswhite(sci.chr.value); if (!prev_space && cur_space) { space_sci = sci; @@ -3860,11 +3861,9 @@ static bool ins_bs(int c, int mode, int *inserted_space_p) } // Compute the virtual column where we want to be. - colnr_T want_vcol = vcol - 1; - if (want_vcol <= 0) { - want_vcol = 0; - } else if (p_sta && in_indent) { - want_vcol = want_vcol - want_vcol % get_sw_value(curbuf); + colnr_T want_vcol = vcol > 0 ? vcol - 1 : 0; + if (p_sta && in_indent) { + want_vcol -= want_vcol % get_sw_value(curbuf); } else { want_vcol = tabstop_start(want_vcol, get_sts_value(), curbuf->b_p_vsts_array); } |