From e34e4c3b7ceeddbb61b119c0c9c06e37d4519d13 Mon Sep 17 00:00:00 2001 From: Stephen Leece Date: Sat, 6 Jan 2024 15:54:16 -0800 Subject: [PATCH] revert my debug related changes in favor of existing implementation --- README.md | 4 +++ init.lua | 45 ++------------------------------- lazy-lock.json | 3 +++ lua/kickstart/plugins/debug.lua | 6 +++++ 4 files changed, 15 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 1209d624..5f390a9a 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,11 @@ cd .virtualenvs python -m venv debugpy debugpy/bin/python -m pip install debugpy +## TODO / explore +### explore: + +- neotest - test run viewer diff --git a/init.lua b/init.lua index 3a2f8098..06ce3471 100644 --- a/init.lua +++ b/init.lua @@ -254,29 +254,12 @@ require('lazy').setup({ build = ':TSUpdate', }, - { - -- Debug Adapter Protocol client - 'mfussenegger/nvim-dap', - }, - { - -- python specific debugger - 'mfussenegger/nvim-dap-python', - }, - - { - -- DAP UI - 'rcarriga/nvim-dap-ui', - dependencies = { - 'mfussenegger/nvim-dap' - } - }, - -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart -- These are some example plugins that I've included in the kickstart repository. -- Uncomment any of the lines below to enable them. - -- require 'kickstart.plugins.autoformat', - -- require 'kickstart.plugins.debug', + require 'kickstart.plugins.autoformat', + require 'kickstart.plugins.debug', -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping @@ -684,30 +667,6 @@ cmp.setup { }, } --- python debugger -require('dap-python').setup('/Users/stephenleece/.asdf/shims/python') --- require('dap-python').test_runner = "pytest" - --- configure dap ui -local dap, dapui = require("dap"), require("dapui") -dapui.setup() -dap.listeners.after.event_initialized["dapui_config"] = function() - dapui.open() -end -dap.listeners.before.event_terminated["dapui_config"] = function() - dapui.close() -end -dap.listeners.before.event_exited["dapui_config"] = function() - dapui.close() -end -vim.fn.sign_define('DapBreakpoint',{ text ='🟥', texthl ='', linehl ='', numhl =''}) -vim.fn.sign_define('DapStopped',{ text ='▶️', texthl ='', linehl ='', numhl =''}) -vim.keymap.set('n', '', require 'dap'.continue) -vim.keymap.set('n', '', require 'dap'.step_over) -vim.keymap.set('n', '', require 'dap'.step_into) -vim.keymap.set('n', '', require 'dap'.step_out) -vim.keymap.set('n', 'b', require 'dap'.toggle_breakpoint) - -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lazy-lock.json b/lazy-lock.json index e91c6d7d..fdaee4de 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,11 +11,14 @@ "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a5476087db0a20c05bd1163e1cd4a29b795e73a7" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "neodev.nvim": { "branch": "main", "commit": "f972d7e6cd21b691199565cfe3e6487e774a4e8f" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" }, + "nvim-dap-go": { "branch": "main", "commit": "a5cc8dcad43f0732585d4793deb02a25c4afb766" }, "nvim-dap-python": { "branch": "master", "commit": "091e4ae00a12085f9ed4200a3cd04af7179b8a23" }, + "nvim-dap-ruby": { "branch": "main", "commit": "fc15c7d50e557379e13f3a825bc58adcc7323cc3" }, "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, "nvim-lspconfig": { "branch": "master", "commit": "553c4e0e667167640c5398573f6f3a488ff8047a" }, "nvim-treesitter": { "branch": "master", "commit": "649d137371e9214d30b20565e0574824fa3a3670" }, diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua index 7fc783fa..972694bc 100644 --- a/lua/kickstart/plugins/debug.lua +++ b/lua/kickstart/plugins/debug.lua @@ -20,6 +20,9 @@ return { -- Add your own debuggers here 'leoluz/nvim-dap-go', + 'suketa/nvim-dap-ruby', + 'mfussenegger/nvim-dap-python', + }, config = function() local dap = require 'dap' @@ -83,5 +86,8 @@ return { -- Install golang specific config require('dap-go').setup() + require('dap-ruby').setup() + require('dap-ruby').setup() + require('dap-python').setup('/Users/stephenleece/.asdf/shims/python') end, }