fix(jump): make dot-repeat not consume character when there is no target

Resolve #2290

Author: abeldekat

lua/mini/jump.lua

@@ -181,6 +181,14 @@ MiniJump.state = {
 MiniJump.jump = function(target, backward, till, n_times)
   if H.is_disabled() then return end
 
+  -- Ensure to undo "consuming a character" effect if there is no target found
+  -- Do it here to act on dot-repeat
+  local has_changed_cursor = false
+  local undo_no_move = function()
+    if not has_changed_cursor then vim.cmd('undo!') end
+  end
+  if MiniJump._is_expr then vim.schedule(undo_no_move) end
+
   -- Dot-repeat should not change the state, so save it to later restore
   local is_dot_repeat = MiniJump._is_expr and not MiniJump._is_expr_init
   MiniJump._is_expr, MiniJump._is_expr_init = nil, nil
@@ -234,7 +242,7 @@ MiniJump.jump = function(target, backward, till, n_times)
 
   -- Track cursor position to account for movement not caught by `CursorMoved`
   H.cache.latest_cursor = H.get_cursor_data()
-  H.cache.has_changed_cursor = not vim.deep_equal(H.cache.latest_cursor, init_cursor_data)
+  has_changed_cursor = not vim.deep_equal(H.cache.latest_cursor, init_cursor_data)
 
   -- Restore the state if needed
   if is_dot_repeat then
@@ -404,11 +412,6 @@ H.make_expr_jump = function(backward, till)
     if isnt_repeat_jump and target == nil then return '<Esc>' end
     H.update_state(target)
 
-    vim.schedule(function()
-      if H.cache.has_changed_cursor then return end
-      vim.cmd('undo!')
-    end)
-
     -- Set a flag to distinguish first call from dot-repeat
     MiniJump._is_expr_init = true
 

tests/test_jump.lua

@@ -530,37 +530,50 @@ T['Jumping with f/t/F/T']['enters jumping mode even if first jump is impossible'
 end
 
 T['Jumping with f/t/F/T']['does nothing if there is no place to jump'] = function()
-  -- Normal mode
-  local validate_normal = function(keys, start_col, ref_mode)
-    set_lines({ 'abcdefg' })
+  local validate_single = function(keys, start_line, start_col, ref_mode)
+    set_lines({ start_line })
     set_cursor(1, start_col)
 
     type_keys(keys, 'd')
 
     -- It shouldn't move anywhere and should not modify text
     eq(get_cursor(), { 1, start_col })
-    eq(get_lines(), { 'abcdefg' })
+    eq(get_lines(), { start_line })
+    eq(child.fn.mode(), ref_mode)
+
+    -- The above applies to subsequent dot-repeats as well
+    type_keys('.')
+    eq(get_cursor(), { 1, start_col })
+    eq(get_lines(), { start_line })
     eq(child.fn.mode(), ref_mode)
 
     -- Ensure there is no jumping
     child.lua('MiniJump.stop_jumping()')
     child.ensure_normal_mode()
   end
 
-  validate_normal('f', 4, 'n')
-  validate_normal('t', 4, 'n')
-  validate_normal('F', 2, 'n')
-  validate_normal('T', 2, 'n')
+  local validate = function(line)
+    validate_single('f', line, 4, 'n')
+    validate_single('t', line, 4, 'n')
+    validate_single('F', line, 2, 'n')
+    validate_single('T', line, 2, 'n')
+
+    validate_single('vf', line, 4, 'v')
+    validate_single('vt', line, 4, 'v')
+    validate_single('vF', line, 2, 'v')
+    validate_single('vT', line, 2, 'v')
+
+    validate_single('df', line, 4, 'n')
+    validate_single('dt', line, 4, 'n')
+    validate_single('dF', line, 2, 'n')
+    validate_single('dT', line, 2, 'n')
+  end
 
-  validate_normal('vf', 4, 'v')
-  validate_normal('vt', 4, 'v')
-  validate_normal('vF', 2, 'v')
-  validate_normal('vT', 2, 'v')
+  -- Target is present but not reachable
+  validate('abcdefg')
 
-  validate_normal('df', 4, 'n')
-  validate_normal('dt', 4, 'n')
-  validate_normal('dF', 2, 'n')
-  validate_normal('dT', 2, 'n')
+  -- Target is not present
+  validate('abcxefg')
 end
 
 T['Jumping with f/t/F/T']['can be dot-repeated if did not jump at first'] = function()
@@ -720,6 +733,7 @@ T['Jumping with f/t/F/T']['stops jumping if no target is found'] = function()
   -- General idea: there was a bug which didn't reset jumping state if target
   -- was not found by `vim.fn.search()`. In that case, next typing of jumping
   -- key wouldn't make effect, but it should.
+  -- Related test case: 'Enters jumping mode even if first jump is impossible'
   for _, key in ipairs({ 'f', 't', 'F', 'T' }) do
     local start_col = key == key:lower() and 0 or 3
     set_cursor(1, start_col)