fix: use a weak callback for mapping hacks

declancm · Jul 14, 2024 · 6ac53b8 · 6ac53b8
1 parent 4cced28
commit 6ac53b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/lua/cinnamon/config.lua b/lua/cinnamon/config.lua
@@ -11,6 +11,7 @@ local defaults = {
     ---@class ScrollOptions
     options = {
         callback = nil, ---@type function?
+        _weak_callback = nil, ---@type function?
         delay = 5, ---@type number
         step_size = {
             vertical = 1, ---@type number

diff --git a/lua/cinnamon/init.lua b/lua/cinnamon/init.lua
@@ -42,12 +42,12 @@ M.setup = function(user_config)
                 end)
             end
         end
-        vim.keymap.set("n", "n", function() M.scroll("n", { callback = next_search_cb }) end)
-        vim.keymap.set("n", "N", function() M.scroll("N", { callback = prev_search_cb }) end)
-        vim.keymap.set("n", "*", function() M.scroll("*", { callback = next_search_cb }) end)
-        vim.keymap.set("n", "#", function() M.scroll("#", { callback = prev_search_cb }) end)
-        vim.keymap.set("n", "g*", function() M.scroll("g*", { callback = next_search_cb }) end)
-        vim.keymap.set("n", "g#", function() M.scroll("g#", { callback = prev_search_cb }) end)
+        vim.keymap.set("n", "n", function() M.scroll("n", { _weak_callback = next_search_cb }) end)
+        vim.keymap.set("n", "N", function() M.scroll("N", { _weak_callback = prev_search_cb }) end)
+        vim.keymap.set("n", "*", function() M.scroll("*", { _weak_callback = next_search_cb }) end)
+        vim.keymap.set("n", "#", function() M.scroll("#", { _weak_callback = prev_search_cb }) end)
+        vim.keymap.set("n", "g*", function() M.scroll("g*", { _weak_callback = next_search_cb }) end)
+        vim.keymap.set("n", "g#", function() M.scroll("g#", { _weak_callback = prev_search_cb }) end)
 
         -- Previous/next cursor location:
         vim.keymap.set("n", "<C-o>", function() M.scroll("<C-o>") end)

diff --git a/lua/cinnamon/scroll.lua b/lua/cinnamon/scroll.lua
@@ -292,8 +292,9 @@ H.scroller = {
     end,
 
     cleanup = function(self)
-        if self.options.callback ~= nil then
-            local success, message = pcall(self.options.callback)
+        local callback = self.options.callback or self.options._weak_callback
+        if callback ~= nil then
+            local success, message = pcall(callback)
             if not success then
                 utils.notify("Error executing callback: " .. message, "warn")
             end