revert: "shada/context: fully remove jumplist duplicates #10898"

This reverts commit 8b8ecf44f2.
Fix #21082.

src/nvim/mark.c

@@ -1380,12 +1380,14 @@ void mark_col_adjust(linenr_T lnum, colnr_T mincol, linenr_T lnum_amount, long c
 
 // When deleting lines, this may create duplicate marks in the
 // jumplist. They will be removed here for the specified window.
-// When "checktail" is true, removes tail jump if it matches current position.
+// When "loadfiles" is true first ensure entries have the "fnum" field set
-void cleanup_jumplist(win_T *wp, bool checktail)
+// (this may be a bit slow).
+void cleanup_jumplist(win_T *wp, bool loadfiles)
 {
   int i;
 
-  // Load all the files from the jump list. This is
+  if (loadfiles) {
+    // If specified, load all the files from the jump list. This is
     // needed to properly clean up duplicate entries, but will take some
     // time.
     for (i = 0; i < wp->w_jumplistlen; i++) {
@@ -1394,6 +1396,7 @@ void cleanup_jumplist(win_T *wp, bool checktail)
         fname2fnum(&wp->w_jumplist[i]);
       }
     }
+  }
 
   int to = 0;
   for (int from = 0; from < wp->w_jumplistlen; from++) {
@@ -1439,8 +1442,8 @@ void cleanup_jumplist(win_T *wp, bool checktail)
 
   // When pointer is below last jump, remove the jump if it matches the current
   // line.  This avoids useless/phantom jumps. #9805
-  if (checktail && wp->w_jumplistlen
+  if (loadfiles  // otherwise (i.e.: Shada), last entry should be kept
-      && wp->w_jumplistidx == wp->w_jumplistlen) {
+      && wp->w_jumplistlen && wp->w_jumplistidx == wp->w_jumplistlen) {
     const xfmark_T *fm_last = &wp->w_jumplist[wp->w_jumplistlen - 1];
     if (fm_last->fmark.fnum == curbuf->b_fnum
         && fm_last->fmark.mark.lnum == wp->w_cursor.lnum) {

src/nvim/shada.c

@@ -2667,8 +2667,6 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer, ShaDaReadDef
   }
 
   // Initialize jump list
-  setpcmark();
-  cleanup_jumplist(curwin, false);
   wms->jumps_size = shada_init_jumps(wms->jumps, &removable_bufs);
 
   const bool search_highlighted = !(no_hlsearch
@@ -4038,13 +4036,11 @@ static bool shada_removable(const char *name)
 static inline size_t shada_init_jumps(PossiblyFreedShadaEntry *jumps,
                                       khash_t(bufset) *const removable_bufs)
 {
-  if (!curwin->w_jumplistlen) {
+  // Initialize jump list
-    return 0;
-  }
-
   size_t jumps_size = 0;
   const void *jump_iter = NULL;
-
+  setpcmark();
+  cleanup_jumplist(curwin, false);
   do {
     xfmark_T fm;
     jump_iter = mark_jumplist_iter(jump_iter, curwin, &fm);
@@ -4117,7 +4113,6 @@ void shada_encode_jumps(msgpack_sbuffer *const sbuf)
   khash_t(bufset) removable_bufs = KHASH_EMPTY_TABLE(bufset);
   find_removable_bufs(&removable_bufs);
   PossiblyFreedShadaEntry jumps[JUMPLISTSIZE];
-  cleanup_jumplist(curwin, true);
   size_t jumps_size = shada_init_jumps(jumps, &removable_bufs);
   msgpack_packer packer;
   msgpack_packer_init(&packer, sbuf, msgpack_sbuffer_write);

test/functional/api/vim_spec.lua

@@ -1807,7 +1807,9 @@ describe('API', function()
         },
 
         ['jumps'] = eval(([[
-        filter(map(getjumplist()[0], 'filter(
+        filter(map(add(
+        getjumplist()[0], { 'bufnr': bufnr('%'), 'lnum': getcurpos()[1] }),
+        'filter(
         { "f": expand("#".v:val.bufnr.":p"), "l": v:val.lnum },
         { k, v -> k != "l" || v != 1 })'), '!empty(v:val.f)')
         ]]):gsub('\n', '')),

test/functional/vimscript/ctx_functions_spec.lua

@@ -287,7 +287,9 @@ describe('context functions', function()
 
       local with_jumps = {
         ['jumps'] = eval(([[
-        filter(map(getjumplist()[0], 'filter(
+        filter(map(add(
+        getjumplist()[0], { 'bufnr': bufnr('%'), 'lnum': getcurpos()[1] }),
+        'filter(
         { "f": expand("#".v:val.bufnr.":p"), "l": v:val.lnum },
         { k, v -> k != "l" || v != 1 })'), '!empty(v:val.f)')
         ]]):gsub('\n', ''))