plugins/lsp/nil_ls: rename to nil-ls

Add an alias for `nil_ls` (no warning)
MattSturgeon · Jun 3, 2024 · 0603cbd · 0603cbd
1 parent beca553
commit 0603cbd
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 5 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
@@ -302,10 +302,11 @@ let
       serverName = "nginx_language_server";
     }
     {
-      name = "nil_ls";
+      name = "nil-ls";
+      serverName = "nil_ls";
       description = "nil for Nix";
       package = pkgs.nil;
-      settingsOptions = import ./nil_ls-settings.nix { inherit lib helpers; };
+      settingsOptions = import ./nil-ls-settings.nix { inherit lib helpers; };
       settings = cfg: { nil = cfg; };
     }
     {

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
@@ -1,5 +1,37 @@
 {
   example = {
+    plugins.lsp = {
+      enable = true;
+
+      servers.nil-ls = {
+        enable = true;
+
+        settings = {
+          diagnostics = {
+            ignored = [
+              "unused_binding"
+              "unused_with"
+            ];
+            excludedFiles = [ "Cargo.nix" ];
+          };
+          formatting = {
+            command = [ "nixfmt" ];
+          };
+          nix = {
+            binary = "nix";
+            maxMemoryMB = 2048;
+            flake = {
+              autoArchive = true;
+              autoEvalInputs = false;
+              nixpkgsInputName = "nixpkgs";
+            };
+          };
+        };
+      };
+    };
+  };
+
+  withAlias = {
     plugins.lsp = {
       enable = true;