feat: Repeat change.

Author: kylechui

lua/nvim-surround/cache.lua

@@ -6,7 +6,7 @@ local M = {}
 M.normal = {}
 ---@type { char: string, count: integer }
 M.delete = {}
----@type { del_char: string, add_delimiters: add_func, line_mode: boolean }
+---@type { del_char: string, add_delimiters: add_func, line_mode: boolean, count: integer }
 M.change = {}
 
 -- Sets the callback function for dot-repeating.

lua/nvim-surround/init.lua

@@ -213,7 +213,7 @@ M.change_surround = function(args)
     -- Call the operatorfunc if it has not been called yet
     if not args.del_char or not args.add_delimiters then
         -- Clear the change cache (since it was user-called)
-        cache.change = { line_mode = args.line_mode }
+        cache.change = { line_mode = args.line_mode, count = vim.v.count1 }
 
         vim.go.operatorfunc = "v:lua.require'nvim-surround'.change_callback"
         return "g@l"
@@ -358,13 +358,16 @@ M.change_callback = function()
     local cache = require("nvim-surround.cache")
     local input = require("nvim-surround.input")
     local utils = require("nvim-surround.utils")
-    -- Save the current position of the cursor
-    local curpos = buffer.get_curpos()
-    if not cache.change.del_char or not cache.change.add_delimiters then
-        local del_char = config.get_alias(input.get_char())
-        local change = config.get_change(del_char)
+
+    local del_char = cache.change.del_char or config.get_alias(input.get_char())
+    local change = config.get_change(del_char)
+    if not (del_char and change) then
+        return
+    end
+
+    for _ = 1, cache.change.count do
         local selections = utils.get_nearest_selections(del_char, "change")
-        if not (del_char and change and selections) then
+        if not selections then
             return
         end
 
@@ -378,13 +381,15 @@ M.change_callback = function()
             end
         end
 
-        -- Get the new surrounding pair, querying the user for more input if no replacement is provided
-        local ins_char, delimiters
-        if change and change.replacement then
-            delimiters = change.replacement()
-        else
-            ins_char = input.get_char()
-            delimiters = config.get_delimiters(ins_char, cache.change.line_mode)
+        -- Get the new surrounding delimiter pair, prioritizing any delimiters in the cache
+        local delimiters = cache.change.add_delimiters and cache.change.add_delimiters()
+        if not delimiters then
+            if change and change.replacement then
+                delimiters = delimiters or change.replacement()
+            else
+                local ins_char = input.get_char()
+                delimiters = delimiters or config.get_delimiters(ins_char, cache.change.line_mode)
+            end
         end
 
         -- Clear the highlights after getting the replacement surround
@@ -400,11 +405,18 @@ M.change_callback = function()
                 return delimiters
             end,
             line_mode = cache.change.line_mode,
+            count = cache.change.count,
         }
+        M.change_surround({
+            del_char = del_char,
+            add_delimiters = function()
+                return delimiters
+            end,
+            line_mode = cache.change.line_mode,
+            count = cache.change.count,
+            curpos = buffer.get_curpos(),
+        })
     end
-    local args = vim.deepcopy(cache.change)
-    args.curpos = curpos
-    M.change_surround(args) ---@diagnostic disable-line: param-type-mismatch
 end
 
 return M

tests/basics_spec.lua

@@ -885,4 +885,23 @@ describe("nvim-surround", function()
         vim.cmd("normal 3dsb")
         check_lines({ "some more placeholder text" })
     end)
+
+    it("can handle number prefixing for changing surrounds", function()
+        set_lines({ "some {{{{more placeholder}}}} text" })
+        set_curpos({ 1, 11 })
+        vim.cmd("normal 2csBa")
+        check_lines({ "some {{<<more placeholder>>}} text" })
+        vim.cmd("normal .")
+        check_lines({ "some <<<<more placeholder>>>> text" })
+
+        set_lines({ "((foo) bar (baz))" })
+        set_curpos({ 1, 9 })
+        vim.cmd("normal 2csbB")
+        check_lines({ "{{foo} bar (baz)}" })
+
+        set_lines({ "some ((more placeholder)) text" })
+        set_curpos({ 1, 6 })
+        vim.cmd("normal 3csbr")
+        check_lines({ "some [[more placeholder]] text" })
+    end)
 end)

tests/configuration_spec.lua

@@ -614,5 +614,11 @@ describe("configuration", function()
         vim.cmd("normal 2dsb")
         check_lines({ "(foo) bar baz" })
         check_curpos({ 1, 8 })
+
+        set_lines({ "((foo) bar (baz))" })
+        set_curpos({ 1, 9 })
+        vim.cmd("normal 2csbr")
+        check_lines({ "[(foo) bar [baz]]" })
+        check_curpos({ 1, 9 })
     end)
 end)