refactor: hooks order

Author: kawre

lua/leetcode-ui/popup/console/testcase.lua

@@ -127,6 +127,8 @@ function Testcase:reset()
 end
 
 function Testcase:append(input)
+    -- pcall(vim.cmd.undojoin)
+
     local s = vim.split(input, "\n", { trimempty = true })
 
     local lines = vim.api.nvim_buf_get_lines(self.bufnr, 0, -1, true)

lua/leetcode-ui/question.lua

@@ -47,7 +47,7 @@ function Question:reset_lines()
     local new_lines = self:snippet(true) or ""
 
     vim.schedule(function() --
-        log.info("Previous code found, resetting…\nTo undo, simply press `u`")
+        log.info("Previous code found and reseted\nTo undo, simply press `u`")
     end)
 
     self:set_lines(new_lines)
@@ -105,7 +105,7 @@ function Question:open_buffer(existed, loaded)
     end
 
     if not loaded then
-        utils.exec_hook("question_enter", self)
+        utils.exec_hooks("question_enter", self)
         self:autocmds()
     end
 end
@@ -183,7 +183,7 @@ local group = vim.api.nvim_create_augroup("leetcode_questions", { clear = true }
 function Question:autocmds()
     vim.api.nvim_create_autocmd("WinClosed", {
         group = group,
-        buffer = self.bufnr,
+        pattern = tostring(self.winid),
         callback = function() self:unmount() end,
     })
 end

lua/leetcode.lua

@@ -58,7 +58,7 @@ function leetcode.start(on_vimenter)
     Menu():mount()
 
     local utils = require("leetcode.utils")
-    utils.exec_hook("enter")
+    utils.exec_hooks("enter")
 
     return true
 end

lua/leetcode/api/interpreter.lua

@@ -50,7 +50,7 @@ function interpreter.listener(id, callback)
                 item = interpreter:handle_item(item)
                 callback(item)
             else -- still judging
-                local intervals = config.auth.is_premium and { 500, 500 } or { 500, 1000 }
+                local intervals = config.auth.is_premium and { 450, 450 } or { 450, 900 }
                 local interval = item.sate == "STARTED" and intervals[2] or intervals[1]
                 callback(nil, item.state)
                 vim.defer_fn(listen, interval)

lua/leetcode/config/hooks.lua

@@ -2,11 +2,11 @@
 local hooks = {}
 
 hooks["question_enter"] = {
-    function(q)
+    vim.schedule_wrap(function(q)
         -- https://github.com/kawre/leetcode.nvim/issues/14
         if q.lang ~= "rust" then return end
         pcall(function() require("rust-tools.standalone").start_standalone_client() end)
-    end,
+    end),
 }
 
 return hooks

lua/leetcode/utils.lua

@@ -74,22 +74,21 @@ end
 ---@param event lc.hook
 ---@return fun()[]|nil
 function utils.get_hooks(event)
-    local defaults = config.hooks[event] or {}
     local fns = config.user.hooks[event]
-
     if not fns then return end
 
     if type(fns) == "function" then fns = { fns } end
-    return vim.list_extend(defaults, fns)
+
+    return vim.list_extend(fns, config.hooks[event] or {})
 end
 
 ---@param event lc.hook
-function utils.exec_hook(event, ...)
+function utils.exec_hooks(event, ...)
     local fns = utils.get_hooks(event)
     if not fns then return log.error("unknown hook event: " .. event) end
 
     for i, fn in ipairs(fns) do
-        local ok, msg = pcall(vim.schedule_wrap(fn), ...)
+        local ok, msg = pcall(fn, ...)
         if not ok then log.error(("bad hook #%d in `%s` event: %s"):format(i, event, msg)) end
     end
 end