language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix ra-emacs-lsp for newest lsp-mode with native json support

Browse source
This commit is contained in:
Florian Diebold 2019-03-14 22:08:37 +01:00
parent eb4d6cf25f
commit c656bf3946
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
editors/emacs/ra-emacs-lsp.el
View file

@ -58,17 +58,16 @@
(defun rust-analyzer--apply-source-change (data) (defun rust-analyzer--apply-source-change (data)
;; TODO fileSystemEdits ;; TODO fileSystemEdits
(--each (-> data (ht-get "workspaceEdit") (ht-get "documentChanges")) (seq-doseq (it (-> data (ht-get "workspaceEdit") (ht-get "documentChanges")))
(rust-analyzer--apply-text-document-edit it)) (rust-analyzer--apply-text-document-edit it))
(-when-let (cursor-position (ht-get data "cursorPosition")) (-when-let (cursor-position (ht-get data "cursorPosition"))
(let ((filename (rust-analyzer--uri-filename (ht-get cursor-position "textDocument"))) (let ((filename (rust-analyzer--uri-filename (ht-get cursor-position "textDocument")))
(position (ht-get cursor-position "position"))) (position (ht-get cursor-position "position")))
(find-file filename) (find-file filename)
(rust-analyzer--goto-lsp-loc position) (rust-analyzer--goto-lsp-loc position))))
)))
(defun rust-analyzer--apply-source-change-command (p) (defun rust-analyzer--apply-source-change-command (p)
(let ((data (-> p (ht-get "arguments") (car)))) (let ((data (-> p (ht-get "arguments") (seq-first))))
(rust-analyzer--apply-source-change data))) (rust-analyzer--apply-source-change data)))
(lsp-register-client (lsp-register-client
@ -126,7 +125,7 @@
"rust-analyzer/extendSelection" "rust-analyzer/extendSelection"
(rust-analyzer--extend-selection-params))) (rust-analyzer--extend-selection-params)))
(ht-get "selections") (ht-get "selections")
(car))) (seq-first)))
(defun rust-analyzer--add-er-expansion () (defun rust-analyzer--add-er-expansion ()
(make-variable-buffer-local 'er/try-expand-list) (make-variable-buffer-local 'er/try-expand-list)