For lsp-custom-settings values, supports function and extracts lambda out

Author: 15cm

lsp-mode.el

@@ -6491,10 +6491,10 @@ changing the value of `foo'."
 (defun lsp-register-custom-settings (props)
   "Register PROPS.
 PROPS is list of triple (path value boolean?) where PATH is the path to the
-property; VALUE can be a literal value, symbol to be evaluated, or lambda
-function to be called; BOOLEAN? is an optional flag that should be non-nil for
-boolean settings, when it is nil the property will be ignored if the VALUE is
-nil."
+property; VALUE can be a literal value, symbol to be evaluated, or either a
+function or lambda function to be called without arguments; BOOLEAN? is an
+optional flag that should be non-nil for boolean settings, when it is nil the
+property will be ignored if the VALUE is nil."
   (let ((-compare-fn #'lsp--compare-setting-path))
     (setq lsp-client-settings (-uniq (append props lsp-client-settings)))))
 
@@ -6520,7 +6520,9 @@ TBL - a hash table, PATHS is the path to the nested VALUE."
     (mapc (-lambda ((path variable boolean?))
             (when (s-matches? (concat section "\\..*") path)
               (let* ((symbol-value (if (symbolp variable)
-                                       (symbol-value variable)
+                                       (if (fboundp variable)
+                                           (funcall variable)
+                                         (symbol-value variable))
                                      (if (functionp variable)
                                          (funcall variable) variable)))
                      (value (if (and boolean? (not symbol-value))

lsp-pyls.el

@@ -57,12 +57,6 @@
   :group 'lsp-pyls
   :package-version '(lsp-mode . "6.1"))
 
-(defcustom lsp-pyls-pyenv-command-path "pyenv"
-  "Executable path to pyenv"
-  :type 'string
-  :group 'lsp-pyls
-  :package-version '(lsp-mode . "6.3"))
-
 (defcustom lsp-pyls-plugins-jedi-completion-enabled t
   "Enable or disable the plugin."
   :type 'boolean
@@ -373,6 +367,26 @@ should be the python executable. This option will be prioritized over
   :group 'lsp-pyls
   :package-version '(lsp-mode . "6.3"))
 
+(defun lsp-pyls-get-pyenv-environment ()
+  "Get the pyenv-managed environment for current workspace, where
+<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
+                              (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))))))
+
 (lsp-register-custom-settings
  '(("pyls.rope.ropeFolder" lsp-pyls-rope-rope-folder)
            ("pyls.rope.extensionModules" lsp-pyls-rope-extension-modules)
@@ -420,23 +434,7 @@ should be the python executable. This option will be prioritized over
            ("pyls.plugins.jedi_completion.include_params" lsp-pyls-plugins-jedi-completion-include-params t)
            ("pyls.plugins.jedi_completion.enabled" lsp-pyls-plugins-jedi-completion-enabled t)
            ("pyls.configurationSources" lsp-pyls-configuration-sources)
-           ("pyls.plugins.jedi.environment"
-            (lambda ()
-              (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 ((python-env (f-parent
-                                         (f-parent
-                                          (shell-command-to-string
-                                           (format "PYENV_DIR='%s' %s which python"
-                                                   root lsp-pyls-pyenv-command-path))))))
-                        (lsp--info "Configure pyls with environment: %s" python-env)
-                        (setenv "PYENV_VERSION" pyenv-version)
-                        python-env)))))))))
+           ("pyls.plugins.jedi.environment" lsp-pyls-get-pyenv-environment)))
 
 (lsp-register-client
  (make-lsp-client :new-connection (lsp-stdio-connection