plugins/lsp: normalise kebab-case-names

MattSturgeon · Jun 3, 2024 · a8be5cb · a8be5cb
1 parent beca553
commit a8be5cb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix
@@ -69,7 +69,6 @@ in
         "lua-ls"
         "marksman"
         "metals"
-        "nil_ls"
         "nixd"
         "nushell"
         "ocamllsp"

diff --git a/plugins/lsp/language-servers/default.nix b/plugins/lsp/language-servers/default.nix
@@ -136,9 +136,10 @@ let
       package = pkgs.elmPackages.elm-language-server;
     }
     {
-      name = "emmet_ls";
+      name = "emmet-ls";
       description = "emmet_ls, emmet support based on LSP";
       package = pkgs.emmet-ls;
+      serverName = "emmet_ls";
     }
     {
       name = "eslint";
@@ -302,10 +303,11 @@ let
       serverName = "nginx_language_server";
     }
     {
-      name = "nil_ls";
+      name = "nil-ls";
       description = "nil for Nix";
       package = pkgs.nil;
-      settingsOptions = import ./nil_ls-settings.nix { inherit lib helpers; };
+      serverName = "nil_ls";
+      settingsOptions = import ./nil-ls-settings.nix { inherit lib helpers; };
       settings = cfg: { nil = cfg; };
     }
     {
@@ -401,9 +403,10 @@ let
       package = pkgs.perlPackages.PLS;
     }
     {
-      name = "pest_ls";
+      name = "pest-ls";
       description = "pest_ls for pest";
       package = pkgs.pest-ide-tools;
+      serverName = "pest_ls";
     }
     {
       name = "phpactor";

diff --git a/.../lsp/language-servers/nil_ls-settings.nix → .../lsp/language-servers/nil-ls-settings.nix b/.../lsp/language-servers/nil_ls-settings.nix → .../lsp/language-servers/nil-ls-settings.nix
diff --git a/tests/test-sources/plugins/lsp/_lsp.nix b/tests/test-sources/plugins/lsp/_lsp.nix
@@ -66,7 +66,7 @@
           enable = true;
           package = null;
         };
-        nil_ls.enable = true;
+        nil-ls.enable = true;
         rust-analyzer = {
           enable = true;
           installCargo = true;
@@ -152,7 +152,7 @@
             marksman.enable = true;
             metals.enable = true;
             nginx-language-server.enable = true;
-            nil_ls.enable = true;
+            nil-ls.enable = true;
             nimls.enable = true;
             nixd.enable = true;
             nushell.enable = true;

diff --git a/tests/test-sources/plugins/lsp/language-servers/nil-ls.nix b/tests/test-sources/plugins/lsp/language-servers/nil-ls.nix
@@ -3,7 +3,7 @@
     plugins.lsp = {
       enable = true;
 
-      servers.nil_ls = {
+      servers.nil-ls = {
         enable = true;
 
         settings = {