From 3ea2ce7ff66e040876c63028c37f906ff1748434 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sun, 27 Apr 2025 23:05:23 +0100
Subject: [PATCH] Revert "plugins/lsp: use vim.lsp native API"

This reverts commit 78f6ff036918dcb6369f8b48abcef6a8788096e8.

From PR https://github.com/nix-community/nixvim/pull/3204
---
 plugins/lsp/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix
index adea4b50..ed45b5da 100644
--- a/plugins/lsp/default.nix
+++ b/plugins/lsp/default.nix
@@ -206,14 +206,15 @@ lib.nixvim.plugins.mkNeovimPlugin {
           }"}
 
           for i, server in ipairs(__lspServers) do
+            local options = ${runWrappers cfg.setupWrappers "server.extraOptions"}
 
-            vim.lsp.enable(server.name)
-
-            vim.lsp.config(server.name, __setup)
-
-            if server.extraOptions then
-              vim.lsp.config(server.name, server.extraOptions)
+            if options == nil then
+              options = __setup
+            else
+              options = vim.tbl_extend("keep", options, __setup)
             end
+
+            require("lspconfig")[server.name].setup(options)
           end
 
           ${cfg.postConfig}