mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andre Toerien
2025-04-19 14:54:02 +02:00
parent 71455173b4
commit a6591950f6
2 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/shada.c
View File

@@ -2401,6 +2401,7 @@ static ShaDaWriteResult shada_write(FileDescriptor *const sd_writer,
wms->jumps_size = shada_init_jumps(wms->jumps, &removable_bufs); wms->jumps_size = shada_init_jumps(wms->jumps, &removable_bufs);
} }
if (dump_one_history[HIST_SEARCH] > 0) { // Skip if /0 in 'shada'
const bool search_highlighted = !(no_hlsearch const bool search_highlighted = !(no_hlsearch
|| find_shada_parameter('h') != NULL); || find_shada_parameter('h') != NULL);
const bool search_last_used = search_was_last_used(); const bool search_last_used = search_was_last_used();
@@ -2414,7 +2415,6 @@ static ShaDaWriteResult shada_write(FileDescriptor *const sd_writer,
search_last_used, search_highlighted); search_last_used, search_highlighted);
// Initialize substitute replacement string // Initialize substitute replacement string
{
SubReplacementString sub; SubReplacementString sub;
sub_get_replacement(&sub); sub_get_replacement(&sub);
wms->replacement = (PossiblyFreedShadaEntry) { wms->replacement = (PossiblyFreedShadaEntry) {

29
test/functional/shada/history_spec.lua
View File

@@ -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 nvim_command, fn, api, nvim_feed, eq = n.command, n.fn, n.api, n.feed, t.eq
local assert_alive = n.assert_alive local assert_alive = n.assert_alive
local expect_exit = n.expect_exit local expect_exit = n.expect_exit
local pcall_err = t.pcall_err
local reset, clear = t_shada.reset, t_shada.clear local reset, clear = t_shada.reset, t_shada.clear
@@ -104,6 +105,16 @@ describe('ShaDa support code', function()
eq('c', fn.histget('>', -1)) eq('c', fn.histget('>', -1))
end) 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() it('dumps and loads last search pattern with offset', function()
api.nvim_set_option_value('wrapscan', false, {}) api.nvim_set_option_value('wrapscan', false, {})
fn.setline('.', { 'foo', 'bar--' }) fn.setline('.', { 'foo', 'bar--' })
@@ -182,6 +193,22 @@ describe('ShaDa support code', function()
eq('goo', fn.getline(1)) eq('goo', fn.getline(1))
end) 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() it('dumps and loads history with UTF-8 characters', function()
reset() reset()
nvim_feed(':echo "«"\n') nvim_feed(':echo "«"\n')
@@ -210,7 +237,6 @@ describe('ShaDa support code', function()
it('dumps and loads search pattern with UTF-8 characters', function() it('dumps and loads search pattern with UTF-8 characters', function()
nvim_command('silent! /«/') nvim_command('silent! /«/')
nvim_command('set shada+=/0')
expect_exit(nvim_command, 'qall!') expect_exit(nvim_command, 'qall!')
reset() reset()
fn.setline('.', { '\171«' }) fn.setline('.', { '\171«' })
@@ -222,7 +248,6 @@ describe('ShaDa support code', function()
it('dumps and loads search pattern with 8-bit single-byte', 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 -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
nvim_command('silent! /\171/') nvim_command('silent! /\171/')
nvim_command('set shada+=/0')
expect_exit(nvim_command, 'qall!') expect_exit(nvim_command, 'qall!')
reset() reset()
fn.setline('.', { '\171«' }) fn.setline('.', { '\171«' })