diff options
author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2023-09-20 20:20:04 +0200 |
---|---|---|
committer | Christian Brabandt <cb@256bit.org> | 2023-09-20 20:25:17 +0200 |
commit | 87018255e3ad0f4dfa03e20318836d24af721caf (patch) | |
tree | 132b551bd3ecddf43ae2d81ac23bfbbbe0e2177f /src | |
parent | 98e68c07ce229148c994a42ead9f010b0d0a1be4 (diff) |
patch 9.0.1921: not possible to use the jumplist like a stackv9.0.1921
Problem: not possible to use the jumplist like a stack
Solution: Add the 'jumpoptions' setting to make the jumplist
a stack.
Add an option for using jumplist like tag stack
related: #7738
closes: #13134
ported from NeoVim:
- https://neovim.io/doc/user/motion.html#jumplist-stack
- neovim/neovim@39094b3
- neovim/neovim#11530
- https://vi.stackexchange.com/questions/18344/how-to-change-jumplist-behavior
Based on the feedback in the previous PR, it looks like many people like
this option.
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Co-authored-by: butwerenotthereyet <58348703+butwerenotthereyet@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/mark.c | 25 | ||||
-rw-r--r-- | src/option.h | 3 | ||||
-rw-r--r-- | src/optiondefs.h | 3 | ||||
-rw-r--r-- | src/optionstr.c | 14 | ||||
-rw-r--r-- | src/proto/optionstr.pro | 1 | ||||
-rw-r--r-- | src/testdir/gen_opt_test.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_jumplist.vim | 64 | ||||
-rw-r--r-- | src/version.c | 2 |
8 files changed, 110 insertions, 3 deletions
diff --git a/src/mark.c b/src/mark.c index b3c644b14b..22e3c62575 100644 --- a/src/mark.c +++ b/src/mark.c @@ -146,6 +146,16 @@ setpcmark(void) curwin->w_prev_pcmark = curwin->w_pcmark; curwin->w_pcmark = curwin->w_cursor; + if (jop_flags & JOP_STACK) + { + // jumpoptions=stack: if we're somewhere in the middle of the jumplist + // discard everything after the current index. + if (curwin->w_jumplistidx < curwin->w_jumplistlen - 1) + // Discard the rest of the jumplist by cutting the length down to + // contain nothing beyond the current index. + curwin->w_jumplistlen = curwin->w_jumplistidx + 1; + } + // If jumplist is full: remove oldest entry if (++curwin->w_jumplistlen > JUMPLISTSIZE) { @@ -1288,6 +1298,7 @@ cleanup_jumplist(win_T *wp, int loadfiles) { int i; int from, to; + int mustfree; if (loadfiles) { @@ -1314,10 +1325,18 @@ cleanup_jumplist(win_T *wp, int loadfiles) && wp->w_jumplist[i].fmark.mark.lnum == wp->w_jumplist[from].fmark.mark.lnum) break; - if (i >= wp->w_jumplistlen) // no duplicate - wp->w_jumplist[to++] = wp->w_jumplist[from]; - else + if (i >= wp->w_jumplistlen) // not duplicate + mustfree = FALSE; + else if (i > from + 1) // non-adjacent duplicate + // jumpoptions=stack: remove duplicates only when adjacent. + mustfree = !(jop_flags & JOP_STACK); + else // adjacent duplicate + mustfree = TRUE; + + if (mustfree) vim_free(wp->w_jumplist[from].fname); + else + wp->w_jumplist[to++] = wp->w_jumplist[from]; } if (wp->w_jumplistidx == wp->w_jumplistlen) wp->w_jumplistidx = to; diff --git a/src/option.h b/src/option.h index 3bd2eb9699..68748304bf 100644 --- a/src/option.h +++ b/src/option.h @@ -601,6 +601,9 @@ EXTERN char_u *p_fp; // 'formatprg' EXTERN int p_fs; // 'fsync' #endif EXTERN int p_gd; // 'gdefault' +EXTERN char_u *p_jop; // 'jumpoptions' +EXTERN unsigned jop_flags; // +#define JOP_STACK 0x001 #ifdef FEAT_PROP_POPUP # ifdef FEAT_QUICKFIX EXTERN char_u *p_cpp; // 'completepopup' diff --git a/src/optiondefs.h b/src/optiondefs.h index aeb3b57988..4f3a1524a9 100644 --- a/src/optiondefs.h +++ b/src/optiondefs.h @@ -1459,6 +1459,9 @@ static struct vimoption options[] = {"joinspaces", "js", P_BOOL|P_VI_DEF|P_VIM, (char_u *)&p_js, PV_NONE, NULL, {(char_u *)TRUE, (char_u *)0L} SCTX_INIT}, + {"jumpoptions", "jop", P_STRING|P_VI_DEF|P_VIM|P_ONECOMMA|P_NODUP, + (char_u *)&p_jop, PV_NONE, did_set_jumpoptions, + {(char_u *)"", (char_u *)0L} SCTX_INIT}, {"key", NULL, P_STRING|P_ALLOCED|P_VI_DEF|P_NO_MKRC, #ifdef FEAT_CRYPT (char_u *)&p_key, PV_KEY, did_set_cryptkey, diff --git a/src/optionstr.c b/src/optionstr.c index 31e30e195b..aeeab27891 100644 --- a/src/optionstr.c +++ b/src/optionstr.c @@ -35,6 +35,7 @@ static char *(p_cm_values[]) = {"zip", "blowfish", "blowfish2", #endif static char *(p_cmp_values[]) = {"internal", "keepascii", NULL}; static char *(p_dy_values[]) = {"lastline", "truncate", "uhex", NULL}; +static char *(p_jop_values[]) = {"stack", NULL}; #ifdef FEAT_FOLDING static char *(p_fdo_values[]) = {"all", "block", "hor", "mark", "percent", "quickfix", "search", "tag", "insert", @@ -120,6 +121,7 @@ didset_string_options(void) (void)opt_strings_flags(p_fdo, p_fdo_values, &fdo_flags, TRUE); #endif (void)opt_strings_flags(p_dy, p_dy_values, &dy_flags, TRUE); + (void)opt_strings_flags(p_jop, p_jop_values, &jop_flags, TRUE); (void)opt_strings_flags(p_tc, p_tc_values, &tc_flags, FALSE); (void)opt_strings_flags(p_ve, p_ve_values, &ve_flags, TRUE); #if defined(UNIX) || defined(VMS) @@ -1852,6 +1854,18 @@ did_set_isopt(optset_T *args) return NULL; } +/* + * The 'jumpoptions' option is changed. + */ + char * +did_set_jumpoptions(optset_T *args) +{ + if (opt_strings_flags(p_jop, p_jop_values, &jop_flags, TRUE) != OK) + return e_invalid_argument; + + return NULL; +} + #if defined(FEAT_KEYMAP) || defined(PROTO) /* * The 'keymap' option is changed. diff --git a/src/proto/optionstr.pro b/src/proto/optionstr.pro index db13f10d98..c1253b1c41 100644 --- a/src/proto/optionstr.pro +++ b/src/proto/optionstr.pro @@ -64,6 +64,7 @@ char *did_set_highlight(optset_T *args); char *did_set_iconstring(optset_T *args); char *did_set_imactivatekey(optset_T *args); char *did_set_isopt(optset_T *args); +char *did_set_jumpoptions(optset_T *args); char *did_set_keymap(optset_T *args); char *did_set_keymodel(optset_T *args); char *did_set_keyprotocol(optset_T *args); diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim index f205d4391f..a195bcaea8 100644 --- a/src/testdir/gen_opt_test.vim +++ b/src/testdir/gen_opt_test.vim @@ -112,6 +112,7 @@ let test_values = { \ 'isident': [['', '@', '@,48-52'], ['xxx', '@48']], \ 'iskeyword': [['', '@', '@,48-52'], ['xxx', '@48']], \ 'isprint': [['', '@', '@,48-52'], ['xxx', '@48']], + \ 'jumpoptions': [['', 'stack'], ['xxx']], \ 'keymap': [['', 'accents'], ['xxx']], \ 'keymodel': [['', 'startsel', 'startsel,stopsel'], ['xxx']], \ 'keyprotocol': [['', 'xxx:none', 'yyy:mok2', 'zzz:kitty'], diff --git a/src/testdir/test_jumplist.vim b/src/testdir/test_jumplist.vim index 4b5e3213fe..8fbf39f55b 100644 --- a/src/testdir/test_jumplist.vim +++ b/src/testdir/test_jumplist.vim @@ -98,4 +98,68 @@ d bwipe! endfunc +" Test for 'jumpoptions' +func Test_jumpoptions() + new + call setline(1, range(1, 200)) + clearjumps + set jumpoptions=stack + + " Jump around to add some locations to the jump list. + normal 10G + normal 20G + normal 30G + normal 40G + normal 50G + let bnr = bufnr() + + " discards the tail when navigating from the middle + exe "normal \<C-O>\<C-O>" + call assert_equal([ + \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 40, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 50, 'bufnr': bnr, 'col': 0, 'coladd': 0} + \ ], 3], getjumplist()) + + " new jump location is added immediately after the last one + normal 90G + call assert_equal([ + \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ ], 4], getjumplist()) + + " does not add the same location twice adjacently + normal 60G + normal 60G + call assert_equal([ + \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 90, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 60, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ ], 6], getjumplist()) + + " does add the same location twice non adjacently + normal 10G + normal 20G + call assert_equal([ + \ [{'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 20, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 30, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 90, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 60, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ {'lnum': 10, 'bufnr': bnr, 'col': 0, 'coladd': 0}, + \ ], 7], getjumplist()) + + set jumpoptions& + %bw! +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 5abc4f733c..5f362340ec 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1921, +/**/ 1920, /**/ 1919, |