mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-09 11:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0671: cursor in wrong column after auto-format #9729

Browse Source 
Problem:    Cursor in the wrong column after auto-formatting.
Solution:   Check for deleting more spaces than adding. (closes vim/vim#3748)
e1e714ef0d
This commit is contained in:
Jan Edmund Lazo
2019-03-14 06:23:05 -04:00
committed by Justin M. Keyes
parent 907b480350
commit cbe4377fde
4 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/mark.c
View File

@@ -1069,19 +1069,24 @@ static void mark_adjust_internal(linenr_T line1, linenr_T line2,
{ \
posp->lnum += lnum_amount; \
assert(col_amount > INT_MIN && col_amount <= INT_MAX); \
if (col_amount < 0 && posp->col <= (colnr_T)-col_amount) \
if (col_amount < 0 && posp->col <= (colnr_T)-col_amount) { \
posp->col = 0; \
else \
} else if (posp->col < spaces_removed) { \
posp->col = (int)col_amount + spaces_removed; \
} else { \
posp->col += (colnr_T)col_amount; \
} \
} \
}
/*
* Adjust marks in line "lnum" at column "mincol" and further: add
* "lnum_amount" to the line number and add "col_amount" to the column
* position.
*/
void mark_col_adjust(linenr_T lnum, colnr_T mincol, long lnum_amount, long col_amount)
// Adjust marks in line "lnum" at column "mincol" and further: add
// "lnum_amount" to the line number and add "col_amount" to the column
// position.
// "spaces_removed" is the number of spaces that were removed, matters when the
// cursor is inside them.
void mark_col_adjust(
linenr_T lnum, colnr_T mincol, long lnum_amount, long col_amount,
int spaces_removed)
{
int i;
int fnum = curbuf->b_fnum;