aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.2330: vi' does not always work when 'selection' is exclusive

Browse Source 
Problem:    vi' does not always work when 'selection' is exclusive.
Solution:   Adjust start position.
This commit is contained in:
Bram Moolenaar 2019-11-21 20:55:26 +01:00
parent 44f0bd878a
commit 94d9f4fa65
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/search.c
View File

@ -4412,8 +4412,8 @@ find_prev_quote(
current_quote( current_quote(
oparg_T *oap, oparg_T *oap,
long count, long count,
int include, /* TRUE == include quote char */ int include, // TRUE == include quote char
int quotechar) /* Quote character */ int quotechar) // Quote character
{ {
char_u *line = ml_get_curline(); char_u *line = ml_get_curline();
int col_end; int col_end;
@ -4421,12 +4421,15 @@ current_quote(
int inclusive = FALSE; int inclusive = FALSE;
int vis_empty = TRUE; // Visual selection <= 1 char int vis_empty = TRUE; // Visual selection <= 1 char
int vis_bef_curs = FALSE; // Visual starts before cursor int vis_bef_curs = FALSE; // Visual starts before cursor
int did_exclusive_adj = FALSE; // adjusted pos for 'selection'
int inside_quotes = FALSE; // Looks like "i'" done before int inside_quotes = FALSE; // Looks like "i'" done before
int selected_quote = FALSE; // Has quote inside selection int selected_quote = FALSE; // Has quote inside selection
int i; int i;
int restore_vis_bef = FALSE; // restore VIsual on abort int restore_vis_bef = FALSE; // restore VIsual on abort
/* Correct cursor when 'selection' is "exclusive". */ // When 'selection' is "exclusive" move the cursor to where it would be
// with 'selection' "inclusive", so that the logic is the same for both.
// The cursor then is moved forward after adjusting the area.
if (VIsual_active) if (VIsual_active)
{ {
/* this only works within one line */ /* this only works within one line */
@ -4437,6 +4440,17 @@ current_quote(
vis_empty = EQUAL_POS(VIsual, curwin->w_cursor); vis_empty = EQUAL_POS(VIsual, curwin->w_cursor);
if (*p_sel == 'e') if (*p_sel == 'e')
{ {
if (vis_bef_curs)
{
dec_cursor();
did_exclusive_adj = TRUE;
}
else if (!vis_empty)
{
dec(&VIsual);
did_exclusive_adj = TRUE;
}
vis_empty = EQUAL_POS(VIsual, curwin->w_cursor);
if (!vis_bef_curs && !vis_empty) if (!vis_bef_curs && !vis_empty)
{ {
// VIsual needs to be the start of Visual selection. // VIsual needs to be the start of Visual selection.
@ -4447,8 +4461,6 @@ current_quote(
vis_bef_curs = TRUE; vis_bef_curs = TRUE;
restore_vis_bef = TRUE; restore_vis_bef = TRUE;
} }
dec_cursor();
vis_empty = EQUAL_POS(VIsual, curwin->w_cursor);
} }
} }
@ -4626,7 +4638,7 @@ current_quote(
{ {
if (vis_empty || vis_bef_curs) if (vis_empty || vis_bef_curs)
{ {
/* decrement cursor when 'selection' is not exclusive */ // decrement cursor when 'selection' is not exclusive
if (*p_sel != 'e') if (*p_sel != 'e')
dec_cursor(); dec_cursor();
} }
@ -4663,7 +4675,8 @@ current_quote(
abort_search: abort_search:
if (VIsual_active && *p_sel == 'e') if (VIsual_active && *p_sel == 'e')
{ {
inc_cursor(); if (did_exclusive_adj)
inc_cursor();
if (restore_vis_bef) if (restore_vis_bef)
{ {
pos_T t = curwin->w_cursor; pos_T t = curwin->w_cursor;

7
src/testdir/test_textobjects.vim
View File

@ -45,11 +45,18 @@ func Test_quote_selection_selection_exclusive()
new new
call setline(1, "a 'bcde' f") call setline(1, "a 'bcde' f")
set selection=exclusive set selection=exclusive
exe "norm! fdvhi'y" exe "norm! fdvhi'y"
call assert_equal('bcde', @") call assert_equal('bcde', @")
let @"='dummy' let @"='dummy'
exe "norm! $gevi'y" exe "norm! $gevi'y"
call assert_equal('bcde', @") call assert_equal('bcde', @")
let @"='dummy'
exe "norm! 0fbhvi'y"
call assert_equal('bcde', @")
set selection&vim set selection&vim
bw! bw!
endfunc endfunc

2
src/version.c
View File

@ -737,6 +737,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2330,
/**/ /**/
2329, 2329,
/**/ /**/