diff options
author | Toby Vincent <tobyv13@gmail.com> | 2023-01-25 15:46:17 -0600 |
---|---|---|
committer | Toby Vincent <tobyv13@gmail.com> | 2023-01-25 15:47:27 -0600 |
commit | 82f428fc81dd30172e884cca64daf01ecc045f17 (patch) | |
tree | 744170877b6c0398b30e18563d886d3f7ea438e4 /nvim | |
parent | 55e0d5ff389db39e63e010298d867503f1e7d343 (diff) |
fix(nvim): clean up util module calls and dap
Diffstat (limited to 'nvim')
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/diagnostic.lua | 14 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/keymaps.lua | 6 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/dap.lua | 10 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/dap/events.lua | 54 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/dap/hover.lua | 48 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua | 20 |
6 files changed, 27 insertions, 125 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/diagnostic.lua b/nvim/.config/nvim/lua/tobyvin/diagnostic.lua index b976c64..b031cb1 100644 --- a/nvim/.config/nvim/lua/tobyvin/diagnostic.lua +++ b/nvim/.config/nvim/lua/tobyvin/diagnostic.lua @@ -1,4 +1,4 @@ -local utils = require("tobyvin.utils") +local utils = require("tobyvin.utils.diagnostic") vim.diagnostic.config({ virtual_text = { @@ -14,13 +14,13 @@ vim.diagnostic.config({ }, }) -vim.fn.sign_define("DiagnosticSignError", utils.diagnostic.signs.error) -vim.fn.sign_define("DiagnosticSignWarn", utils.diagnostic.signs.warn) -vim.fn.sign_define("DiagnosticSignInfo", utils.diagnostic.signs.info) -vim.fn.sign_define("DiagnosticSignHint", utils.diagnostic.signs.hint) +vim.fn.sign_define("DiagnosticSignError", utils.signs.error) +vim.fn.sign_define("DiagnosticSignWarn", utils.signs.warn) +vim.fn.sign_define("DiagnosticSignInfo", utils.signs.info) +vim.fn.sign_define("DiagnosticSignHint", utils.signs.hint) -vim.keymap.set("n", "]d", utils.diagnostic.goto_next, { desc = "next diagnostic" }) -vim.keymap.set("n", "[d", utils.diagnostic.goto_prev, { desc = "prev diagnostic" }) +vim.keymap.set("n", "]d", utils.goto_next, { desc = "next diagnostic" }) +vim.keymap.set("n", "[d", utils.goto_prev, { desc = "prev diagnostic" }) vim.keymap.set("n", "gl", vim.diagnostic.open_float, { desc = "open diagnostic float" }) vim.keymap.set("n", "gL", vim.diagnostic.setqflist, { desc = "qf diagnostic" }) diff --git a/nvim/.config/nvim/lua/tobyvin/keymaps.lua b/nvim/.config/nvim/lua/tobyvin/keymaps.lua index 57a7cd3..25fe39a 100644 --- a/nvim/.config/nvim/lua/tobyvin/keymaps.lua +++ b/nvim/.config/nvim/lua/tobyvin/keymaps.lua @@ -1,7 +1,5 @@ -local utils = require("tobyvin.utils") - local hover = function() - if utils.hover.open() then + if require("tobyvin.utils.hover").open() then -- Fix for diagnostics immediately overriding hover window vim.api.nvim_command("set eventignore=CursorHold") vim.api.nvim_command('autocmd CursorMoved <buffer> ++once set eventignore=""') @@ -11,7 +9,7 @@ local hover = function() end local external_docs = function() - if utils.documentation.open() then + if require("tobyvin.utils.documentation").open() then return "<Ignore>" end return "gx" diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua b/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua index 96d7002..b16a22f 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua @@ -48,8 +48,14 @@ function M.config() require("dap").defaults.fallback.focus_terminal = true require("dap").defaults.fallback.terminal_win_cmd = "15split new" - require("tobyvin.plugins.dap.events").setup() - require("tobyvin.plugins.dap.hover").setup() + require("dap").listeners.after.event_initialized["User"] = function() + vim.api.nvim_exec_autocmds("User", { pattern = "DapAttach" }) + end + + require("dap").listeners.before.event_terminated["User"] = function() + vim.api.nvim_exec_autocmds("User", { pattern = "DapDetach" }) + require("dap").repl.close() + end local configs = require("tobyvin.plugins.dap.configs") for name, config in pairs(configs) do diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap/events.lua b/nvim/.config/nvim/lua/tobyvin/plugins/dap/events.lua deleted file mode 100644 index 6a9cd0a..0000000 --- a/nvim/.config/nvim/lua/tobyvin/plugins/dap/events.lua +++ /dev/null @@ -1,54 +0,0 @@ -local utils = require("tobyvin.utils") -local M = {} - -local progress_start = function(session, body) - local notif_data = utils.debug.get_notif_data("dap", body.progressId) - - local message = utils.debug.format_message(body.message, body.percentage) - notif_data.notification = vim.notify(message, vim.log.levels.INFO, { - title = utils.debug.format_title(body.title, session.config.type), - icon = utils.status.signs.spinner.text[1], - timeout = false, - hide_from_history = false, - }) - - ---@diagnostic disable-next-line: redundant-value - notif_data.notification.spinner = 1, utils.status.update_spinner("dap", body.progressId) -end - -local progress_update = function(_, body) - local notif_data = utils.debug.get_notif_data("dap", body.progressId) - notif_data.notification = - vim.notify(utils.debug.format_message(body.message, body.percentage), vim.log.levels.INFO, { - replace = notif_data.notification, - hide_from_history = false, - }) -end - -local progress_end = function(_, body) - local notif_data = utils.debug.notifs["dap"][body.progressId] - notif_data.notification = - vim.notify(body.message and utils.debug.format_message(body.message) or "Complete", vim.log.levels.INFO, { - icon = utils.status.signs.complete.text, - replace = notif_data.notification, - timeout = 3000, - }) - notif_data.spinner = nil -end - -M.setup = function() - local dap = require("dap") - - dap.listeners.after.event_initialized["User"] = function() - vim.api.nvim_exec_autocmds("User", { pattern = "DapAttach" }) - end - dap.listeners.before.event_terminated["User"] = function() - vim.api.nvim_exec_autocmds("User", { pattern = "DapDetach" }) - dap.repl.close() - end - dap.listeners.before.event_progressStart["progress-notifications"] = progress_start - dap.listeners.before.event_progressUpdate["progress-notifications"] = progress_update - dap.listeners.before.event_progressEnd["progress-notifications"] = progress_end -end - -return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap/hover.lua b/nvim/.config/nvim/lua/tobyvin/plugins/dap/hover.lua deleted file mode 100644 index 8cc13b6..0000000 --- a/nvim/.config/nvim/lua/tobyvin/plugins/dap/hover.lua +++ /dev/null @@ -1,48 +0,0 @@ -local utils = require("tobyvin.utils") -local M = {} - -M.hover_available = function() - local session = require("dap").session() - if not session then - return false - end - local frame = session.current_frame or {} - ---@diagnostic disable-next-line: missing-parameter - local scopes = frame.scopes or {} - local expression = vim.fn.expand("<cexpr>") - for _, s in pairs(scopes) do - local variable = s.variables and s.variables[expression] - if variable then - return true - end - end - return session:evaluate(expression, function(err) - if not err then - return true - end - return false - end) -end - -M.setup = function() - local dap_hover_id - vim.api.nvim_create_autocmd("User", { - pattern = "DapAttach", - callback = function() - dap_hover_id = utils.hover.register(require("dap.ui.widgets").hover, { - desc = "dap", - enabled = M.hover_available, - priority = 20, - }) - end, - }) - - vim.api.nvim_create_autocmd("User", { - pattern = "DapDetach", - callback = function() - utils.hover.unregister(dap_hover_id) - end, - }) -end - -return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua b/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua index bfb1075..0edc5e2 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua @@ -10,7 +10,7 @@ local M = { function M.config() local lualine = require("lualine") - local utils = require("tobyvin.utils") + local utils = require("tobyvin.utils.diagnostic") local winbar_cond = function() return vim.bo.buflisted and (vim.fn.bufname() ~= "" or require("nvim-navic").is_available()) @@ -53,19 +53,19 @@ function M.config() lualine_c = { { "diagnostics", - source = { utils.diagnostic.count }, + source = { utils.count }, symbols = { - error = utils.diagnostic.signs.error.text, - warn = utils.diagnostic.signs.warn.text, - info = utils.diagnostic.signs.info.text, - hint = utils.diagnostic.signs.hint.text, + error = utils.signs.error.text, + warn = utils.signs.warn.text, + info = utils.signs.info.text, + hint = utils.signs.hint.text, }, diagnostics_color = { - error = utils.diagnostic.signs.error.hl, - warn = utils.diagnostic.signs.warn.hl, - info = utils.diagnostic.signs.info.hl, - hint = utils.diagnostic.signs.hint.hl, + error = utils.signs.error.hl, + warn = utils.signs.warn.hl, + info = utils.signs.info.hl, + hint = utils.signs.hint.hl, }, update_in_insert = true, color = "StatusLineNC", |