From ba45c60611f0f41b3138c11b6059bb68b7c9743d Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Wed, 29 Jan 2020 21:39:25 +0100 Subject: Fix env in emacs runnables support --- editors/emacs/rust-analyzer.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'editors/emacs') diff --git a/editors/emacs/rust-analyzer.el b/editors/emacs/rust-analyzer.el index 06db4f15f..bcd1b5c67 100644 --- a/editors/emacs/rust-analyzer.el +++ b/editors/emacs/rust-analyzer.el @@ -143,7 +143,8 @@ (defun rust-analyzer-run (runnable) (interactive (list (rust-analyzer--select-runnable))) - (-let (((&hash "env" "bin" "args" "label") runnable)) + (-let* (((&hash "env" "bin" "args" "label") runnable) + (compilation-environment (-map (-lambda ((k v)) (concat k "=" v)) (ht-items env)))) (compilation-start (string-join (append (list bin) args '()) " ") ;; cargo-process-mode is nice, but try to work without it... -- cgit v1.2.3 From 2586cf9279c73b149f012228ce05b44410d66295 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Fri, 31 Jan 2020 15:16:22 +0100 Subject: Implement support for selectAndApplySourceChange (auto import) in Emacs --- editors/emacs/rust-analyzer.el | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'editors/emacs') diff --git a/editors/emacs/rust-analyzer.el b/editors/emacs/rust-analyzer.el index bcd1b5c67..9b426fcae 100644 --- a/editors/emacs/rust-analyzer.el +++ b/editors/emacs/rust-analyzer.el @@ -38,7 +38,9 @@ (defconst rust-analyzer--action-handlers '(("rust-analyzer.applySourceChange" . - (lambda (p) (rust-analyzer--apply-source-change-command p))))) + (lambda (p) (rust-analyzer--apply-source-change-command p))) + ("rust-analyzer.selectAndApplySourceChange" . + (lambda (p) (rust-analyzer--select-and-apply-source-change-command p))))) (defun rust-analyzer--uri-filename (text-document) (lsp--uri-to-path (gethash "uri" text-document))) @@ -71,6 +73,12 @@ (let ((data (-> p (ht-get "arguments") (lsp-seq-first)))) (rust-analyzer--apply-source-change data))) +(defun rust-analyzer--select-and-apply-source-change-command (p) + (let* ((options (-> p (ht-get "arguments") (lsp-seq-first))) + (chosen-option (lsp--completing-read "Select option:" options + (-lambda ((&hash "label")) label)))) + (rust-analyzer--apply-source-change chosen-option))) + (lsp-register-client (make-lsp-client :new-connection (lsp-stdio-connection (lambda () rust-analyzer-command)) -- cgit v1.2.3