From 3b005ab8b46c6c65eca2bdeeab2ca011c0975324 Mon Sep 17 00:00:00 2001 From: Daniel Heras Quesada Date: Thu, 11 Sep 2025 16:30:52 +0200 Subject: [PATCH] refactor: options renamed --- lua/line-blame.lua | 3 --- lua/monkey-alert.lua | 46 +++++++++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/lua/line-blame.lua b/lua/line-blame.lua index 858dad7..e0cf872 100644 --- a/lua/line-blame.lua +++ b/lua/line-blame.lua @@ -41,9 +41,6 @@ local lineBlame = function(input_file_path, line_number, input_comma_separated_m end end --- lineBlame --- does everything the plugin needs xd --- @param blame_highlight: 'Normal' -- @param blame_position: 'eol' | 'overlay' | 'right_align' local fileBlame = function(input_file_path, input_comma_separated_mail_list, blame_text, blame_highlight, blame_position) local handler = io.popen("git blame -e " .. input_file_path .. " | awk '{print $2$6}'") diff --git a/lua/monkey-alert.lua b/lua/monkey-alert.lua index aa6c6fb..da142ee 100644 --- a/lua/monkey-alert.lua +++ b/lua/monkey-alert.lua @@ -5,38 +5,44 @@ local defaultBlameTextColor = "#bcb8b1" local defaultBlameText = "- Monkey alert 🐒" local defaultBlamePosition = "eol" -local function setup(opts) - vim.api.nvim_set_hl(0, 'Monkey', { fg = opts.blameTextColorHex or defaultBlameTextColor, bold = false }) - vim.g.monkeyMailList = opts.monkeyMailList or defaultList - vim.g.monkeyBlameText = opts.blameText or defaultBlameText - vim.g.monkeyBlamePosition = opts.blamePosition or defaultBlamePosition -end - -local function blameCurrentFile() - blame.fileBlame(vim.api.nvim_buf_get_name(0), vim.g.monkeyMailList, vim.g.monkeyBlameText, - "Monkey", vim.g.monkeyBlamePosition) -end - -local function blameCurrentLine() - local row = vim.api.nvim_win_get_cursor(0)[1] - blame.lineBlame(vim.api.nvim_buf_get_name(0), tonumber(row) - 1, vim.g.monkeyMailList, - vim.g.monkeyBlameText, - "Monkey", vim.g.monkeyBlamePosition) -end - local function clearBlame() blame.clearBlame() end +local function blameCurrentFile() + clearBlame() + blame.fileBlame(vim.api.nvim_buf_get_name(0), vim.g.monkey_mail_list, vim.g.monkey_blame_text, + "Monkey", vim.g.monkey_blame_position) +end + +local function blameCurrentLine() + clearBlame() + local row = vim.api.nvim_win_get_cursor(0)[1] + blame.lineBlame(vim.api.nvim_buf_get_name(0), tonumber(row) - 1, vim.g.monkey_mail_list, + vim.g.monkey_blame_text, + "Monkey", vim.g.monkey_blame_position) +end + local function enableOnLine() vim.api.nvim_create_autocmd("CursorMoved", { - callback = function(opts) + callback = function() clearBlame() blameCurrentLine() end, }) end +local function setup(opts) + vim.api.nvim_set_hl(0, 'Monkey', { fg = opts.blame_text_color_hex or defaultBlameTextColor, bold = false }) + vim.g.monkey_mail_list = opts.monkey_mail_list or defaultList + vim.g.monkey_blame_text = opts.blame_text or defaultBlameText + vim.g.monkey_blame_position = opts.blame_position or defaultBlamePosition + + if opts.auto_attach then + enableOnLine() + end +end + return { setup = setup, blameLine = blameCurrentLine,