neovim

commit 3317aa2f3756d21905b501a01d4f2b3203f60943
parent 38a1d41ac08d1fe5688cdcac1e1e181f0cd82a5f
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Thu, 20 Jun 2024 09:57:00 +0800

vim-patch:9.1.0504: inner-tag textobject confused about ">" in attributes (#29420)

Problem:  inner-tag textobject confused about ">" in attributes
Solution: Skip over quoted '>' when determining the start position

fixes: vim/vim#15043
closes: vim/vim#15049

https://github.com/vim/vim/commit/ca7f93e6f351b310c17cfc8f88acf21c839d6116

Co-authored-by: Christian Brabandt <cb@256bit.org>
Diffstat:
M
src/nvim/textobject.c
 | 
9
+++++++--
M
test/old/testdir/test_textobjects.vim
 | 
12
++++++++++++

2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/nvim/textobject.c b/src/nvim/textobject.c
@@ -1193,13 +1193,18 @@ again:
   pos_T end_pos = curwin->w_cursor;
 
   if (!do_include) {
-    // Exclude the start tag.
+    // Exclude the start tag,
+    // but skip over '>' if it appears in quotes
+    bool in_quotes = false;
     curwin->w_cursor = start_pos;
     while (inc_cursor() >= 0) {
-      if (*get_cursor_pos_ptr() == '>') {
+      p = get_cursor_pos_ptr();
+      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;
diff --git a/test/old/testdir/test_textobjects.vim b/test/old/testdir/test_textobjects.vim
@@ -203,6 +203,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