larssonmartin1998/.dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add the ability to merge custom LSP conf with default rather than overrule, additionally, add dap-go

Browse source
This commit is contained in:
Martin Larsson 2025-01-02 10:09:38 +01:00
parent ff88938803
commit ab0eabae78
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
home/.config/nvim/lua/plugs/mason_lsp.lua
View file

@ -4,6 +4,8 @@ local function get_lsp_conf(default_conf, server_name)
local result, custom_conf = pcall(require, "language_servers/" .. server_name) local result, custom_conf = pcall(require, "language_servers/" .. server_name)
if not result or not custom_conf then if not result or not custom_conf then
return default_conf return default_conf
elseif custom_conf and custom_conf.merge_with_default then
return vim.tbl_deep_extend("force", default_conf, custom_conf)
end end
return custom_conf return custom_conf
@ -77,6 +79,7 @@ local function setup_dap()
require("persistent-breakpoints").setup { require("persistent-breakpoints").setup {
load_breakpoints_event = { "BufReadPost" } load_breakpoints_event = { "BufReadPost" }
} }
require("dap-go").setup()
local stepping_keymaps = { local stepping_keymaps = {
n = { n = {
@ -198,6 +201,7 @@ return {
"LarssonMartin1998/nvim-dap-profiles", "LarssonMartin1998/nvim-dap-profiles",
opts = {}, opts = {},
}, },
"leoluz/nvim-dap-go",
}, },
config = function() config = function()
-- Find all files in lua/language_servers and require them -- Find all files in lua/language_servers and require them