diff options
| author | Christian Brabandt <cb@256bit.org> | 2024-06-19 20:26:51 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-06-19 20:26:51 +0200 |
| commit | ca7f93e6f351b310c17cfc8f88acf21c839d6116 (patch) | |
| tree | 1109927a7cde057e3c749c48f8e36ddc8c83d795 | |
| parent | 43eef882ff42e673af1e753892801ba20c5d002a (diff) | |
patch 9.1.0504: inner-tag textobject confused about ">" in attributesv9.1.0504
Problem: inner-tag textobject confused about ">" in attributes
Solution: Skip over quoted '>' when determining the start position
fixes: #15043
closes: #15049
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/testdir/test_textobjects.vim | 12 | ||||
| -rw-r--r-- | src/textobject.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 23 insertions, 2 deletions
diff --git a/src/testdir/test_textobjects.vim b/src/testdir/test_textobjects.vim index d5e772db50..2622b06a4a 100644 --- a/src/testdir/test_textobjects.vim +++ b/src/testdir/test_textobjects.vim @@ -201,6 +201,18 @@ func Test_string_html_objects() normal! 2k0vaty call assert_equal("<div><div\nattr=\"attr\"\n></div></div>", @", e) + " tag, that includes a > in some attribute + let t = "<div attr=\"attr >> foo >> bar \">Hello</div>" + $put =t + normal! fHyit + call assert_equal("Hello", @", e) + + " tag, that includes a > in some attribute + let t = "<div attr='attr >> foo >> bar '>Hello 123</div>" + $put =t + normal! fHyit + call assert_equal("Hello 123", @", e) + set quoteescape& " this was going beyond the end of the line diff --git a/src/textobject.c b/src/textobject.c index 1890d7c83f..aa2db07709 100644 --- a/src/textobject.c +++ b/src/textobject.c @@ -1426,15 +1426,22 @@ again: if (!do_include) { - // Exclude the start tag. + // Exclude the start tag, + // but skip over '>' if it appears in quotes + int in_quotes = FALSE; curwin->w_cursor = start_pos; while (inc_cursor() >= 0) - if (*ml_get_cursor() == '>') + { + p = ml_get_cursor(); + if (*p == '>' && !in_quotes) { inc_cursor(); start_pos = curwin->w_cursor; break; } + else if (*p == '"' || *p == '\'') + in_quotes = !in_quotes; + } curwin->w_cursor = end_pos; // If we are in Visual mode and now have the same text as before set diff --git a/src/version.c b/src/version.c index a366f35af8..0d8b57d7f1 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 504, +/**/ 503, /**/ 502, |