refactor(hijack): consolidate mapping logic. Fixes #28

Author: rachartier

README.md

@@ -100,16 +100,8 @@ require('tiny-glimmer').setup({
         -- },
         -- settings needs to respect the animation you choose settings
         --
-        -- All "mapping" can be set in 2 ways:
-        -- 1. A string with the key you want to map
-        --    Example:
-        --    paste_mapping = "p"
-        -- 2. A table with the key you want to map and its actions
-        --    Example:
-        --    paste_mapping = {
-        --        lhs = "p"
-        --        rhs = "<Plug>(YankyPutAfter)"
-        --    }
+        -- All "mapping" needs to have a correct lhs.
+        -- It will try to automatically use what you already defined before.
         yank = {
               enabled = true,
               default_animation = "fade",
@@ -119,10 +111,10 @@ require('tiny-glimmer').setup({
             default_animation = "pulse",
 
             -- Keys to navigate to the next match
-            next_mapping = "nzzzv",
+            next_mapping = "n",
 
             -- Keys to navigate to the previous match
-            prev_mapping = "Nzzzv",
+            prev_mapping = "N",
         },
         paste = {
             enabled = true,
@@ -413,6 +405,9 @@ You should disable your own `TextYankPost` autocmd that calls `vim.highlight.on_
 ### Transparent background issues?
 Set the `transparency_color` option to your desired background color.
 
+### How to use it with `yanky.nvim` ?
+You should add `yanky.nvim` in `tiny-glimmer` dependecies.
+
 ## Thanks
 
 - [EmmanuelOga/easing](https://github.com/EmmanuelOga) - Easing function implementations

lua/tiny-glimmer/hijack.lua

@@ -1,22 +1,5 @@
 local M = {}
 
----Adds count and register information to the key sequence
----@param key_sequence string The key sequence to modify
----@return string Modified key sequence with count and register
-local function add_count_and_registers(key_sequence)
-	local modified_keys = vim.api.nvim_replace_termcodes(key_sequence, true, false, true)
-
-	if vim.v.register ~= nil then
-		modified_keys = '"' .. vim.v.register .. modified_keys
-	end
-
-	if vim.v.count > 1 then
-		modified_keys = vim.v.count .. modified_keys
-	end
-
-	return modified_keys
-end
-
 ---Executes a command multiple times based on count
 ---@param command string|function The command to execute
 local function execute_with_count(command)
@@ -29,62 +12,37 @@ local function execute_with_count(command)
 	end
 end
 
----Executes the original callback mapping
----@param callback function The callback to execute
----@param lhs string The left-hand side mapping
----@param rhs string The right-hand side mapping
----@param mapping_mode string The mapping mode
----@param original_mapping table|string The original mapping details
----@param command string|function|nil Additional command to execute
-local function execute_callback_mapping(callback, lhs, rhs, mapping_mode, original_mapping, command)
-	execute_with_count(callback)
-
-	-- Check if mapping changed and rehijack if necessary
-	local current_mapping = vim.fn.maparg(lhs, mapping_mode, false, true)
-	if not vim.deep_equal(current_mapping, original_mapping.callback) then
-		M.hijack(mapping_mode, lhs, rhs, original_mapping, command)
-	end
-end
-
----Creates the mapping execution function
----@param lhs string The left-hand side mapping
----@param rhs string The right-hand side mapping
----@param mode string The mode of the mapping
----@param original_mapping table The original mapping details
----@return function The mapping execution function
-local function create_mapping_executor(lhs, rhs, mode, original_mapping, command)
-	return function()
-		if rhs then
-			vim.api.nvim_feedkeys(add_count_and_registers(rhs), mode, false)
-		elseif lhs then
-			vim.api.nvim_feedkeys(add_count_and_registers(lhs), mode, false)
-		end
-
-		-- Execute additional command if provided
-		if command then
-			execute_with_count(command)
-		end
-	end
-end
-
 ---Hijacks a key mapping with custom behavior
 ---@param mode string The mode to hijack
 ---@param map string The key mapping to hijack
 ---@param original_mapping table The original mapping details
 ---@param command string|function|nil Additional command to execute
 function M.hijack(mode, lhs, rhs, original_mapping, command)
-	local execute_mapping = create_mapping_executor(lhs, rhs, mode, original_mapping, command)
-
-	-- remove mode whitespaces
 	mode = mode:gsub("%s+", "")
 	if mode == nil or mode == "" then
 		mode = "n"
 	end
+	local existing_mapping = vim.fn.maparg(lhs, "n", false, true)
 
-	-- Set up the new mapping
-	vim.keymap.set(mode, lhs, execute_mapping, {
+	vim.api.nvim_set_keymap(mode, lhs, "", {
 		noremap = true,
-		silent = true,
+		callback = function()
+			if command then
+				execute_with_count(command)
+			end
+
+			if existing_mapping and existing_mapping.callback then
+				existing_mapping.callback()
+			elseif existing_mapping and existing_mapping.rhs then
+				vim.api.nvim_feedkeys(
+					vim.api.nvim_replace_termcodes(existing_mapping.rhs, true, false, true),
+					"n",
+					true
+				)
+			else
+				vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(lhs, true, false, true), "n", true)
+			end
+		end,
 	})
 end
 

lua/tiny-glimmer/init.lua

@@ -29,8 +29,8 @@ M.config = {
 				},
 			},
 
-			next_mapping = "nzzzv",
-			prev_mapping = "Nzzzv",
+			next_mapping = "n",
+			prev_mapping = "N",
 		},
 		paste = {
 			enabled = true,