mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-25 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

shada: Use same merging code for jumps and changes

Browse Source
This commit is contained in:
ZyX
2015-08-12 21:01:45 +03:00
parent 9d8184c65a
commit 17c69258a7
3 changed files with 50 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/nvim/shada.c
View File

@@ -1241,82 +1241,43 @@ static inline bool marks_equal(const pos_T a, const pos_T b)
return (a.lnum == b.lnum) && (a.col == b.col); return (a.lnum == b.lnum) && (a.col == b.col);
} }
#define MERGE_JUMPS(jumps_size, jumps, jumps_type, timestamp_attr, entry, \ #define MERGE_JUMPS(jumps_size, jumps, jumps_type, timestamp_attr, mark_attr, \
mark_attr, fname_cond, free_func, entry_to_jumps_func, \ entry, fname_cond, free_func, fin_func, \
idxadj_func) \ idxadj_func, afterfree_func) \
do { \ do { \
const int jl_len = (int) jumps_size; \ const int jl_len = (int) jumps_size; \
int i; \ int i; \
for (i = 0; i < jl_len; i++) { \ for (i = jl_len; i > 0; i--) { \
const jumps_type jl_entry = jumps[i]; \ const jumps_type jl_entry = jumps[i - 1]; \
if (jl_entry.timestamp_attr.timestamp >= entry.timestamp) { \ if (jl_entry.timestamp_attr <= entry.timestamp) { \
if (marks_equal(jl_entry.mark_attr.mark, \ if (marks_equal(jl_entry.mark_attr, entry.data.filemark.mark) \
entry.data.filemark.mark) \
&& fname_cond) { \ && fname_cond) { \
i = -1; \ i = -1; \
} \ } \
break; \ break; \
} \ } \
} \ } \
if (i != -1) { \ if (i > 0) { \
if (i < jl_len) { \ if (jl_len == JUMPLISTSIZE) { \
if (jl_len == JUMPLISTSIZE) { \ free_func(jumps[0]); \
free_func(jumps[jl_len - 1]); \ memmove(&jumps[0], &jumps[1], sizeof(jumps[1]) * (size_t) i); \
} \ } else { \
memmove(&jumps[i + 1], &jumps[i], \ memmove(&jumps[i + 1], &jumps[i], \
sizeof(jumps[0]) * (size_t) (jl_len - i)); \ sizeof(jumps[0]) * (size_t) (jl_len - i)); \
} else if (i == jl_len && jl_len == JUMPLISTSIZE) { \ } \
} else if (i == 0) { \
if (jl_len == JUMPLISTSIZE) { \
i = -1; \ i = -1; \
} else if (jl_len > 0) { \
memmove(&jumps[1], &jumps[0], sizeof(jumps[0]) * (size_t) jl_len); \
} \ } \
} \ } \
if (i != -1) { \ if (i != -1) { \
jumps[i] = entry_to_jumps_func(entry); \ jumps[i] = fin_func(entry); \
if (jl_len < JUMPLISTSIZE) { \ if (jl_len < JUMPLISTSIZE) { \
jumps_size++; \ jumps_size++; \
} \ } \
idxadj_func(i); \ idxadj_func(i); \
} else { \
shada_free_shada_entry(&entry); \
} \
} while (0)
#define MERGE_CHANGES(changes_size, changes_type, changes, timestamp_attr, \
mark_attr, entry, free_func, fin_func, afterfree_func) \
do { \
const int cl_len = (int) changes_size; \
int i; \
for (i = cl_len; i > 0; i--) { \
const changes_type cl_entry = changes[i - 1]; \
if (cl_entry.timestamp_attr <= entry.timestamp) { \
if (marks_equal(cl_entry.mark_attr, \
entry.data.filemark.mark)) { \
i = -1; \
} \
break; \
} \
} \
if (i > 0) { \
if (cl_len == JUMPLISTSIZE) { \
free_func(changes[0]); \
memmove(&changes[0], &changes[1], \
sizeof(changes[0]) * (size_t) i); \
} else { \
memmove(&changes[i + 1], &changes[i], \
sizeof(changes[0]) * (size_t) (cl_len - i)); \
} \
} else if (i == 0) { \
if (cl_len == JUMPLISTSIZE) { \
i = -1; \
} else if (cl_len > 0) { \
memmove(&changes[1], &changes[0], \
sizeof(changes[0]) * (size_t) cl_len); \
} \
} \
if (i != -1) { \
changes[i] = fin_func(entry); \
if (cl_len < JUMPLISTSIZE) { \
changes_size++; \
} \
} else { \ } else { \
shada_free_shada_entry(&entry); \ shada_free_shada_entry(&entry); \
afterfree_func(entry); \ afterfree_func(entry); \
@@ -1535,15 +1496,17 @@ static void shada_read(ShaDaReadDef *const sd_reader, const int flags)
&& curwin->w_jumplistidx + 1 < curwin->w_jumplistlen) { \ && curwin->w_jumplistidx + 1 < curwin->w_jumplistlen) { \
curwin->w_jumplistidx++; \ curwin->w_jumplistidx++; \
} }
#define DUMMY_AFTERFREE(entry)
MERGE_JUMPS(curwin->w_jumplistlen, curwin->w_jumplist, xfmark_T, MERGE_JUMPS(curwin->w_jumplistlen, curwin->w_jumplist, xfmark_T,
fmark, cur_entry, fmark, fmark.timestamp, fmark.mark, cur_entry,
(buf == NULL (buf == NULL
? (jl_entry.fname != NULL ? (jl_entry.fname != NULL
&& STRCMP(fm.fname, jl_entry.fname) == 0) && STRCMP(fm.fname, jl_entry.fname) == 0)
: fm.fmark.fnum == jl_entry.fmark.fnum), : fm.fmark.fnum == jl_entry.fmark.fnum),
free_xfmark, SDE_TO_XFMARK, ADJUST_IDX); free_xfmark, SDE_TO_XFMARK, ADJUST_IDX, DUMMY_AFTERFREE);
#undef SDE_TO_XFMARK #undef SDE_TO_XFMARK
#undef ADJUST_IDX #undef ADJUST_IDX
#undef DUMMY_AFTERFREE
} }
// Do not free shada entry: its allocated memory was saved above. // Do not free shada entry: its allocated memory was saved above.
break; break;
@@ -1612,11 +1575,13 @@ static void shada_read(ShaDaReadDef *const sd_reader, const int flags)
(void) kh_put(bufset, &cl_bufs, (uintptr_t) buf, &kh_ret); (void) kh_put(bufset, &cl_bufs, (uintptr_t) buf, &kh_ret);
#define SDE_TO_FMARK(entry) fm #define SDE_TO_FMARK(entry) fm
#define AFTERFREE(entry) (entry).data.filemark.fname = NULL #define AFTERFREE(entry) (entry).data.filemark.fname = NULL
MERGE_CHANGES(buf->b_changelistlen, fmark_T, buf->b_changelist, #define DUMMY_IDX_ADJ(i)
timestamp, mark, cur_entry, free_fmark, SDE_TO_FMARK, MERGE_JUMPS(buf->b_changelistlen, buf->b_changelist, fmark_T,
AFTERFREE); timestamp, mark, cur_entry, true,
free_fmark, SDE_TO_FMARK, DUMMY_IDX_ADJ, AFTERFREE);
#undef SDE_TO_FMARK #undef SDE_TO_FMARK
#undef AFTERFREE #undef AFTERFREE
#undef DUMMY_IDX_ADJ
} }
// Do not free shada entry: except for fname, its allocated memory (i.e. // Do not free shada entry: except for fname, its allocated memory (i.e.
// additional_data attribute contents if non-NULL) was saved above. // additional_data attribute contents if non-NULL) was saved above.
@@ -2394,26 +2359,26 @@ static inline ShaDaWriteResult shada_read_when_writing(
#define SDE_TO_PFSDE(entry) \ #define SDE_TO_PFSDE(entry) \
((PossiblyFreedShadaEntry) { .can_free_entry = true, .data = entry }) ((PossiblyFreedShadaEntry) { .can_free_entry = true, .data = entry })
#define AFTERFREE_DUMMY(entry) #define AFTERFREE_DUMMY(entry)
MERGE_CHANGES(filemarks->changes_size, PossiblyFreedShadaEntry, #define DUMMY_IDX_ADJ(i)
filemarks->changes, data.timestamp, MERGE_JUMPS(filemarks->changes_size, filemarks->changes,
data.data.filemark.mark, entry, PossiblyFreedShadaEntry, data.timestamp,
FREE_POSSIBLY_FREED_SHADA_ENTRY, SDE_TO_PFSDE, data.data.filemark.mark, entry, true,
AFTERFREE_DUMMY); FREE_POSSIBLY_FREED_SHADA_ENTRY, SDE_TO_PFSDE,
#undef AFTERFREE_DUMMY DUMMY_IDX_ADJ, AFTERFREE_DUMMY);
} }
break; break;
} }
case kSDItemJump: { case kSDItemJump: {
#define ADJUST_IDX_DUMMY(i)
MERGE_JUMPS(wms->jumps_size, wms->jumps, PossiblyFreedShadaEntry, MERGE_JUMPS(wms->jumps_size, wms->jumps, PossiblyFreedShadaEntry,
data, entry, data.data.filemark, data.timestamp, data.data.filemark.mark, entry,
strcmp(jl_entry.data.data.filemark.fname, strcmp(jl_entry.data.data.filemark.fname,
entry.data.filemark.fname) == 0, entry.data.filemark.fname) == 0,
FREE_POSSIBLY_FREED_SHADA_ENTRY, SDE_TO_PFSDE, FREE_POSSIBLY_FREED_SHADA_ENTRY, SDE_TO_PFSDE,
ADJUST_IDX_DUMMY); DUMMY_IDX_ADJ, AFTERFREE_DUMMY);
#undef FREE_POSSIBLY_FREED_SHADA_ENTRY #undef FREE_POSSIBLY_FREED_SHADA_ENTRY
#undef SDE_TO_PFSDE #undef SDE_TO_PFSDE
#undef ADJUST_IDX_DUMMY #undef DUMMY_IDX_ADJ
#undef AFTERFREE_DUMMY
break; break;
} }
} }

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

