feat(neovim): reintroduce trigger.lua

Author: perrin4869

home/.config/nvim/lua/defer.lua

@@ -211,10 +211,12 @@ function M.call(method, ...)
 	end
 end
 
+---@alias Defer.Lazy<T> fun(...): T
+---
 --- Memoizes a function result.
 ---@generic T
 ---@param fn fun(...): T
----@return fun(...): T
+---@return Defer.Lazy<T>
 function M.lazy(fn)
 	local value
 	local ran = false

home/.config/nvim/lua/trigger.lua

@@ -0,0 +1,95 @@
+local lazy = require('defer').lazy
+local M = {}
+
+--- @type Defer.Lazy<uv.uv_timer_t>
+local timer = lazy(function()
+	return vim.uv.new_timer()
+end)
+local cache = {} -- Stores original mappings keyed by the repeat_key
+
+---Restores the original mapping for a specific key
+---@param key string
+local function restore(key)
+	local map = cache[key]
+	if map == nil then
+		return
+	end
+
+	if map ~= false then
+		local opts = {
+			silent = map.silent == 1,
+			expr = map.expr == 1,
+			nowait = map.nowait == 1,
+			noremap = map.noremap == 1,
+			desc = map.desc,
+			buffer = map.buffer,
+		}
+		if map.callback then
+			vim.keymap.set('n', key, map.callback, opts)
+		else
+			vim.keymap.set('n', key, map.rhs, opts)
+		end
+	else
+		pcall(vim.keymap.del, 'n', key)
+	end
+	cache[key] = nil
+end
+
+---Activates the sticky repeat for the primary key
+---@param key string
+---@param action function
+---@param timeout number
+local function activate_sticky(key, action, timeout)
+	timer():stop()
+
+	-- 1. Cache current mapping if we haven't already
+	if cache[key] == nil then
+		local arg = vim.fn.maparg(key, 'n', false, true)
+		if next(arg) ~= nil then
+			cache[key] = arg
+		else
+			cache[key] = false
+		end
+	end
+
+	-- 2. Create the temporary override
+	vim.keymap.set('n', key, function()
+		action()
+		activate_sticky(key, action, timeout)
+	end, { silent = true, nowait = true, desc = 'Sticky repeat: ' .. key })
+
+	-- 3. Set timer to restore original state
+	timer():start(
+		timeout,
+		0,
+		vim.schedule_wrap(function()
+			restore(key)
+		end)
+	)
+end
+
+---Wraps actions to trigger sticky repetition
+---@param key string The key to override (e.g., 'b')
+---@param action_prev function
+---@param action_next function
+---@param timeout? number Defaults to 1000ms
+---@return function action_prev, function action_next
+function M.trigger(key, action_prev, action_next, timeout)
+	timeout = timeout or 1000
+
+	local wrapped_prev = function()
+		local res = action_prev()
+		activate_sticky(key, action_prev, timeout)
+		return res
+	end
+
+	local wrapped_next = function()
+		local res = action_next()
+		activate_sticky(key, action_next, timeout)
+		return res
+	end
+
+	return wrapped_prev, wrapped_next
+end
+
+return M

home/.config/nvim/plugin/diagnostic.lua

@@ -17,12 +17,16 @@ defer.very_lazy(function()
 	map('<leader>q', 'setloclist')
 
 	local next_move = require('nvim-next.move')
+	local trigger = require('trigger').trigger
 
-	local prev_diag, next_diag = next_move.make_repeatable_pair(function()
-		vim.diagnostic.jump({ count = -vim.v.count1 })
-	end, function()
-		vim.diagnostic.jump({ count = vim.v.count1 })
-	end)
+	local prev_diag, next_diag = trigger(
+		'd',
+		next_move.make_repeatable_pair(function()
+			vim.diagnostic.jump({ count = -vim.v.count1 })
+		end, function()
+			vim.diagnostic.jump({ count = vim.v.count1 })
+		end)
+	)
 	require('map').map('n', '[d', prev_diag, 'Go to previous diagnostic')
 	require('map').map('n', ']d', next_diag, 'Go to next diagnostic')
 

home/.config/nvim/plugin/gitsigns.lua

@@ -13,8 +13,8 @@ defer.on_load('gitsigns', function()
 			local next_integrations = require('nvim-next.integrations')
 			local nngs = next_integrations.gitsigns(gs)
 
-			-- Navigation
-			map('n', ']c', function()
+			local trigger = require('trigger').trigger
+			local prev_hunk, next_hunk = trigger('c', function()
 				if vim.wo.diff then
 					return ']c'
 				end
@@ -23,17 +23,19 @@ defer.on_load('gitsigns', function()
 					nngs.next_hunk()
 				end)
 				return '<Ignore>'
-			end, { expr = true, desc = 'next_hunk' })
-
-			map('n', '[c', function()
+			end, function()
 				if vim.wo.diff then
 					return '[c'
 				end
 				vim.schedule(function()
 					nngs.prev_hunk()
 				end)
 				return '<Ignore>'
-			end, { expr = true, desc = 'prev_hunk' })
+			end)
+
+			-- Navigation
+			map('n', ']c', prev_hunk, { expr = true, desc = 'next_hunk' })
+			map('n', '[c', next_hunk, { expr = true, desc = 'prev_hunk' })
 
 			-- Actions
 			map('n', '<leader>hs', gs.stage_hunk, 'stage_hunk')

home/.config/nvim/plugin/unimpaired.lua

@@ -4,13 +4,17 @@ defer.very_lazy(function()
 	vim.cmd.packadd('vim-unimpaired')
 
 	local next_move = require('nvim-next.move')
+	local trigger = require('trigger').trigger
 
 	-- buffers
-	local prev_buffers, next_buffers = next_move.make_repeatable_pair(function()
-		vim.cmd('bprevious')
-	end, function()
-		vim.cmd('bnext')
-	end)
+	local prev_buffers, next_buffers = trigger(
+		'b',
+		next_move.make_repeatable_pair(function()
+			vim.cmd('bprevious')
+		end, function()
+			vim.cmd('bnext')
+		end)
+	)
 
 	map('n', '[b', prev_buffers, 'Go to previous buffer')
 	map('n', ']b', next_buffers, 'Go to next buffer')