From 46e4be0fd0002233bde613295607ce5eeb498567 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 4 Dec 2022 09:09:00 +0800
Subject: vim-patch:8.2.2295: incsearch does not detect empty pattern properly

Problem:    Incsearch does not detect empty pattern properly.
Solution:   Return magic state when skipping over a pattern. (Christian
            Brabandt, closes vim/vim#7612, closes vim/vim#6420)

https://github.com/vim/vim/commit/d93a7fc1a98a58f8101ee780d4735079ad99ae35
---
 src/nvim/testdir/test_search.vim | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_search.vim b/src/nvim/testdir/test_search.vim
index 0702e89ebb..8bb7d8687f 100644
--- a/src/nvim/testdir/test_search.vim
+++ b/src/nvim/testdir/test_search.vim
@@ -1969,6 +1969,35 @@ func Test_incsearch_highlighting_newline()
   bw
 endfunc
 
+func Test_incsearch_substitute_dump2()
+  CheckOption incsearch
+  CheckScreendump
+
+  call writefile([
+	\ 'set incsearch hlsearch scrolloff=0',
+	\ 'for n in range(1, 4)',
+	\ '  call setline(n, "foo " . n)',
+	\ 'endfor',
+	\ 'call setline(5, "abc|def")',
+	\ '3',
+	\ ], 'Xis_subst_script2')
+  let buf = RunVimInTerminal('-S Xis_subst_script2', {'rows': 9, 'cols': 70})
+
+  call term_sendkeys(buf, ':%s/\vabc|')
+  sleep 100m
+  call VerifyScreenDump(buf, 'Test_incsearch_sub_01', {})
+  call term_sendkeys(buf, "\<Esc>")
+
+  " The following should not be highlighted
+  call term_sendkeys(buf, ':1,5s/\v|')
+  sleep 100m
+  call VerifyScreenDump(buf, 'Test_incsearch_sub_02', {})
+
+
+  call StopVimInTerminal(buf)
+  call delete('Xis_subst_script2')
+endfunc
+
 func Test_no_last_search_pattern()
   CheckOption incsearch
 
-- 
cgit 


From 3f1ee12d311fffe30936217c74ef0352bb7d97d9 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 4 Dec 2022 09:43:38 +0800
Subject: vim-patch:8.2.3265: smartcase does not work correctly in very magic
 pattern

Problem:    Smartcase does not work correctly in very magic pattern.
Solution:   Take the magicness into account when skipping over regexp items.
            (Christian Brabandt, closes vim/vim#8682, closes vim/vim#7845)

https://github.com/vim/vim/commit/78ba933d18439ff1a02f6be4c571e73ddceb3cd4

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 src/nvim/testdir/test_search.vim | 54 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_search.vim b/src/nvim/testdir/test_search.vim
index 8bb7d8687f..51e7064c94 100644
--- a/src/nvim/testdir/test_search.vim
+++ b/src/nvim/testdir/test_search.vim
@@ -1998,6 +1998,60 @@ func Test_incsearch_substitute_dump2()
   call delete('Xis_subst_script2')
 endfunc
 
+func Test_pattern_is_uppercase_smartcase()
+  new
+  let input=['abc', 'ABC', 'Abc', 'abC']
+  call setline(1, input)
+  call cursor(1,1)
+  " default, matches firstline
+  %s/abc//g
+  call assert_equal(['', 'ABC', 'Abc', 'abC'],
+        \ getline(1, '$'))
+
+  set smartcase ignorecase
+  sil %d
+  call setline(1, input)
+  call cursor(1,1)
+  " with smartcase and incsearch set, matches everything
+  %s/abc//g
+  call assert_equal(['', '', '', ''], getline(1, '$'))
+
+  sil %d
+  call setline(1, input)
+  call cursor(1,1)
+  " with smartcase and incsearch set and found an uppercase letter,
+  " match only that.
+  %s/abC//g
+  call assert_equal(['abc', 'ABC', 'Abc', ''],
+        \ getline(1, '$'))
+
+  sil %d
+  call setline(1, input)
+  call cursor(1,1)
+  exe "norm! vG$\<esc>"
+  " \%V should not be detected as uppercase letter
+  %s/\%Vabc//g
+  call assert_equal(['', '', '', ''], getline(1, '$'))
+
+  call setline(1, input)
+  call cursor(1,1)
+  exe "norm! vG$\<esc>"
+  " \v%V should not be detected as uppercase letter
+  %s/\v%Vabc//g
+  call assert_equal(['', '', '', ''], getline(1, '$'))
+
+  call setline(1, input)
+  call cursor(1,1)
+  exe "norm! vG$\<esc>"
+  " \v%VabC should be detected as uppercase letter
+  %s/\v%VabC//g
+  call assert_equal(['abc', 'ABC', 'Abc', ''],
+        \ getline(1, '$'))
+
+  set smartcase& ignorecase&
+  bw!
+endfunc
+
 func Test_no_last_search_pattern()
   CheckOption incsearch
 
-- 
cgit 


From 9476dd2f923d9e5d86237836131f67024613308f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 4 Dec 2022 09:46:26 +0800
Subject: vim-patch:8.2.3292: underscore in very magic pattern causes a hang

Problem:    Underscore in very magic pattern causes a hang.  Pattern with \V
            are case sensitive. (Yutao Yuan)
Solution:   Adjust condition for magicness and advance pointer. (Christian
            Brabandt, closes vim/vim#8707, closes vim/vim#8704, closes vim/vim#8705)

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

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 src/nvim/testdir/test_search.vim | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_search.vim b/src/nvim/testdir/test_search.vim
index 51e7064c94..a9cad3ed44 100644
--- a/src/nvim/testdir/test_search.vim
+++ b/src/nvim/testdir/test_search.vim
@@ -2048,6 +2048,17 @@ func Test_pattern_is_uppercase_smartcase()
   call assert_equal(['abc', 'ABC', 'Abc', ''],
         \ getline(1, '$'))
 
+  call setline(1, input)
+  call cursor(1,1)
+  " \Vabc should match everything
+  %s/\Vabc//g
+  call assert_equal(['', '', '', ''], getline(1, '$'))
+
+  call setline(1, input + ['_abc'])
+  " _ matches normally
+  %s/\v_.*//g
+  call assert_equal(['abc', 'ABC', 'Abc', 'abC', ''], getline(1, '$'))
+
   set smartcase& ignorecase&
   bw!
 endfunc
-- 
cgit