kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-26 14:11:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't move cursor to the left if on the first column of wrapped line

Browse Source 
ref: #7887
This commit is contained in:
Tommy Allen 2018-01-25 10:33:44 -05:00
parent d2ff5d5bb0
commit 60d0353119
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/mouse.c
View File

@ -646,13 +646,11 @@ static int mouse_adjust_click(win_T *wp, int row, int col)
int matchid;
int prev_matchid;
int len = 0;
int prev_len = 0;
#define incr() col++; ptr_end += utfc_ptr2len(ptr_end)
#define decr() col--; ptr_end -= utfc_ptr2len(ptr_end)
while (ptr < ptr_end) {
prev_len = len;
len = utfc_ptr2len(ptr);
matchid = syn_get_concealed_id(wp, wp->w_cursor.lnum,
(colnr_T)(ptr - line));
@ -660,19 +658,10 @@ static int mouse_adjust_click(win_T *wp, int row, int col)
if (wp->w_p_cole == 3) {
incr();
} else {
if (row > 0 && ptr == ptr_row_offset) {
// Check if the current concealed character is actually part of
// the previous wrapped row's conceal group.
prev_matchid = syn_get_concealed_id(wp, wp->w_cursor.lnum,
(colnr_T)((ptr - line)
- prev_len));
if (prev_matchid == matchid) {
incr();
}
} else if (wp->w_p_cole == 1
|| (wp->w_p_cole == 2
&& (lcs_conceal != NUL
|| syn_get_sub_char() != NUL))) {
if (!(row > 0 && ptr == ptr_row_offset)
&& (wp->w_p_cole == 1 || (wp->w_p_cole == 2
&& (lcs_conceal != NUL
|| syn_get_sub_char() != NUL)))) {
// At least one placeholder character will be displayed.
decr();
}
@ -681,7 +670,6 @@ static int mouse_adjust_click(win_T *wp, int row, int col)
do {
incr();
ptr += len;
prev_len = len;
len = utfc_ptr2len(ptr);
matchid = syn_get_concealed_id(wp, wp->w_cursor.lnum,
(colnr_T)(ptr - line));