Skip to content

Commit 3ea2ce7

Browse files
committed
Revert "plugins/lsp: use vim.lsp native API"
This reverts commit 78f6ff0. From PR #3204
1 parent 836994b commit 3ea2ce7

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

plugins/lsp/default.nix

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,15 @@ lib.nixvim.plugins.mkNeovimPlugin {
206206
}"}
207207
208208
for i, server in ipairs(__lspServers) do
209+
local options = ${runWrappers cfg.setupWrappers "server.extraOptions"}
209210
210-
vim.lsp.enable(server.name)
211-
212-
vim.lsp.config(server.name, __setup)
213-
214-
if server.extraOptions then
215-
vim.lsp.config(server.name, server.extraOptions)
211+
if options == nil then
212+
options = __setup
213+
else
214+
options = vim.tbl_extend("keep", options, __setup)
216215
end
216+
217+
require("lspconfig")[server.name].setup(options)
217218
end
218219
219220
${cfg.postConfig}

0 commit comments

Comments
 (0)