feat: Very jank way of supporting numeric prefixes for normal_surround.

Author: kylechui

lua/nvim-surround/cache.lua

@@ -2,7 +2,7 @@ local M = {}
 
 -- These variables hold cache values for dot-repeating the three actions
 
----@type { delimiters: string[][]|nil, line_mode: boolean }
+---@type { delimiters: string[][]|nil, line_mode: boolean, count: integer }
 M.normal = {}
 ---@type { char: string }
 M.delete = {}

lua/nvim-surround/init.lua

@@ -50,23 +50,26 @@ M.normal_surround = function(args)
     local config = require("nvim-surround.config")
     local buffer = require("nvim-surround.buffer")
     local cache = require("nvim-surround.cache")
+    local utils = require("nvim-surround.utils")
     -- Call the operatorfunc if it has not been called yet
     if not args.selection then
-        -- Clear the normal cache (since it was user-called)
-        cache.normal = { line_mode = args.line_mode }
+        -- Clear the normal cache's delimiters (since it was user-called)
+        cache.normal = { line_mode = args.line_mode, count = vim.v.count1 }
         M.normal_curpos = buffer.get_curpos()
         M.pending_surround = true
 
         vim.go.operatorfunc = "v:lua.require'nvim-surround'.normal_callback"
-        return "g@"
+        -- TODO: Very hacky way of supporting just 1 digit, need to find better way to set v:count to 1
+        return "<Del>g@"
     end
 
     local first_pos = args.selection.first_pos
     local last_pos = { args.selection.last_pos[1], args.selection.last_pos[2] + 1 }
 
+    local delimiters = utils.repeat_delimiters(args.delimiters, cache.normal.count)
     local sticky_pos = buffer.with_extmark(M.normal_curpos, function()
-        buffer.insert_text(last_pos, args.delimiters[2])
-        buffer.insert_text(first_pos, args.delimiters[1])
+        buffer.insert_text(last_pos, delimiters[2])
+        buffer.insert_text(first_pos, delimiters[1])
     end)
     buffer.restore_curpos({
         first_pos = first_pos,
@@ -75,7 +78,7 @@ M.normal_surround = function(args)
     })
 
     if args.line_mode then
-        config.get_opts().indent_lines(first_pos[1], last_pos[1] + #args.delimiters[1] + #args.delimiters[2] - 2)
+        config.get_opts().indent_lines(first_pos[1], last_pos[1] + #delimiters[1] + #delimiters[2] - 2)
     end
     M.pending_surround = false
 end

lua/nvim-surround/utils.lua

@@ -7,6 +7,22 @@ local M = {}
 -- Do nothing.
 M.NOOP = function() end
 
+-- Repeats a delimiter pair n times.
+---@param delimiters delimiter_pair The delimiters to be repeated.
+---@param n integer The number of times to repeat the delimiters.
+---@return delimiter_pair @The repeated delimiters.
+---@nodiscard
+M.repeat_delimiters = function(delimiters, n)
+    local acc = { { "" }, { "" } }
+    for _ = 1, n do
+        acc[1][#acc[1]] = acc[1][#acc[1]] .. delimiters[1][1]
+        vim.list_extend(acc[1], delimiters[1], 2)
+        acc[2][#acc[2]] = acc[2][#acc[2]] .. delimiters[2][1]
+        vim.list_extend(acc[2], delimiters[2], 2)
+    end
+    return acc
+end
+
 -- Gets the nearest two selections for the left and right surrounding pair.
 ---@param char string|nil A character representing what kind of surrounding pair is to be selected.
 ---@param action "delete"|"change" A string representing what action is being performed.