feat: Repeat delete.

Author: kylechui

lua/nvim-surround/cache.lua

@@ -4,7 +4,7 @@ local M = {}
 
 ---@type { delimiters: string[][]|nil, line_mode: boolean, count: integer }
 M.normal = {}
----@type { char: string }
+---@type { char: string, count: integer }
 M.delete = {}
 ---@type { del_char: string, add_delimiters: add_func, line_mode: boolean }
 M.change = {}
@@ -13,7 +13,7 @@ M.change = {}
 ---@param func_name string A string representing the callback function's name.
 M.set_callback = function(func_name)
     vim.go.operatorfunc = "v:lua.require'nvim-surround.utils'.NOOP"
-    vim.cmd.normal({ "g@l", bang = true })
+    vim.cmd.normal({ [1] = "g@l", bang = true })
     vim.go.operatorfunc = func_name
 end
 

lua/nvim-surround/init.lua

@@ -176,7 +176,7 @@ M.delete_surround = function(args)
     -- Call the operatorfunc if it has not been called yet
     if not args then
         -- Clear the delete cache (since it was user-called)
-        cache.delete = {}
+        cache.delete = { count = vim.v.count1 }
 
         vim.go.operatorfunc = "v:lua.require'nvim-surround'.delete_callback"
         return "g@l"
@@ -338,18 +338,18 @@ M.delete_callback = function()
     local buffer = require("nvim-surround.buffer")
     local cache = require("nvim-surround.cache")
     local input = require("nvim-surround.input")
-    -- Save the current position of the cursor
-    local curpos = buffer.get_curpos()
     -- Get a character input if not cached
     cache.delete.char = cache.delete.char or input.get_char()
     if not cache.delete.char then
         return
     end
 
-    M.delete_surround({
-        del_char = cache.delete.char,
-        curpos = curpos,
-    })
+    for _ = 1, cache.delete.count do
+        M.delete_surround({
+            del_char = cache.delete.char,
+            curpos = buffer.get_curpos(),
+        })
+    end
 end
 
 M.change_callback = function()

tests/basics_spec.lua

@@ -866,4 +866,23 @@ describe("nvim-surround", function()
             "a sli<<<ghtly longer l>>>ine",
         })
     end)
+
+    it("can handle number prefixing for deleting surrounds", function()
+        set_lines({ "some {{{{more placeholder}}}} text" })
+        set_curpos({ 1, 6 })
+        vim.cmd("normal 2dsB")
+        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 2dsb")
+        check_lines({ "foo bar (baz)" })
+
+        set_lines({ "some ((more placeholder)) text" })
+        set_curpos({ 1, 6 })
+        vim.cmd("normal 3dsb")
+        check_lines({ "some more placeholder text" })
+    end)
 end)

tests/configuration_spec.lua

@@ -592,4 +592,27 @@ describe("configuration", function()
         assert.are.same(get_curpos(), { 1, 1 })
         check_lines({ "print('foo')" })
     end)
+
+    it("will handle number prefixing as if the user used dot-repeat", function()
+        require("nvim-surround").setup({ move_cursor = "sticky" })
+        set_lines({ "foo bar baz" })
+        set_curpos({ 1, 5 })
+        vim.cmd("normal 3ysiwb")
+        check_lines({ "foo (((bar))) baz" })
+        check_curpos({ 1, 8 })
+        vim.cmd("normal 2ySSa")
+        check_lines({
+            "<",
+            "<",
+            "foo (((bar))) baz",
+            ">",
+            ">",
+        })
+
+        set_lines({ "((foo) bar (baz))" })
+        set_curpos({ 1, 9 })
+        vim.cmd("normal 2dsb")
+        check_lines({ "(foo) bar baz" })
+        check_curpos({ 1, 8 })
+    end)
 end)