From c7981c16cc8384bcd397eec250b74f96c616dcbd Mon Sep 17 00:00:00 2001 From: OGAWA Keiji <70509917+kibi2@users.noreply.github.com> Date: Tue, 13 Oct 2026 16:03:14 +0900 Subject: [PATCH] refactor: isolate logger instances --- lua/rush/init.lua | 3 +-- lua/rush/log.lua | 43 +++++++++++++++++++++++++++++++++++++++++++ tests/backend/nvim.sh | 2 +- 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 lua/rush/log.lua diff --git a/lua/rush/init.lua b/lua/rush/init.lua index da6ce46..fa447ee 100644 --- a/lua/rush/init.lua +++ b/lua/rush/init.lua @@ -1,5 +1,5 @@ local keyevent = require("keyevent.keyevent") -local log = require("keyevent.log") +local log = require("rush.log") local M = {} @@ -143,7 +143,6 @@ local function remove_metakeymap(bufnr) local ok, result = pcall(vim.keymap.del, mode, motion, { buffer = bufnr }) if not ok then - log.error({ mode, motion, bufnr }) log.error(result) end end diff --git a/lua/rush/log.lua b/lua/rush/log.lua new file mode 100644 index 0000000..47be93b --- /dev/null +++ b/lua/rush/log.lua @@ -0,0 +1,43 @@ +local ok, logger = pcall(require, "kibi2.logger") + +local names = { + "setup", + "debug", + "info", + "warn", + "error", + "probe", + "watch", + "assert", +} + +if not ok then + local noop = function() end + logger = {} + for _, name in ipairs(names) do + logger[name] = noop + end + logger.new = noop + logger.is_debug = noop +end + +-- ============================================================================= + +local M = {} +local log = logger.new() or {} + +-- ============================================================================= +-- Public API + +for _, name in ipairs(names) do + M[name] = function(...) + logger[name](log, ...) + end +end + +---@return boolean +function M.is_debug() + return logger.is_debug(log) == true +end + +return M diff --git a/tests/backend/nvim.sh b/tests/backend/nvim.sh index ea5eced..028c10e 100644 --- a/tests/backend/nvim.sh +++ b/tests/backend/nvim.sh @@ -29,7 +29,7 @@ backend_run() { [ -f run.env ] && . run.env env \ NVIM_APPNAME="${NVIM_APPNAME:-}" \ - NVIM_TIRENVI_DEV=1 \ + NVIM_KIBI2_DEV=1 \ $TEST_BIN --headless -u NONE -n \ --cmd "set rtp+=$ROOT_DIR/.deps/keyevent.nvim" \ -c "lua require('luacov')" \