lsp: fix issue with everything other than elixir

This commit is contained in:
Pedro Alves 2022-10-22 22:15:03 +01:00
parent ce909992f6
commit f0ad4cd2ec
2 changed files with 13 additions and 6 deletions

View file

@ -82,6 +82,13 @@ in
require('lspconfig')[server].setup(__setup) require('lspconfig')[server].setup(__setup)
else else
local options = ${runWrappers cfg.setupWrappers "server.extraOptions"} local options = ${runWrappers cfg.setupWrappers "server.extraOptions"}
if options == nil then
options = __setup
else
options = vim.tbl_extend("keep", options, __setup)
end
require('lspconfig')[server.name].setup(options) require('lspconfig')[server.name].setup(options)
end end
end end

12
tests/flake.lock generated
View file

@ -97,12 +97,12 @@
}, },
"locked": { "locked": {
"lastModified": 0, "lastModified": 0,
"narHash": "sha256-NLfZri8QaYVDjLHfDAqP+DHyIRsb+bXn+2dJtoFo1LM=", "narHash": "sha256-FTGR/AeBEZQeWqSQqbnR+3oW4NJvhwshJu8/mHDWwQ8=",
"path": "/nix/store/j8vf0lmn4w9w18jva2dn9kfk2aw1niff-source", "path": "/nix/store/rhjvdj0kd7drmgnaj06q3kazi496zb6f-source",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/j8vf0lmn4w9w18jva2dn9kfk2aw1niff-source", "path": "/nix/store/rhjvdj0kd7drmgnaj06q3kazi496zb6f-source",
"type": "path" "type": "path"
} }
}, },
@ -116,12 +116,12 @@
}, },
"locked": { "locked": {
"lastModified": 0, "lastModified": 0,
"narHash": "sha256-NLfZri8QaYVDjLHfDAqP+DHyIRsb+bXn+2dJtoFo1LM=", "narHash": "sha256-FTGR/AeBEZQeWqSQqbnR+3oW4NJvhwshJu8/mHDWwQ8=",
"path": "/nix/store/j8vf0lmn4w9w18jva2dn9kfk2aw1niff-source", "path": "/nix/store/rhjvdj0kd7drmgnaj06q3kazi496zb6f-source",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/j8vf0lmn4w9w18jva2dn9kfk2aw1niff-source", "path": "/nix/store/rhjvdj0kd7drmgnaj06q3kazi496zb6f-source",
"type": "path" "type": "path"
} }
}, },