feat: adding more macros

- context_file => with_file
- with_current_file
- with_repo_instructions

Author: Robitx

after/ftplugin/gpchat.lua

@@ -159,7 +159,8 @@ if not has_cmp then
 end
 
 M.macro.build_cmp_source("gpchat", {
-	require("gp.macros.context_file"),
+	require("gp.macros.with_file"),
+	require("gp.macros.with_repo_instructions"),
 })
 
 local sources = {

lua/gp/init.lua

@@ -200,38 +200,47 @@ M.setup = function(opts)
 
 	local ft_completion = M.macro.build_completion({
 		require("gp.macros.agent"),
-		require("gp.macros.context_file"),
 		require("gp.macros.target_filename"),
 		require("gp.macros.target_filetype"),
+		require("gp.macros.with_current_buf"),
+		require("gp.macros.with_file"),
+		require("gp.macros.with_repo_instructions"),
 	})
 
 	local base_completion = M.macro.build_completion({
 		require("gp.macros.agent"),
-		require("gp.macros.context_file"),
+		require("gp.macros.with_current_buf"),
+		require("gp.macros.with_file"),
+		require("gp.macros.with_repo_instructions"),
 	})
 
 	M.logger.debug("ft_completion done")
 
 	local do_completion = M.macro.build_completion({
 		require("gp.macros.agent"),
-		require("gp.macros.context_file"),
 		require("gp.macros.target"),
 		require("gp.macros.target_filename"),
 		require("gp.macros.target_filetype"),
+		require("gp.macros.with_current_buf"),
+		require("gp.macros.with_file"),
+		require("gp.macros.with_repo_instructions"),
 	})
 
 	M.logger.debug("do_completion done")
 
 	M.command_parser = M.macro.build_parser({
 		require("gp.macros.agent"),
-		require("gp.macros.context_file"),
 		require("gp.macros.target"),
 		require("gp.macros.target_filename"),
 		require("gp.macros.target_filetype"),
+		require("gp.macros.with_current_buf"),
+		require("gp.macros.with_file"),
+		require("gp.macros.with_repo_instructions"),
 	})
 
 	M.chat_parser = M.macro.build_parser({
-		require("gp.macros.context_file"),
+		require("gp.macros.with_file"),
+		require("gp.macros.with_repo_instructions"),
 	})
 
 	local completions = {
@@ -1665,25 +1674,6 @@ M.get_chat_agent = function(name)
 	}
 end
 
--- tries to find an .gp.md file in the root of current git repo
----@return string # returns instructions from the .gp.md file
-M.repo_instructions = function()
-	local git_root = M.helpers.find_git_root()
-
-	if git_root == "" then
-		return ""
-	end
-
-	local instruct_file = git_root .. "/.gp.md"
-
-	if vim.fn.filereadable(instruct_file) == 0 then
-		return ""
-	end
-
-	local lines = vim.fn.readfile(instruct_file)
-	return table.concat(lines, "\n")
-end
-
 M.cmd.Context = function(params)
 	M._toggle_close(M._toggle_kind.popup)
 	-- if there is no selection, try to close context toggle
@@ -1893,11 +1883,6 @@ M.Prompt = function(params, target, agent, template, prompt, whisper, callback)
 		sys_prompt = sys_prompt or ""
 		table.insert(messages, { role = "system", content = sys_prompt })
 
-		local repo_instructions = M.repo_instructions()
-		if repo_instructions ~= "" then
-			table.insert(messages, { role = "system", content = repo_instructions })
-		end
-
 		local user_prompt = M.render.prompt_template(template, command, selection, filetype, filename)
 		table.insert(messages, { role = "user", content = user_prompt })
 
@@ -2034,6 +2019,8 @@ M.Prompt = function(params, target, agent, template, prompt, whisper, callback)
 		command = command .. filetype
 		whisper = whisper and " " .. whisper or ""
 		command = command .. whisper
+		command = command .. " @with_repo_instructions"
+		command = command .. " @with_current_buf"
 		command = command .. " "
 
 		vim.api.nvim_feedkeys(command, "n", false)

lua/gp/macros/with_current_buf.lua

@@ -0,0 +1,48 @@
+local macro = require("gp.macro")
+local gp = require("gp")
+
+local M = {}
+
+---@type gp.Macro
+M = {
+	name = "with_current_buf",
+	description = "replaces the macro with the content of the current file",
+	default = nil,
+	max_occurrences = 1,
+
+	triggered = function(_)
+		return false
+	end,
+
+	completion = function(_)
+		return {}
+	end,
+
+	parser = function(result)
+		local template = result.template
+		local macro_pattern = "@with_current_buf"
+
+		local s, e = template:find(macro_pattern)
+		if not s then
+			return result
+		end
+
+		local placeholder = macro.generate_placeholder(M.name, "")
+
+		local current_buf = vim.api.nvim_get_current_buf()
+		local content = table.concat(vim.api.nvim_buf_get_lines(current_buf, 0, -1, false), "\n")
+		local full_path = vim.api.nvim_buf_get_name(current_buf)
+
+		content = gp.render.template(gp.config.template_context_file, {
+			["{{content}}"] = content,
+			["{{filename}}"] = full_path,
+		})
+		result.artifacts[placeholder] = content
+
+		result.template = template:sub(1, s - 1) .. placeholder .. template:sub(e + 1)
+
+		return result
+	end,
+}
+
+return M

lua/gp/macros/context_file.lua renamed to lua/gp/macros/with_file.lua

@@ -5,14 +5,14 @@ local M = {}
 
 ---@type gp.Macro
 M = {
-	name = "context_file`",
+	name = "with_file`",
 	description = "replaces the macro with the content of the specified file",
 	default = nil,
 	max_occurrences = 100,
 
 	triggered = function(params)
 		local cropped_line = params.cropped_line
-		return cropped_line:match("@context_file`[^`]*$")
+		return cropped_line:match("@with_file`[^`]*$")
 	end,
 
 	completion = function(params)
@@ -27,7 +27,7 @@ M = {
 
 	parser = function(result)
 		local template = result.template
-		local macro_pattern = "@context_file`([^`]*)`"
+		local macro_pattern = "@with_file`([^`]*)`"
 
 		for _ = 1, M.max_occurrences do
 			local s, e, value = template:find(macro_pattern)

lua/gp/macros/with_repo_instructions.lua

@@ -0,0 +1,62 @@
+local macro = require("gp.macro")
+local gp = require("gp")
+
+---@param git_root? string # optional git root directory
+---@return string # returns instructions from the .gp.md file
+local repo_instructions = function(git_root)
+	git_root = git_root or gp.helpers.find_git_root()
+
+	if git_root == "" then
+		return ""
+	end
+
+	local instruct_file = (git_root:gsub("/$", "")) .. "/.gp.md"
+
+	if vim.fn.filereadable(instruct_file) == 0 then
+		return ""
+	end
+
+	local lines = vim.fn.readfile(instruct_file)
+	return table.concat(lines, "\n")
+end
+
+local M = {}
+
+---@type gp.Macro
+M = {
+	name = "with_repo_instructions",
+	description = "replaces the macro with the content of the .gp.md file in the git root",
+	default = nil,
+	max_occurrences = 1,
+
+	triggered = function(_)
+		return false
+	end,
+
+	completion = function(_)
+		return {}
+	end,
+
+	parser = function(result)
+		local template = result.template
+		local macro_pattern = "@with_repo_instructions"
+
+		local s, e = template:find(macro_pattern)
+		if not s then
+			return result
+		end
+
+		local placeholder = macro.generate_placeholder(M.name, "")
+
+		local instructions = repo_instructions(result.state.context_dir)
+		result.artifacts[placeholder] = gp.render.template(gp.config.template_context_file, {
+			["{{content}}"] = instructions,
+			["{{filename}}"] = ".repository_instructions.md",
+		})
+
+		result.template = template:sub(1, s - 1) .. placeholder .. template:sub(e + 1)
+		return result
+	end,
+}
+
+return M