summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelicián Németh <felician.nemeth@gmail.com>2024-07-07 12:48:51 +0200
committerFelicián Németh <felician.nemeth@gmail.com>2024-07-07 12:48:51 +0200
commitada0c9f32deac90038661f461966aae51707abff (patch)
tree8d13e5cdf75417216906e09ab1dfda28aff5cda9
parent14aa967a431f0b4d4f9e787c98b208e28f488c0b (diff)
ask-runnables: Handle recent API-change in rust-analyzer
See https://github.com/rust-lang/rust-analyzer/pull/17547 * eglot-x.el (eglot-x--run-after-jump): Handle new property "environment". Still accept old properties to keep supporting old versions of rust-analyzer.
-rw-r--r--eglot-x.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/eglot-x.el b/eglot-x.el
index 4d9ea86..47c67cf 100644
--- a/eglot-x.el
+++ b/eglot-x.el
@@ -1695,10 +1695,15 @@ Adapted from `eglot--lsp-xref-helper'."
default-directory))
(process-environment
(append process-environment
+ ;; RA does not send :expectTest since 2024-07-07
(when (plist-get args :expectTest)
- "UPDATE_EXPECT=1")))
+ '("UPDATE_EXPECT=1"))
+ (map-apply (lambda (k v)
+ (concat (substring (symbol-name k) 1) "=" v))
+ (plist-get args :environment))))
(cargo (or (plist-get args :overrideCargo)
"cargo"))
+ ;; RA does not send :cargoExtraArgs since 2024-07-07
(cargoExtraArgs (append (plist-get args :cargoExtraArgs) nil))
(executableArgs (append (plist-get args :executableArgs) nil))
(compile-command