From 08272d684fbe515a674a4fbc88f106f84547c435 Mon Sep 17 00:00:00 2001 From: mequidis Date: Fri, 24 Jun 2022 19:11:25 +0300 Subject: [PATCH] nvim: dap -> termdebug --- .config/nvim/init.lua | 1 + .config/nvim/lua/debug.lua | 27 +++++++ .config/nvim/lua/mappings.lua | 42 +++-------- .config/nvim/lua/plugins.lua | 20 ----- .config/nvim/lua/plugins/dap-virtual-text.lua | 1 - .config/nvim/lua/plugins/dap.lua | 75 ------------------- .config/nvim/lua/plugins/whichkey.lua | 27 ++----- 7 files changed, 45 insertions(+), 148 deletions(-) create mode 100644 .config/nvim/lua/debug.lua delete mode 100644 .config/nvim/lua/plugins/dap-virtual-text.lua delete mode 100644 .config/nvim/lua/plugins/dap.lua diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 3d63931..ec16da0 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -6,5 +6,6 @@ end require("plugins") load("options") load("mappings") +load("debug") load("disablebuiltin") load("colors") diff --git a/.config/nvim/lua/debug.lua b/.config/nvim/lua/debug.lua new file mode 100644 index 0000000..4044503 --- /dev/null +++ b/.config/nvim/lua/debug.lua @@ -0,0 +1,27 @@ +-- enable termdebug +vim.cmd("packadd termdebug") + +vim.api.nvim_create_autocmd("FileType", { + pattern = { + "go", + "c", + "c++", + }, + callback = function() + vim.g.termdebugger = "gdb" + end, +}) + +vim.api.nvim_create_autocmd("FileType", { + pattern = "rust", + callback = function() + vim.g.termdebugger = "rust-gdb" + end, +}) + +vim.api.nvim_create_autocmd("FileType", { + pattern = "python", + callback = function() + vim.g.termdebugger = "pdbpp" + end, +}) diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua index a717a55..8d45df5 100644 --- a/.config/nvim/lua/mappings.lua +++ b/.config/nvim/lua/mappings.lua @@ -60,7 +60,7 @@ vim.keymap.set("n", "to", "Telescope oldfiles") vim.keymap.set("n", "tg", "Telescope live_grep") vim.keymap.set("n", "ts", "Telescope treesitter") --- code +-- dev vim.keymap.set("n", "gd", "Telescope lsp_definitions") vim.keymap.set("n", "gi", "Telescope lsp_implementations") vim.keymap.set("n", "gr", "Telescope lsp_references") @@ -93,34 +93,12 @@ vim.keymap.set("n", "]d", function() vim.lsp.diagnostic.goto_next() end) --- debug mappings -vim.keymap.set("n", "dc", function() - require("dap").continue() -end) -vim.keymap.set("n", "dn", function() - require("dap").step_over() -end) -vim.keymap.set("n", "di", function() - require("dap").step_into() -end) -vim.keymap.set("n", "do", function() - require("dap").step_out() -end) -vim.keymap.set("n", "db", function() - require("dap").toggle_breakpoint() -end) -vim.keymap.set("n", "dl", function() - require("dap").run_last() -end) -vim.keymap.set("n", "dq", function() - require("dap").close() -end) -vim.keymap.set("n", "dv", "Telescope dap variables") -vim.keymap.set("n", "dh", "Telescope dap commands") -vim.keymap.set("n", "dp", "Telescope dap list_breakpoints") - --- git -vim.keymap.set("n", "vs", "Git") -vim.keymap.set("n", "vb", "Telescope git_branches") -vim.keymap.set("n", "vc", "Telescope git_commits") -vim.keymap.set("n", "vf", "Telescope git_files") +-- debug +vim.keymap.set("n", "db", "Break") +vim.keymap.set("n", "dc", "Continue") +vim.keymap.set("n", "dd", ":Termdebug ") +vim.keymap.set("n", "de", "Evaluate") +vim.keymap.set("n", "di", "Step") +vim.keymap.set("n", "dn", "Over") +vim.keymap.set("n", "dr", "Run") +vim.keymap.set("n", "du", "Clear") diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 9871b60..e0d439a 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -101,26 +101,6 @@ require("packer").startup(function() end, }) - -- dap - use({ - "mfussenegger/nvim-dap", - module = "dap", - config = function() - require("plugins.dap") - end, - }) - use({ - "nvim-telescope/telescope-dap.nvim", - after = "nvim-dap", - }) - use({ - "theHamsta/nvim-dap-virtual-text", - after = "nvim-dap", - config = function() - require("plugins.dap-virtual-text") - end, - }) - -- toggleterm use({ "akinsho/toggleterm.nvim", diff --git a/.config/nvim/lua/plugins/dap-virtual-text.lua b/.config/nvim/lua/plugins/dap-virtual-text.lua deleted file mode 100644 index 4870599..0000000 --- a/.config/nvim/lua/plugins/dap-virtual-text.lua +++ /dev/null @@ -1 +0,0 @@ -require("nvim-dap-virtual-text").setup() diff --git a/.config/nvim/lua/plugins/dap.lua b/.config/nvim/lua/plugins/dap.lua deleted file mode 100644 index 79b8fc0..0000000 --- a/.config/nvim/lua/plugins/dap.lua +++ /dev/null @@ -1,75 +0,0 @@ -local dap = require("dap") - --- --- lldb --- - -dap.adapters.lldb = { - type = "executable", - command = "/usr/bin/lldb-vscode", - name = "lldb", -} - -local lldb = { - { - name = "Launch", - type = "lldb", - request = "launch", - program = function() - return vim.fn.input("path to executable: ", vim.fn.getcwd() .. "/", "file") - end, - cwd = "${workspaceFolder}", - stopOnEntry = false, - args = {}, - - runInTerminal = true, - }, -} - -dap.configurations.c = lldb -dap.configurations.rust = lldb - --- --- go --- - -vim.keymap.set("n", "dsp", function() - local port = vim.fn.input("enter port for delve: ") - dap.adapters.go.port = port - print("now run 'dlv dap -l 127.0.0.1:" .. port .. "'") -end) - -dap.adapters.go = { - type = "server", - host = "127.0.0.1", - port = 38000, -} - -dap.configurations.go = { - { - type = "go", - name = "Debug", - request = "launch", - program = "${file}", - }, - { - type = "go", - name = "Debug Package", - request = "launch", - program = "${fileDirname}", - }, - { - type = "go", - name = "Debug test", - request = "launch", - mode = "test", - program = "${file}", - }, - { - type = "go", - name = "Debug test (go.mod)", - request = "launch", - mode = "test", - program = "./${relativeFileDirname}", - }, -} diff --git a/.config/nvim/lua/plugins/whichkey.lua b/.config/nvim/lua/plugins/whichkey.lua index 32d5524..35b64a2 100644 --- a/.config/nvim/lua/plugins/whichkey.lua +++ b/.config/nvim/lua/plugins/whichkey.lua @@ -7,21 +7,14 @@ wk.register({ }, d = { name = "Debug", - b = "Toggle Breakpoint", + b = "Set Breakpoint", c = "Continue", - h = "Telescope", - i = "Step Into", - l = "Run Last", - n = "Step Over", - o = "Step Out", - p = "List Breakpoints", - q = "Stop", - s = { - name = "Set DAP Variables", - p = "Delve Port", - }, - u = "Toggle UI", - v = "Show Variables", + d = "Termdebug", + e = "Evaluate", + s = "Step", + o = "Over", + r = "Run", + u = "Clear Breakpoint", }, g = { name = "Language", @@ -61,12 +54,6 @@ wk.register({ g = "Grep", s = "Treesitter", }, - v = { - name = "Git", - s = "Status", - b = "Branches", - f = "Files", - }, C = "Terminal", F = "Fuzzy Files", Q = "Quit All",