mirror of
https://github.com/neovim/neovim.git
synced 2025-09-13 06:48:17 +00:00
refactor(plines): remove implicit curwin chartabsize() function
This commit is contained in:
@@ -525,7 +525,7 @@ static colnr_T scroll_line_len(linenr_T lnum)
|
||||
char_u *line = ml_get(lnum);
|
||||
if (*line != NUL) {
|
||||
for (;;) {
|
||||
int numchar = chartabsize(line, col);
|
||||
int numchar = win_chartabsize(curwin, line, col);
|
||||
MB_PTR_ADV(line);
|
||||
if (*line == NUL) { // don't count the last character
|
||||
break;
|
||||
@@ -621,7 +621,7 @@ static int mouse_adjust_click(win_T *wp, int row, int col)
|
||||
// scanned *up to* `col`, nudging it left or right when concealed characters
|
||||
// are encountered.
|
||||
//
|
||||
// chartabsize() is used to keep track of the virtual column position relative
|
||||
// win_chartabsize() is used to keep track of the virtual column position relative
|
||||
// to the line's bytes. For example: if col == 9 and the line starts with a
|
||||
// tab that's 8 columns wide, we would want the cursor to be highlighting the
|
||||
// second byte, not the ninth.
|
||||
@@ -648,7 +648,7 @@ static int mouse_adjust_click(win_T *wp, int row, int col)
|
||||
// checked for concealed characters.
|
||||
vcol = 0;
|
||||
while (vcol < offset && *ptr != NUL) {
|
||||
vcol += chartabsize(ptr, vcol);
|
||||
vcol += win_chartabsize(curwin, ptr, vcol);
|
||||
ptr += utfc_ptr2len(ptr);
|
||||
}
|
||||
|
||||
@@ -659,7 +659,7 @@ static int mouse_adjust_click(win_T *wp, int row, int col)
|
||||
vcol = offset;
|
||||
ptr_end = ptr_row_offset;
|
||||
while (vcol < col && *ptr_end != NUL) {
|
||||
vcol += chartabsize(ptr_end, vcol);
|
||||
vcol += win_chartabsize(curwin, ptr_end, vcol);
|
||||
ptr_end += utfc_ptr2len(ptr_end);
|
||||
}
|
||||
|
||||
@@ -674,7 +674,7 @@ static int mouse_adjust_click(win_T *wp, int row, int col)
|
||||
#define decr() nudge--; ptr_end -= utfc_ptr2len(ptr_end)
|
||||
|
||||
while (ptr < ptr_end && *ptr != NUL) {
|
||||
cwidth = chartabsize(ptr, vcol);
|
||||
cwidth = win_chartabsize(curwin, ptr, vcol);
|
||||
vcol += cwidth;
|
||||
if (cwidth > 1 && *ptr == '\t' && nudge > 0) {
|
||||
// A tab will "absorb" any previous adjustments.
|
||||
|
Reference in New Issue
Block a user