IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

mark: Make sure that jumplist item will not have zero lnum

Browse Source 
Fixes #7169
This commit is contained in:
ZyX
2017-12-24 00:29:38 +03:00
parent dee78a4095
commit 6b45dbca04
4 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test/functional/shada/helpers.lua
View File

@@ -6,15 +6,14 @@ local write_file, merge_args = helpers.write_file, helpers.merge_args
local mpack = require('mpack')
local tmpname = helpers.tmpname()
local additional_cmd = ''
local append_argv = nil
local function nvim_argv(shada_file)
local function nvim_argv(shada_file, embed)
local argv = {nvim_prog, '-u', 'NONE', '-i', shada_file or tmpname, '-N',
'--cmd', 'set shortmess+=I background=light noswapfile',
'--cmd', additional_cmd,
'--embed'}
if helpers.prepend_argv then
return merge_args(helpers.prepend_argv, argv)
embed or '--embed'}
if helpers.prepend_argv or append_argv then
return merge_args(helpers.prepend_argv, argv, append_argv)
else
return argv
end
@@ -26,12 +25,21 @@ local reset = function(shada_file)
end
local set_additional_cmd = function(s)
additional_cmd = s
append_argv = {'--cmd', s}
end
local function add_argv(...)
if select('#', ...) == 0 then
append_argv = nil
else
append_argv = {...}
end
end
local clear = function()
os.execute('cp ' .. tmpname .. ' /tmp/test.shada')
os.remove(tmpname)
set_additional_cmd('')
append_argv = nil
end
local get_shada_rw = function(fname)
@@ -80,7 +88,9 @@ end
return {
reset=reset,
set_additional_cmd=set_additional_cmd,
add_argv=add_argv,
clear=clear,
get_shada_rw=get_shada_rw,
read_shada_file=read_shada_file,
nvim_argv=nvim_argv,
}