refactor: better create cmd helper

Author: Robitx

lua/gp/helper.lua

@@ -255,16 +255,35 @@ end
 
 ---@param cmd_name string # name of the command
 ---@param cmd_func function # function to be executed when the command is called
----@param completion_func function | nil # optional function returning table for completion
----@param desc string |	nil # description of the command
-_H.create_user_command = function(cmd_name, cmd_func, completion_func, desc)
+---@param completion function | table | nil # optional function returning table for completion
+---@param desc string | nil # description of the command
+_H.create_user_command = function(cmd_name, cmd_func, completion, desc)
 	logger.debug("creating user command: " .. cmd_name)
 	vim.api.nvim_create_user_command(cmd_name, cmd_func, {
-		nargs = "?",
+		nargs = "*",
 		range = true,
 		desc = desc or "Gp.nvim command",
-		complete = function()
-			return completion_func and completion_func() or {}
+		complete = function(arg_lead, cmd_line, cursor_pos)
+			logger.debug(
+				"completing user command: "
+					.. cmd_name
+					.. "\narg_lead: "
+					.. arg_lead
+					.. "\ncmd_line: "
+					.. cmd_line
+					.. "\ncursor_pos: "
+					.. cursor_pos
+			)
+			if not completion then
+				return {}
+			end
+			if type(completion) == "function" then
+				return completion(arg_lead, cmd_line, cursor_pos) or {}
+			end
+			if type(completion) == "table" then
+				return completion
+			end
+			return {}
 		end,
 	})
 end

lua/gp/init.lua

@@ -30,6 +30,15 @@ local M = {
 -- Module helper functions and variables
 --------------------------------------------------------------------------------
 
+local agent_completion = function()
+	local buf = vim.api.nvim_get_current_buf()
+	local file_name = vim.api.nvim_buf_get_name(buf)
+	if M.not_chat(buf, file_name) == nil then
+		return M._chat_agents
+	end
+	return M._command_agents
+end
+
 -- setup function
 M._setup_called = false
 ---@param opts table | nil # table with options
@@ -175,25 +184,14 @@ M.setup = function(opts)
 		ChatPaste = { "popup", "split", "vsplit", "tabnew" },
 		ChatToggle = { "popup", "split", "vsplit", "tabnew" },
 		Context = { "popup", "split", "vsplit", "tabnew" },
+		Agent = agent_completion,
 	}
 
 	-- register default commands
+	M.helpers.create_user_command(M.config.cmd_prefix .. "Do", M.cmd.Do, do_completion)
 	for cmd, _ in pairs(M.cmd) do
 		if M.hooks[cmd] == nil then
-			M.helpers.create_user_command(M.config.cmd_prefix .. cmd, M.cmd[cmd], function()
-				if completions[cmd] then
-					return completions[cmd]
-				end
-				if cmd == "Agent" then
-					local buf = vim.api.nvim_get_current_buf()
-					local file_name = vim.api.nvim_buf_get_name(buf)
-					if M.not_chat(buf, file_name) == nil then
-						return M._chat_agents
-					end
-					return M._command_agents
-				end
-				return {}
-			end)
+			M.helpers.create_user_command(M.config.cmd_prefix .. cmd, M.cmd[cmd], completions[cmd])
 		end
 	end