From 13eddd7c499388e956e47aae6a7210e43eb40d55 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 12 Aug 2019 13:12:45 +0300 Subject: Drop support for old extendSelection API Emacs now handles this via native LSP request https://github.com/emacs-lsp/lsp-mode/commit/dc86bbb227147aa8141e690ad5648fdbd2ebdb9f --- editors/emacs/ra-emacs-lsp.el | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) (limited to 'editors') diff --git a/editors/emacs/ra-emacs-lsp.el b/editors/emacs/ra-emacs-lsp.el index 075cbd82d..79822c8ce 100644 --- a/editors/emacs/ra-emacs-lsp.el +++ b/editors/emacs/ra-emacs-lsp.el @@ -14,7 +14,7 @@ ;; - 'hover' type information & documentation (with lsp-ui) ;; - implements source changes (for code actions etc.), except for file system changes ;; - implements joinLines (you need to bind rust-analyzer-join-lines to a key) -;; - implements extendSelection (either bind rust-analyzer-extend-selection to a key, or use expand-region) +;; - implements selectionRanges (either bind lsp-extend-selection to a key, or use expand-region) ;; - provides rust-analyzer-inlay-hints-mode for inline type hints ;; What's missing: @@ -103,39 +103,13 @@ (rust-analyzer--join-lines-params))) (rust-analyzer--apply-source-change))) -;; extend selection - -(defun rust-analyzer-extend-selection () - (interactive) - (-let (((&hash "start" "end") (rust-analyzer--extend-selection))) - (rust-analyzer--goto-lsp-loc start) - (set-mark (point)) - (rust-analyzer--goto-lsp-loc end) - (exchange-point-and-mark))) - -(defun rust-analyzer--extend-selection-params () - "Extend selection params." - (list :textDocument (lsp--text-document-identifier) - :selections - (vector - (if (use-region-p) - (lsp--region-to-range (region-beginning) (region-end)) - (lsp--region-to-range (point) (point)))))) - -(defun rust-analyzer--extend-selection () - (-> - (lsp-send-request - (lsp-make-request - "rust-analyzer/extendSelection" - (rust-analyzer--extend-selection-params))) - (ht-get "selections") - (seq-first))) +;; selection ranges (defun rust-analyzer--add-er-expansion () (make-variable-buffer-local 'er/try-expand-list) (setq er/try-expand-list (append er/try-expand-list - '(rust-analyzer-extend-selection)))) + '(lsp-extend-selection)))) (with-eval-after-load 'expand-region ;; add the expansion for all existing rust-mode buffers. If expand-region is -- cgit v1.2.3