diff options
| author | ZyX <kp-pav@yandex.ru> | 2015-08-12 21:01:45 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2015-10-08 22:00:39 +0300 |
| commit | 17c69258a7128ee31fbf294b46599241f8e226cc (patch) | |
| tree | 195c160d04c3d897f9a79ad7d375a168aaa22438 /test/functional/shada/merging_spec.lua | |
| parent | 9d8184c65a5fdbf9793b759843178db74137b2a7 (diff) | |
| download | rneovim-17c69258a7128ee31fbf294b46599241f8e226cc.tar.gz rneovim-17c69258a7128ee31fbf294b46599241f8e226cc.tar.bz2 rneovim-17c69258a7128ee31fbf294b46599241f8e226cc.zip | |
shada: Use same merging code for jumps and changes
Diffstat (limited to 'test/functional/shada/merging_spec.lua')
| -rw-r--r-- | test/functional/shada/merging_spec.lua | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/functional/shada/merging_spec.lua b/test/functional/shada/merging_spec.lua index e627f8f76e..3daa5af7c2 100644 --- a/test/functional/shada/merging_spec.lua +++ b/test/functional/shada/merging_spec.lua @@ -772,12 +772,13 @@ describe('ShaDa jumps support code', function() eq('', nvim_eval('bufname("%")')) eq('\n' .. ' jump line col file/text\n' - .. ' 5 2 0 /a/b/c\n' + .. ' 6 2 0 /a/b/c\n' + .. ' 5 2 0 /a/b/d\n' .. ' 4 3 0 /a/b/d\n' - .. ' 3 2 0 /a/b/d\n' + .. ' 3 2 0 /a/b/e\n' .. ' 2 2 0 /a/b/f\n' - .. ' 1 2 0 /a/b/e\n' - .. '> 0 1 0 ', nvim_eval('g:jumps')) + .. ' 1 1 0 \n' + .. '>', nvim_eval('g:jumps')) end) it('merges jumps when writing', function() @@ -791,10 +792,10 @@ describe('ShaDa jumps support code', function() eq(0, exc_exec('wshada ' .. shada_fname)) local jumps = { {file='/a/b/c', line=2}, - {file='/a/b/d', line=3}, {file='/a/b/d', line=2}, - {file='/a/b/f', line=2}, + {file='/a/b/d', line=3}, {file='/a/b/e', line=2}, + {file='/a/b/f', line=2}, } local found = 0 for _, v in ipairs(read_shada_file(shada_fname)) do |