From 720d55e9998ef2dc5eadc6d2fe72eb2eaf353912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?=
 <33058747+GaetanLepage@users.noreply.github.com>
Date: Tue, 14 Mar 2023 15:13:27 +0100
Subject: [PATCH] plugins/nvim-lsp: fix pylsp error when no plugins set (#253)

---
 plugins/nvim-lsp/language-servers/pylsp.nix | 52 +++++++++++----------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/plugins/nvim-lsp/language-servers/pylsp.nix b/plugins/nvim-lsp/language-servers/pylsp.nix
index 1c22497b..da6f401f 100644
--- a/plugins/nvim-lsp/language-servers/pylsp.nix
+++ b/plugins/nvim-lsp/language-servers/pylsp.nix
@@ -412,34 +412,36 @@ in {
       extraPackages = with cfg.settings; let
         isNotNullAndEnabled = x: (!isNull x) && x.enabled;
       in
-        lists.flatten (map
-          (
-            pluginName: (
-              optionals (isNotNullAndEnabled plugins.${pluginName})
-              cfg.package.optional-dependencies.${pluginName}
+        optionals (!isNull cfg.settings.plugins) (
+          lists.flatten (map
+            (
+              pluginName: (
+                optionals (isNotNullAndEnabled plugins.${pluginName})
+                cfg.package.optional-dependencies.${pluginName}
+              )
             )
+            [
+              "autopep8"
+              "flake8"
+              "mccabe"
+              "pycodestyle"
+              "pydocstyle"
+              "pyflakes"
+              "pylint"
+              "yapf"
+            ])
+          ++ (
+            optionals
+            (
+              (isNotNullAndEnabled plugins.rope_autoimport)
+              || (isNotNullAndEnabled plugins.rope_completion)
+            )
+            cfg.package.optional-dependencies.rope
           )
-          [
-            "autopep8"
-            "flake8"
-            "mccabe"
-            "pycodestyle"
-            "pydocstyle"
-            "pyflakes"
-            "pylint"
-            "yapf"
-          ])
-        ++ (
-          optionals
-          (
-            (isNotNullAndEnabled plugins.rope_autoimport)
-            || (isNotNullAndEnabled plugins.rope_completion)
+          ++ (
+            optional (isNotNullAndEnabled plugins.pylsp_mypy)
+            pkgs.python3Packages.pylsp-mypy
           )
-          cfg.package.optional-dependencies.rope
-        )
-        ++ (
-          optional (isNotNullAndEnabled plugins.pylsp_mypy)
-          pkgs.python3Packages.pylsp-mypy
         );
     };
 }