neovim

commit a6591950f6bc658de0889a6d8a8a088caec6246b
parent 71455173b482b9787340505151995da9e2b8f38f
Author: Andre Toerien <andre.toerien8@gmail.com>
Date:   Sat, 19 Apr 2025 14:54:02 +0200

fix(shada): don't store search and sub patterns if /0 in 'shada'

Diffstat:
M
src/nvim/shada.c
 | 
22
+++++++++++-----------
M
test/functional/shada/history_spec.lua
 | 
29
+++++++++++++++++++++++++++--

2 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/src/nvim/shada.c b/src/nvim/shada.c
@@ -2401,20 +2401,20 @@ static ShaDaWriteResult shada_write(FileDescriptor *const sd_writer,
     wms->jumps_size = shada_init_jumps(wms->jumps, &removable_bufs);
   }
 
-  const bool search_highlighted = !(no_hlsearch
-                                    || find_shada_parameter('h') != NULL);
-  const bool search_last_used = search_was_last_used();
+  if (dump_one_history[HIST_SEARCH] > 0) {  // Skip if /0 in 'shada'
+    const bool search_highlighted = !(no_hlsearch
+                                      || find_shada_parameter('h') != NULL);
+    const bool search_last_used = search_was_last_used();
 
-  // Initialize search pattern
-  add_search_pattern(&wms->search_pattern, &get_search_pattern, false,
-                     search_last_used, search_highlighted);
+    // Initialize search pattern
+    add_search_pattern(&wms->search_pattern, &get_search_pattern, false,
+                       search_last_used, search_highlighted);
 
-  // Initialize substitute search pattern
-  add_search_pattern(&wms->sub_search_pattern, &get_substitute_pattern, true,
-                     search_last_used, search_highlighted);
+    // Initialize substitute search pattern
+    add_search_pattern(&wms->sub_search_pattern, &get_substitute_pattern, true,
+                       search_last_used, search_highlighted);
 
-  // Initialize substitute replacement string
-  {
+    // Initialize substitute replacement string
     SubReplacementString sub;
     sub_get_replacement(&sub);
     wms->replacement = (PossiblyFreedShadaEntry) {
diff --git a/test/functional/shada/history_spec.lua b/test/functional/shada/history_spec.lua
@@ -6,6 +6,7 @@ local t_shada = require('test.functional.shada.testutil')
 local nvim_command, fn, api, nvim_feed, eq = n.command, n.fn, n.api, n.feed, t.eq
 local assert_alive = n.assert_alive
 local expect_exit = n.expect_exit
+local pcall_err = t.pcall_err
 
 local reset, clear = t_shada.reset, t_shada.clear
 
@@ -104,6 +105,16 @@ describe('ShaDa support code', function()
     eq('c', fn.histget('>', -1))
   end)
 
+  it('does not dump last search pattern if /0 in shada', function()
+    nvim_command('set shada+=/0')
+    nvim_command('silent! /test/')
+    expect_exit(nvim_command, 'qall!')
+    reset()
+    nvim_command('language C')
+    local err = pcall_err(n.exec_capture, 'normal! n')
+    eq('nvim_exec2(), line 1: Vim(normal):E35: No previous regular expression', err)
+  end)
+
   it('dumps and loads last search pattern with offset', function()
     api.nvim_set_option_value('wrapscan', false, {})
     fn.setline('.', { 'foo', 'bar--' })
@@ -182,6 +193,22 @@ describe('ShaDa support code', function()
     eq('goo', fn.getline(1))
   end)
 
+  it('does not dump last substitute pattern or replacement string if /0 in shada', function()
+    nvim_command('set shada+=/0')
+    fn.setline('.', { 'foo', 'bar' })
+    nvim_command('%s/f/g/g')
+    eq('goo', fn.getline(1))
+    expect_exit(nvim_command, 'qall!')
+    reset()
+    fn.setline('.', { 'foo', 'bar' })
+    nvim_command('language C')
+    local err = pcall_err(nvim_command, '&')
+    eq('Vim(&):E33: No previous substitute regular expression', err)
+    nvim_feed('/f\n')
+    err = pcall_err(nvim_command, '~&')
+    eq('Vim(~):E33: No previous substitute regular expression', err)
+  end)
+
   it('dumps and loads history with UTF-8 characters', function()
     reset()
     nvim_feed(':echo "«"\n')
@@ -210,7 +237,6 @@ describe('ShaDa support code', function()
 
   it('dumps and loads search pattern with UTF-8 characters', function()
     nvim_command('silent! /«/')
-    nvim_command('set shada+=/0')
     expect_exit(nvim_command, 'qall!')
     reset()
     fn.setline('.', { '\171«' })
@@ -222,7 +248,6 @@ describe('ShaDa support code', function()
   it('dumps and loads search pattern with 8-bit single-byte', function()
     -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
     nvim_command('silent! /\171/')
-    nvim_command('set shada+=/0')
     expect_exit(nvim_command, 'qall!')
     reset()
     fn.setline('.', { '\171«' })