@@ -118,28 +118,14 @@ describe('ShaDa support code', function()
nvim_command('edit ' .. testfilename) nvim_command('edit ' .. testfilename)
nvim_feed('G') nvim_feed('G')
nvim_feed('gg') nvim_feed('gg')
-- nvim_command('redir! >/tmp/jumps.last | jumps | redir END') nvim_command('enew')
-- nvim_command('wshada /tmp/foo') nvim_feed('gg')
nvim_command('redir => g:jumps | jumps | redir END')
local saved = nvim_eval('g:jumps')
nvim_command('qall') nvim_command('qall')
reset() reset()
nvim_command('redraw') nvim_command('redir => g:jumps | jumps | redir END')
-- nvim_command('redir! >/tmp/jumps.init | jumps | redir END') eq(saved, nvim_eval('g:jumps'))
nvim_command('edit ' .. testfilename)
-- nvim_command('redir! >/tmp/jumps | jumps | redir END')
eq(testfilename, nvim_eval('bufname("%")'))
eq(1, nvim_current_line())
nvim_command('execute "normal! \\<C-o>"')
eq(testfilename, nvim_eval('bufname("%")'))
eq(1, nvim_current_line())
nvim_command('execute "normal! \\<C-o>"')
eq(testfilename, nvim_eval('bufname("%")'))
eq(2, nvim_current_line())
nvim_command('execute "normal! \\<C-o>"')
eq(testfilename_2, nvim_eval('bufname("%")'))
eq(1, nvim_current_line())
nvim_command('execute "normal! \\<C-o>"')
eq(testfilename_2, nvim_eval('bufname("%")'))
eq(2, nvim_current_line())
end) end)
it('is able to dump and restore jump list with different times (slow!)', it('is able to dump and restore jump list with different times (slow!)',

13
test/functional/shada/merging_spec.lua
View File

@@ -772,12 +772,13 @@ describe('ShaDa jumps support code', function()
eq('', nvim_eval('bufname("%")')) eq('', nvim_eval('bufname("%")'))
eq('\n' eq('\n'
.. ' jump line col file/text\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' .. ' 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' .. ' 2 2 0 /a/b/f\n'
.. ' 1 2 0 /a/b/e\n' .. ' 1 1 0 \n'
.. '> 0 1 0 ', nvim_eval('g:jumps')) .. '>', nvim_eval('g:jumps'))
end) end)
it('merges jumps when writing', function() it('merges jumps when writing', function()
@@ -791,10 +792,10 @@ describe('ShaDa jumps support code', function()
eq(0, exc_exec('wshada ' .. shada_fname)) eq(0, exc_exec('wshada ' .. shada_fname))
local jumps = { local jumps = {
{file='/a/b/c', line=2}, {file='/a/b/c', line=2},
{file='/a/b/d', line=3},
{file='/a/b/d', line=2}, {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/e', line=2},
{file='/a/b/f', line=2},
} }
local found = 0 local found = 0
for _, v in ipairs(read_shada_file(shada_fname)) do for _, v in ipairs(read_shada_file(shada_fname)) do