aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-08 06:04:08 -04:00
Code Activity

patch 8.2.1850: "vat" does not select tags correctly over line break

Browse Source 
Problem:    "vat" does not select tags correctly over line break.
Solution:   Adjust the search pattern. (Aufar Gilbran, closes #7136)
This commit is contained in:
Bram Moolenaar
2020-10-15 21:23:28 +02:00
parent ed234f24f3
commit a604ccc959
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/testdir/test_textobjects.vim
View File

@@ -169,6 +169,18 @@ func Test_string_html_objects()
normal! k$vaty normal! k$vaty
call assert_equal("<html>\n<title>welcome\n</html>", @") call assert_equal("<html>\n<title>welcome\n</html>", @")
" nested tag that has < in a different line from >
let t = "<div><div\n></div></div>"
$put =t
normal! k0vaty
call assert_equal("<div><div\n></div></div>", @")
" nested tag with attribute that has < in a different line from >
let t = "<div><div\nattr=\"attr\"\n></div></div>"
$put =t
normal! 2k0vaty
call assert_equal("<div><div\nattr=\"attr\"\n></div></div>", @")
set quoteescape& set quoteescape&
enew! enew!
endfunc endfunc

4
src/textobject.c
View File

@@ -1347,7 +1347,7 @@ again:
curwin->w_cursor = old_pos; curwin->w_cursor = old_pos;
goto theend; goto theend;
} }
spat = alloc(len + 31); spat = alloc(len + 39);
epat = alloc(len + 9); epat = alloc(len + 9);
if (spat == NULL || epat == NULL) if (spat == NULL || epat == NULL)
{ {
@@ -1356,7 +1356,7 @@ again:
curwin->w_cursor = old_pos; curwin->w_cursor = old_pos;
goto theend; goto theend;
} }
sprintf((char *)spat, "<%.*s\\>\\%%(\\s\\_[^>]\\{-}[^/]>\\|>\\)\\c", len, p); sprintf((char *)spat, "<%.*s\\>\\%%(\\_s\\_[^>]\\{-}\\_[^/]>\\|\\_s\\?>\\)\\c", len, p);
sprintf((char *)epat, "</%.*s>\\c", len, p); sprintf((char *)epat, "</%.*s>\\c", len, p);
r = do_searchpair(spat, (char_u *)"", epat, FORWARD, NULL, r = do_searchpair(spat, (char_u *)"", epat, FORWARD, NULL,

2
src/version.c
View File

@@ -750,6 +750,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 */
/**/
1850,
/**/ /**/
1849, 1849,
/**/ /**/