From 2f07c724a5912ffb58f1b9c715016d39043a4fa8 Mon Sep 17 00:00:00 2001 From: Fredrik Averpil Date: Sat, 7 Sep 2024 06:44:56 +0200 Subject: [PATCH] feat: use build flags for delve in dap-go config --- lua/neotest-golang/features/dap/init.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lua/neotest-golang/features/dap/init.lua b/lua/neotest-golang/features/dap/init.lua index 8066180f..0fd03707 100644 --- a/lua/neotest-golang/features/dap/init.lua +++ b/lua/neotest-golang/features/dap/init.lua @@ -1,6 +1,7 @@ --- DAP setup related functions. local options = require("neotest-golang.options") +local logger = require("neotest-golang.logging") local M = {} @@ -13,10 +14,15 @@ function M.setup_debugging(cwd) dap_go_opts.delve = {} end dap_go_opts.delve.cwd = cwd + logger.debug({ "Provided dap_go_opts for DAP: ", dap_go_opts }) require("dap-go").setup(dap_go_opts) -- reset nvim-dap-go (and cwd) after debugging with nvim-dap require("dap").listeners.after.event_terminated["neotest-golang-debug"] = function() + logger.debug({ + "Resetting provided dap_go_opts for DAP: ", + dap_go_opts_original, + }) require("dap-go").setup(dap_go_opts_original) end end @@ -34,6 +40,11 @@ function M.get_dap_config(test_name_regex) args = { "-test.run", test_name_regex }, } + local dap_go_opts = options.get().dap_go_opts or {} + if dap_go_opts.delve ~= nil and dap_go_opts.delve.build_flags ~= nil then + dap_config.buildFlags = dap_go_opts.delve.build_flags + end + return dap_config end