From 15031846d4018459acc028eb9f7623822d1d7a5f Mon Sep 17 00:00:00 2001 From: CPea Date: Sun, 6 Apr 2025 13:24:45 +0700 Subject: [PATCH 1/2] fix: correct warning log level --- lua/one_monokai/logs.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/one_monokai/logs.lua b/lua/one_monokai/logs.lua index 545046d..172b373 100644 --- a/lua/one_monokai/logs.lua +++ b/lua/one_monokai/logs.lua @@ -2,12 +2,12 @@ local logs = {} ---Display a notification to the user ----@param log_level string +---@param level vim.log.levels ---@param s string -local function notify(log_level, s, ...) +local function notify(level, s, ...) local message = string.format(s, ...) - vim.notify_once(message, log_level, { + vim.notify_once(message, level, { title = "One Monokai", }) end @@ -20,7 +20,7 @@ logs.notify = { notify(vim.log.levels.ERROR, s, ...) end, warning = function(s, ...) - notify(vim.log.levels.WARNING, s, ...) + notify(vim.log.levels.WARN, s, ...) end, } From 4f143b6835f63fafdee6ed47d51ba0089630a77e Mon Sep 17 00:00:00 2001 From: CPea Date: Sun, 6 Apr 2025 13:32:05 +0700 Subject: [PATCH 2/2] chore: simplify `logs` module --- lua/one_monokai/colors.lua | 4 ++-- lua/one_monokai/config.lua | 2 +- lua/one_monokai/highlights/init.lua | 2 +- lua/one_monokai/logs.lua | 29 ++++++++++++++++------------- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/lua/one_monokai/colors.lua b/lua/one_monokai/colors.lua index 1296fc4..ef925c5 100644 --- a/lua/one_monokai/colors.lua +++ b/lua/one_monokai/colors.lua @@ -81,7 +81,7 @@ local function get_hex_value(name, value) }) if not type_ok then - logs.notify.error(err) + logs.error(err) return defaults[name] end @@ -93,7 +93,7 @@ local function get_hex_value(name, value) local rgb = vim.api.nvim_get_color_by_name(value) if rgb == -1 then - logs.notify.error("colors(%s): %q is not a valid color", name, value) + logs.error("colors(%s): %q is not a valid color", name, value) return defaults[name] end diff --git a/lua/one_monokai/config.lua b/lua/one_monokai/config.lua index b3e6fd9..8cf79f7 100644 --- a/lua/one_monokai/config.lua +++ b/lua/one_monokai/config.lua @@ -27,7 +27,7 @@ function config.extend(opts) local logs = require "one_monokai.logs" if opts.themes then - logs.notify.warning( + logs.warning( "config: %q option has been deprecated and will be removed soon. Please update your config to use %q instead.", "themes", "highlights" diff --git a/lua/one_monokai/highlights/init.lua b/lua/one_monokai/highlights/init.lua index 92efa34..1241ded 100644 --- a/lua/one_monokai/highlights/init.lua +++ b/lua/one_monokai/highlights/init.lua @@ -10,7 +10,7 @@ local function set_highlight(groups) local status_ok, err = pcall(set_hl, 0, name, attrs) if not status_ok then - logs.notify.error("highlights(%s): %s", name, err) + logs.error("highlights(%s): %s", name, err) end end end diff --git a/lua/one_monokai/logs.lua b/lua/one_monokai/logs.lua index 172b373..fb2e82d 100644 --- a/lua/one_monokai/logs.lua +++ b/lua/one_monokai/logs.lua @@ -3,25 +3,28 @@ local logs = {} ---Display a notification to the user ---@param level vim.log.levels ----@param s string +---@param s string|number +---@param ... any local function notify(level, s, ...) local message = string.format(s, ...) - vim.notify_once(message, level, { + vim.notify(message, level, { title = "One Monokai", }) end ----@class notify ----@field error fun(s:string, ...) #Show error message ----@field warning fun(s: string, ...) #Show warning message -logs.notify = { - error = function(s, ...) - notify(vim.log.levels.ERROR, s, ...) - end, - warning = function(s, ...) - notify(vim.log.levels.WARN, s, ...) - end, -} +---Display an error message to the user +---@param s string|number +---@param ... any +logs.error = function(s, ...) + notify(vim.log.levels.ERROR, s, ...) +end + +---Display a warning message to the user +---@param s string|number +---@param ... any +logs.warning = function(s, ...) + notify(vim.log.levels.WARN, s, ...) +end return logs