diff --git a/after/plugin/dap.lua b/after/plugin/dap.lua index 53a241b..f9c1f3c 100644 --- a/after/plugin/dap.lua +++ b/after/plugin/dap.lua @@ -1,12 +1,5 @@ -local has_dap, dap = pcall(require, "dap") -if not has_dap then - return -end - -local has_dap_ui, dapui = pcall(require, "dapui") -if not has_dap_ui then - return -end +local dap = require "dap" +local ui = require "dapui" dap.adapters.php = { type = "executable", @@ -21,24 +14,25 @@ dap.configurations.php = { name = "Listen for Xdebug", port = 9003, pathMappings = { + ["/app"] = "${workspaceFolder}", ["/var/www/html"] = "${workspaceFolder}", }, }, } -dap.listeners.after.event_initialized["dapui_config"] = function() - dapui.open() +dap.listeners.after.event_initialized["ui_config"] = function() + ui.open() end -dap.listeners.before.event_terminated["dapui_config"] = function() - dapui.close() +dap.listeners.before.event_terminated["ui_config"] = function() + ui.close() end -dap.listeners.before.event_exited["dapui_config"] = function() - dapui.close() +dap.listeners.before.event_exited["ui_config"] = function() + ui.close() end -require("dapui").setup { +ui.setup { layouts = { { elements = { @@ -65,10 +59,11 @@ require("nvim-dap-virtual-text").setup { commented = true, } -local nmap = require("opdavies.keymap").nmap +vim.keymap.set("n", "b", dap.toggle_breakpoint) +vim.keymap.set("n", "gb", dap.run_to_cursor) -nmap { "", ":lua require'dap'.step_over()" } -nmap { "", ":lua require'dap'.step_into()" } -nmap { "", ":lua require'dap'.step_over()" } -nmap { "", ":lua require'dap'.continue()" } -nmap { "b", ":lua require'dap'.toggle_breakpoint()" } +vim.keymap.set("n", "", dap.continue) +vim.keymap.set("n", "", dap.step_into) +vim.keymap.set("n", "", dap.step_over) +vim.keymap.set("n", "", dap.step_out) +vim.keymap.set("n", "", dap.step_back)