From ef05078fac849072586ee39f7e7f1290364a093f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?= <33058747+GaetanLepage@users.noreply.github.com> Date: Mon, 20 Feb 2023 11:54:26 +0100 Subject: [PATCH] plugins/nvim-lsp: sumneko_lua was renamed to lua_ls (both nix package and nvim-lsp server name) (#169) --- plugins/nvim-lsp/basic-servers.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/plugins/nvim-lsp/basic-servers.nix b/plugins/nvim-lsp/basic-servers.nix index 04fed37e..dc61e9c2 100644 --- a/plugins/nvim-lsp/basic-servers.nix +++ b/plugins/nvim-lsp/basic-servers.nix @@ -6,6 +6,10 @@ } @ args: with lib; let helpers = import ./helpers.nix args; + + optionWarnings = import ../../lib/option-warnings.nix args; + basePluginPath = ["plugins" "lsp" "servers"]; + servers = [ { name = "astro"; @@ -212,10 +216,10 @@ with lib; let settings = cfg: {rust-analyzer = cfg;}; } { - name = "sumneko-lua"; - description = "Enable sumneko_lua, for lua"; - package = pkgs.sumneko-lua-language-server; - serverName = "sumneko_lua"; + name = "lua-ls"; + description = "Enable lua LS, for lua"; + package = pkgs.lua-language-server; + serverName = "lua_ls"; } { name = "tailwindcss"; @@ -248,5 +252,12 @@ with lib; let } ]; in { - imports = lib.lists.map (helpers.mkLsp) servers; + imports = + lib.lists.map (helpers.mkLsp) servers + ++ [ + (optionWarnings.mkRenamedOption { + option = basePluginPath ++ ["sumneko-lua"]; + newOption = basePluginPath ++ ["lua-ls"]; + }) + ]; }