From: Samir Benmendil Date: Thu, 27 Feb 2025 00:13:25 +0000 (+0000) Subject: nvim: configure dap X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/71d8ed08696bb8e807b1d1518c55fd5885ed8c98?ds=sidebyside nvim: configure dap --- diff --git a/nvim/lua/plugins/dap.lua b/nvim/lua/plugins/dap.lua index 483d40f..46840f7 100644 --- a/nvim/lua/plugins/dap.lua +++ b/nvim/lua/plugins/dap.lua @@ -1,138 +1,106 @@ ----@param config {args?:string[]|fun():string[]?} +---@param config {type?:string, args?:string[]|fun():string[]?} local function get_args(config) - local args = type(config.args) == "function" and (config.args() or {}) or config.args or {} + local args = type(config.args) == "function" and (config.args() or {}) or config.args or {} --[[@as string[] | string ]] + local args_str = type(args) == "table" and table.concat(args, " ") or args --[[@as string]] + config = vim.deepcopy(config) ---@cast args string[] config.args = function() - local new_args = vim.fn.input("Run with args: ", table.concat(args, " ")) --[[@as string]] - return vim.split(vim.fn.expand(new_args) --[[@as string]], " ") + local new_args = vim.fn.expand(vim.fn.input("Run with args: ", args_str)) --[[@as string]] + return require("dap.utils").splitstr(new_args) end return config end return { - "mfussenegger/nvim-dap", - - dependencies = { - -- fancy UI for the debugger - { + { "mfussenegger/nvim-dap", + dependencies = { "rcarriga/nvim-dap-ui", - -- stylua: ignore - keys = { - { "du", function() require("dapui").toggle({ }) end, desc = "Dap UI" }, - { "de", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "v"} }, + { "theHamsta/nvim-dap-virtual-text", -- virtual text for the debugger + opts = {}, }, - opts = {}, - config = function(_, opts) - local dap = require("dap") - local dapui = require("dapui") - dapui.setup(opts) - dap.listeners.after.event_initialized["dapui_config"] = function() - dapui.open({}) - end - end, }, - -- virtual text for the debugger - { - "theHamsta/nvim-dap-virtual-text", - opts = {}, + -- stylua: ignore + keys = { + { "dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" }, + { "db", function() require("dap").toggle_breakpoint() end, desc = "Toggle Breakpoint" }, + { "dc", function() require("dap").continue() end, desc = "Run/Continue" }, + { "da", function() require("dap").continue({ before = get_args }) end, desc = "Run with Args" }, + { "dC", function() require("dap").run_to_cursor() end, desc = "Run to Cursor" }, + { "", function() require("dap").run_to_cursor() end, desc = "Run to Cursor" }, + { "dg", function() require("dap").goto_() end, desc = "Go to Line (No Execute)" }, + { "di", function() require("dap").step_into() end, desc = "Step Into" }, + { "", function() require("dap").step_into() end, desc = "Step Into" }, + { "dj", function() require("dap").down() end, desc = "Down" }, + { "dk", function() require("dap").up() end, desc = "Up" }, + { "dl", function() require("dap").run_last() end, desc = "Run Last" }, + { "do", function() require("dap").step_out() end, desc = "Step Out" }, + { "", function() require("dap").step_out() end, desc = "Step Over" }, + { "dO", function() require("dap").step_over() end, desc = "Step Over" }, + { "", function() require("dap").step_over() end, desc = "Step Over" }, + { "dP", function() require("dap").pause() end, desc = "Pause" }, + { "dr", function() require("dap").repl.toggle() end, desc = "Toggle REPL" }, + { "ds", function() require("dap").session() end, desc = "Session" }, + { "dt", function() require("dap").terminate() end, desc = "Terminate" }, + { "dw", function() require("dap.ui.widgets").hover() end, desc = "Widgets" }, }, - -- mason.nvim integration - { - "jay-babu/mason-nvim-dap.nvim", - dependencies = "mason.nvim", - cmd = { "DapInstall", "DapUninstall" }, - opts = { - -- Makes a best effort to setup the various debuggers with - -- reasonable debug configurations - automatic_installation = true, + config = function() + -- load mason-nvim-dap here, after all adapters have been setup + require("mason-nvim-dap").setup(rmz.lazy.opts("mason-nvim-dap.nvim")) - -- You can provide additional configuration to the handlers, - -- see mason-nvim-dap README for more information - handlers = {}, - }, - }, - { - "jbyuki/one-small-step-for-vimkind", - -- stylua: ignore - keys = { - { "daL", function() require("osv").launch({ port = 8086 }) end, desc = "Adapter Lua Server" }, - { "dal", function() require("osv").run_this() end, desc = "Adapter Lua" }, - }, - config = function() - local dap = require("dap") - dap.adapters.nlua = function(callback, config) - local adapter = { - type = "server", - host = config.host or "127.0.0.1", - port = config.port or 8086, - } - if config.start_neovim then - local dap_run = dap.run - dap.run = function(c) - adapter.port = c.port - adapter.host = c.host - end - require("osv").run_this() - dap.run = dap_run - end - callback(adapter) - end - dap.configurations.lua = { - { - type = "nlua", - request = "attach", - name = "Run this file", - start_neovim = {}, - }, - { - type = "nlua", - request = "attach", - name = "Attach to running Neovim instance (port 8086)", - port = 8086, - }, - } - end, + vim.api.nvim_set_hl(0, "DapStoppedLine", { default = true, link = "Visual" }) + + for name, sign in pairs(rmz.ui.icons.dap) do + sign = type(sign) == "table" and sign or { sign } ---@cast sign table + vim.fn.sign_define( + "Dap" .. name, + { text = sign[1], texthl = sign[2] or "DiagnosticInfo", linehl = sign[3], numhl = sign[3] } + ) + end + + -- setup dap config by VsCode launch.json file + local vscode = require("dap.ext.vscode") + local json = require("plenary.json") + vscode.json_decode = function(str) + return vim.json.decode(json.json_strip_comments(str)) + end + end, + }, + { "mason.nvim", + opts = { + log_level = vim.log.levels.TRACE, + } + }, + { "rcarriga/nvim-dap-ui", -- fancy UI for the debugger + dependencies = { "nvim-neotest/nvim-nio" }, + -- stylua: ignore + keys = { + { "du", function() require("dapui").toggle({ }) end, desc = "Dap UI" }, + { "de", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "v"} }, }, + opts = {}, + config = function(_, opts) + local dap = require("dap") + local dapui = require("dapui") + dapui.setup(opts) + dap.listeners.after.event_initialized["dapui_config"] = function() + dapui.open({}) + end + end, }, - - -- stylua: ignore - keys = { - { "dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" }, - { "db", function() require("dap").toggle_breakpoint() end, desc = "Toggle Breakpoint" }, - { "dc", function() require("dap").continue() end, desc = "Continue" }, - { "da", function() require("dap").continue({ before = get_args }) end, desc = "Run with Args" }, - { "dC", function() require("dap").run_to_cursor() end, desc = "Run to Cursor" }, - { "", function() require("dap").run_to_cursor() end, desc = "Run to Cursor" }, - { "dg", function() require("dap").goto_() end, desc = "Go to line (no execute)" }, - { "di", function() require("dap").step_into() end, desc = "Step Into" }, - { "", function() require("dap").step_into() end, desc = "Step Into" }, - { "dj", function() require("dap").down() end, desc = "Down" }, - { "dk", function() require("dap").up() end, desc = "Up" }, - { "dl", function() require("dap").run_last() end, desc = "Run Last" }, - { "do", function() require("dap").step_out() end, desc = "Step Out" }, - { "", function() require("dap").step_out() end, desc = "Step Over" }, - { "dO", function() require("dap").step_over() end, desc = "Step Over" }, - { "", function() require("dap").step_over() end, desc = "Step Over" }, - { "dp", function() require("dap").pause() end, desc = "Pause" }, - { "dr", function() require("dap").repl.toggle() end, desc = "Toggle REPL" }, - { "ds", function() require("dap").session() end, desc = "Session" }, - { "dt", function() require("dap").terminate() end, desc = "Terminate" }, - { "dw", function() require("dap.ui.widgets").hover() end, desc = "Widgets" }, + -- mason.nvim integration + { "jay-babu/mason-nvim-dap.nvim", + dependencies = "mason.nvim", + cmd = { "DapInstall", "DapUninstall" }, + opts_extend = { "ensure_installed" }, + opts = { + automatic_installation = true, + handlers = {}, + ensure_installed = { }, + }, + -- mason-nvim-dap is loaded when nvim-dap loads + config = function() end, }, - - config = function() - local Config = require("lazyvim.config") - vim.api.nvim_set_hl(0, "DapStoppedLine", { default = true, link = "Visual" }) - - for name, sign in pairs(Config.icons.dap) do - sign = type(sign) == "table" and sign or { sign } - vim.fn.sign_define( - "Dap" .. name, - { text = sign[1], texthl = sign[2] or "DiagnosticInfo", linehl = sign[3], numhl = sign[3] } - ) - end - end, } diff --git a/nvim/lua/plugins/lang/nlua.lua b/nvim/lua/plugins/lang/nlua.lua new file mode 100644 index 0000000..f604b6f --- /dev/null +++ b/nvim/lua/plugins/lang/nlua.lua @@ -0,0 +1,42 @@ +return { + "mfussenegger/nvim-dap", + dependencies = { + { + "jbyuki/one-small-step-for-vimkind", + config = function() + local dap = require("dap") + dap.adapters.nlua = function(callback, conf) + local adapter = { + type = "server", + host = conf.host or "127.0.0.1", + port = conf.port or 8086, + } + if conf.start_neovim then + local dap_run = dap.run + dap.run = function(c) + adapter.port = c.port + adapter.host = c.host + end + require("osv").run_this() + dap.run = dap_run + end + callback(adapter) + end + dap.configurations.lua = { + { + type = "nlua", + request = "attach", + name = "Run this file", + start_neovim = {}, + }, + { + type = "nlua", + request = "attach", + name = "Attach to running Neovim instance (port = 8086)", + port = 8086, + }, + } + end, + }, + }, +}