If pyenv is installed, always try to get ENV by it, otherwise do nothing

Author: 15cm

lsp-pyls.el

@@ -353,16 +353,10 @@ parameters referenced in config."
   :group 'lsp-pyls
   :package-version '(lsp-mode . "6.3"))
 
-(defcustom lsp-pyls-plugins-jedi-use-pyenv-environment t
-  "If enabled, pass the environment got by pyenv to jedi"
-  :type 'boolean
-  :group 'lsp-pyls
-  :package-version '(lsp-mode . "6.3"))
-
 (defcustom lsp-pyls-plugins-jedi-environment nil
-  "Specify the environment that jedi runs on where <environmeent>/bin/python
-should be the python executable. This option will be prioritized over
-`lsp-pyls-plugins-jedi-use-pyenv-environment'."
+  "Specify the environment that jedi runs on where <ENV>/bin/python should be
+the python executable. This option will be prioritized over the ENV got by
+`lsp-pyls-get-pyenv-environment'."
   :type 'string
   :group 'lsp-pyls
   :package-version '(lsp-mode . "6.3"))
@@ -372,20 +366,21 @@ should be the python executable. This option will be prioritized over
 <ENV>/bin/python is the corresponding Python executable"
   (if lsp-pyls-plugins-jedi-environment
       lsp-pyls-plugins-jedi-environment
-    (when lsp-pyls-plugins-jedi-use-pyenv-environment
-      (let ((pyenv-version (getenv "PYENV_VERSION"))
-            (root (lsp-seq-first (lsp-find-roots-for-workspace lsp--cur-workspace (lsp-session)))))
-        (when root
-          (setenv "PYENV_VERSION" nil)
-          (let* ((pyenv-command-path (executable-find "pyenv"))
-                 (python-env (f-parent
+    (let ((pyenv-version (getenv "PYENV_VERSION"))
+          (root (lsp-seq-first (lsp-find-roots-for-workspace lsp--cur-workspace (lsp-session)))))
+      (when root
+        (setenv "PYENV_VERSION" nil)
+        (let* ((pyenv-command-path (executable-find "pyenv"))
+               (python-env (when pyenv-command-path
+                             (f-parent
                               (f-parent
                                (shell-command-to-string
                                 (format "PYENV_DIR='%s' %s which python"
-                                        root pyenv-command-path))))))
-            (lsp--info "Configure pyls with environment: %s" python-env)
-            (setenv "PYENV_VERSION" pyenv-version)
-            python-env))))))
+                                        root pyenv-command-path)))))))
+          (when python-env
+              (lsp--info "Configures pyls with environment: %s" python-env))
+          (setenv "PYENV_VERSION" pyenv-version)
+          python-env)))))
 
 (lsp-register-custom-settings
  '(("pyls.rope.ropeFolder" lsp-pyls-rope-rope-folder)