refactor: no state across macro completion

Author: Robitx

lua/gp/init.lua

@@ -197,15 +197,15 @@ M.setup = function(opts)
 
 	local ft_completion = M.macro.build_completion({
 		require("gp.macros.target_filetype"),
-	}, {})
+	})
 
 	M.logger.debug("ft_completion done")
 
 	local do_completion = M.macro.build_completion({
 		require("gp.macros.target"),
 		require("gp.macros.target_filetype"),
 		require("gp.macros.target_filename"),
-	}, {})
+	})
 
 	M.logger.debug("do_completion done")
 

lua/gp/macro.lua

@@ -25,8 +25,8 @@ local logger = require("gp.logger")
 ---@field description string
 ---@field default? string
 ---@field max_occurrences? number
----@field triggered fun(params: gp.Macro_cmd_params, state: table): boolean
----@field completion fun(params: gp.Macro_cmd_params, state: table): string[]
+---@field triggered fun(params: gp.Macro_cmd_params): boolean
+---@field completion fun(params: gp.Macro_cmd_params): string[]
 ---@field parser fun(params: gp.Macro_parser_result): gp.Macro_parser_result
 
 ---@param value string # string to hash
@@ -81,21 +81,20 @@ M.build_parser = function(macros)
 end
 
 ---@param macros gp.Macro[]
----@param state table
----@return fun(arg_lead: string, cmd_line: string, cursor_pos: number): string[]
-M.build_completion = function(macros, state)
+---@param raw boolean | nil # which function to return (completion or raw_completion)
+---@return fun(arg_lead: string, cmd_line: string, cursor_pos: number): string[], boolean | nil
+M.build_completion = function(macros, raw)
 	---@type table<string, gp.Macro>
 	local map = {}
 	for _, macro in pairs(macros) do
 		map[macro.name] = macro
-		state[macro.name .. "_default"] = macro.default
 	end
 
 	---@param arg_lead string
 	---@param cmd_line string
 	---@param cursor_pos number
-	---@return string[]
-	local function completion(arg_lead, cmd_line, cursor_pos)
+	---@return string[], boolean # returns suggestions and whether some macro was triggered
+	local function raw_completion(arg_lead, cmd_line, cursor_pos)
 		local cropped_line = cmd_line:sub(1, cursor_pos)
 
 		---@type gp.Macro_cmd_params
@@ -106,11 +105,13 @@ M.build_completion = function(macros, state)
 			cropped_line = cropped_line,
 		}
 
+		cropped_line = " " .. cropped_line
+
 		local suggestions = {}
+		local triggered = false
 
 		logger.debug("macro completion input: " .. vim.inspect({
 			params = params,
-			state = state,
 		}))
 
 		---@type table<string, number>
@@ -122,8 +123,9 @@ M.build_completion = function(macros, state)
 		end
 		logger.debug("macro completion candidates: " .. vim.inspect(candidates))
 
-		if cand and map[cand] and map[cand].triggered(params, state) then
-			suggestions = map[cand].completion(params, state)
+		if cand and map[cand] and map[cand].triggered(params) then
+			suggestions = map[cand].completion(params)
+			triggered = true
 		elseif cropped_line:match("%s$") or cropped_line:match("%s@%S*$") then
 			for _, c in pairs(macros) do
 				if not candidates[c.name] or candidates[c.name] < c.max_occurrences then
@@ -133,7 +135,16 @@ M.build_completion = function(macros, state)
 		end
 
 		logger.debug("macro completion suggestions: " .. vim.inspect(suggestions))
-		return vim.deepcopy(suggestions)
+		return vim.deepcopy(suggestions), triggered
+	end
+
+	local completion = function(arg_lead, cmd_line, cursor_pos)
+		local suggestions, _ = raw_completion(arg_lead, cmd_line, cursor_pos)
+		return suggestions
+	end
+
+	if raw then
+		return raw_completion
 	end
 
 	return completion

lua/gp/macros/target.lua

@@ -20,12 +20,11 @@ M = {
 	default = "rewrite",
 	max_occurrences = 1,
 
-	triggered = function(params, state)
-		local cropped_line = params.cropped_line
-		return cropped_line:match("@target%s+%S*$")
+	triggered = function(params)
+		return params.cropped_line:match("@target%s+%S*$")
 	end,
 
-	completion = function(params, state)
+	completion = function(params)
 		return values
 	end,
 

lua/gp/macros/target_filename.lua

@@ -9,12 +9,12 @@ M = {
 	default = nil,
 	max_occurrences = 1,
 
-	triggered = function(params, state)
+	triggered = function(params)
 		local cropped_line = params.cropped_line
 		return cropped_line:match("@target_filename`[^`]*$")
 	end,
 
-	completion = function(params, state)
+	completion = function(params)
 		-- TODO state.root_dir ?
 		local files = vim.fn.glob("**", true, true)
 		-- local files = vim.fn.getcompletion("", "file")

lua/gp/macros/target_filetype.lua

@@ -11,12 +11,11 @@ M = {
 	default = "markdown",
 	max_occurrences = 1,
 
-	triggered = function(params, state)
-		local cropped_line = params.cropped_line
-		return cropped_line:match("@target_filetype%s+%S*$")
+	triggered = function(params)
+		return params.cropped_line:match("@target_filetype%s+%S*$")
 	end,
 
-	completion = function(params, state)
+	completion = function(params)
 		return values
 	end,