Skip to content

Commit

Permalink
ask-runnables: Handle recent API-change in rust-analyzer
Browse files Browse the repository at this point in the history
See rust-lang/rust-analyzer#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.
  • Loading branch information
nemethf committed Jul 7, 2024
1 parent 14aa967 commit ada0c9f
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion eglot-x.el
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ada0c9f

Please sign in to comment.