feat: nested nav buttons

Author: kawre

lua/leetcode/api/auth.lua

@@ -48,7 +48,8 @@ function Auth.handle(res, err)
         return nil, err
     end
 
-    config.auth = log.debug(auth) ---@diagnostic disable-line
+    config.auth = auth
+    log.debug(auth)
     return auth
 end
 

lua/leetcode/logger/init.lua

@@ -1,82 +1,60 @@
-local n_ok, notify = pcall(require, "notify")
-if n_ok then
-    vim.notify = notify
-end
-
 local config = require("leetcode.config")
-local t = require("leetcode.translator")
 local lvls = vim.log.levels
 
----@class lc.Logger
+---@class leet.Logger
+---@field trace fun(...)
+---@field debug fun(...)
+---@field info fun(...)
+---@field warn fun(...)
+---@field error fun(...)
+---@field off fun(...)
 local logger = {}
 
 local function normalize(msg)
-    return type(msg) == "string" and t(msg) or vim.inspect(msg)
+    if type(msg) == "string" then
+        return msg
+    else
+        return vim.inspect(msg, { depth = 3 })
+    end
 end
 
--- ---@private
--- ---@param msg any
--- ---@param lvl? integer
--- ---@return any
--- logger.log = vim.schedule_wrap(function(msg, lvl)
--- end)
-
-function logger.log(msg, lvl)
-    if not config.user.logging then
+---@private
+---@param lvl number
+---@param ... any
+function logger.log(lvl, ...)
+    if not config.debug and (lvl == lvls.DEBUG or lvl == lvls.TRACE) then
         return
     end
 
-    local title = config.name
-    lvl = lvl or lvls.INFO
-    msg = normalize(msg)
-
-    if lvl == lvls.DEBUG then
-        msg = debug.traceback(msg .. "\n")
-    end
-
-    vim.notify(msg, lvl, { title = title })
-end
-
----@param msg any
-logger.info = function(msg)
-    logger.log(msg)
-end
-
----@param msg any
-logger.warn = function(msg)
-    logger.log(msg, lvls.WARN)
-end
-
----@param msg any
-logger.error = function(msg)
-    logger.log(msg, lvls.ERROR)
-    logger.debug(msg)
+    local msg = table.concat(vim.tbl_map(normalize, { ... }), " ")
+    vim.notify(msg, lvl, {
+        title = config.name,
+        on_open = function(win)
+            local buf = vim.api.nvim_win_get_buf(win)
+            vim.api.nvim_set_option_value("filetype", "markdown", { buf = buf })
+            vim.api.nvim_set_option_value("spell", false, { win = win })
+        end,
+    })
 end
 
 ---@param err lc.err
 logger.err = function(err)
-    if not err then
-        return logger.error("error")
+    if not err or not err.msg then
+        return logger.error("unknown error")
     end
 
-    local msg = err.msg or ""
-    local lvl = err.lvl or lvls.ERROR
-
-    logger.log(msg, lvl)
-end
-
----@param msg any
----@param show? boolean
----@return any
-logger.debug = function(msg, show)
-    if not config.debug then
-        return msg
-    end
-
-    local lvl = (show == nil or not show) and lvls.DEBUG or lvls.ERROR
-    logger.log(msg, lvl)
-
-    return msg
-end
-
-return logger
+    logger.error(err.msg)
+end
+
+return setmetatable(logger, {
+    __index = function(_, key)
+        return function(...)
+            local lvl = lvls[key:upper()]
+            if lvl then
+                return logger.log(lvl, ...)
+            else
+                return logger.error("Invalid log level:", key)
+            end
+        end
+    end,
+})

lua/leetcode/theme/default.lua

@@ -91,8 +91,9 @@ M.get = function()
         -- menu button
         menu_button_icon = hl("Special"),
         menu_button_title = hl("Normal"),
-        menu_button_key = hl("Character"),
-
+        menu_button_nested = { fg = hl("Comment").fg },
+        menu_button_key = { fg = hl("Character").fg, italic = true },
+        -- menu footer
         menu_footer = hl("Comment"),
         menu_footer_username = hl("Label"),
     }

lua/leetcode/ui/menu/buttons.lua

@@ -1,10 +1,11 @@
 local markup = require("markup")
 
-local function Button(icon, title, key)
+local function Button(icon, title, key, nested)
     return markup.Inline({
         markup.Inline(icon, "leetcode_menu_button_icon"),
         markup.Inline(" "),
         markup.Inline(title, "leetcode_menu_button_title"),
+        markup.Inline(nested and " " or "", "leetcode_menu_button_nested"),
         markup.Inline("                              "),
         markup.Inline(key, "leetcode_menu_button_key"),
     })
@@ -14,11 +15,11 @@ return function()
     return markup.Flex({
         spacing = 1,
         children = {
-            Button("", "Problems", "p"),
-            Button("", "Statistics", "p"),
-            Button("󰆘", "Cookie", "p"),
-            Button("", "Cache", "p"),
-            Button("󰩈", "Exit", "p"),
+            Button("", "Problems", "p", true),
+            Button("", "Statistics", "s", true),
+            Button("󰆘", "Cookie", "i", true),
+            Button("", "Cache", "c", true),
+            Button("󰩈", "Exit", "qa"),
         },
     })
 end