jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix rust LSP

Browse source 
* Removed lsp-rust (RLS is built into lsp-mode now)
* Fixed setting up flycheck mode in rust mode
* Fixed LSP initialization due to deprecation
* LSP-mode now self configures company and ui-mode
This commit is contained in:
Josh Comer 2019-01-01 07:30:20 -04:00 committed by Bozhidar Batsov
parent 9e410f5c64
commit 63c697c2f4
2 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/prelude-lsp.el
View file

@ -37,13 +37,8 @@
lsp-ui)) lsp-ui))
(require 'lsp-ui) (require 'lsp-ui)
(require 'company-lsp)
(require 'lsp-ui-imenu) (require 'lsp-ui-imenu)
(push 'company-lsp company-backends)
(add-hook 'lsp-mode-hook 'lsp-ui-mode)
(add-hook 'lsp-after-open-hook 'lsp-ui-enable-imenu)
(define-key lsp-ui-mode-map [remap xref-find-definitions] #'lsp-ui-peek-find-definitions) (define-key lsp-ui-mode-map [remap xref-find-definitions] #'lsp-ui-peek-find-definitions)
(define-key lsp-ui-mode-map [remap xref-find-references] #'lsp-ui-peek-find-references) (define-key lsp-ui-mode-map [remap xref-find-references] #'lsp-ui-peek-find-references)
(define-key lsp-ui-mode-map (kbd "C-c C-l .") 'lsp-ui-peek-find-definitions) (define-key lsp-ui-mode-map (kbd "C-c C-l .") 'lsp-ui-peek-find-definitions)

18
modules/prelude-rust.el
View file

@ -39,26 +39,22 @@
;; * rls (Rust Language Server, if the prelude-lsp feature is enabled) ;; * rls (Rust Language Server, if the prelude-lsp feature is enabled)
(prelude-require-packages '(rust-mode (prelude-require-packages '(rust-mode
cargo)) cargo
flycheck-rust))
(if (featurep 'prelude-lsp) (unless (featurep 'prelude-lsp)
(prelude-require-package 'lsp-rust) (prelude-require-packages '(racer)))
(prelude-require-packages '(racer
flycheck-rust)))
(setq rust-format-on-save t) (setq rust-format-on-save t)
(setq lsp-rust-rls-command '("rustup" "run" "stable" "rls"))
(with-eval-after-load 'rust-mode (with-eval-after-load 'rust-mode
(add-hook 'rust-mode-hook 'cargo-minor-mode) (add-hook 'rust-mode-hook 'cargo-minor-mode)
(add-hook 'flycheck-mode-hook 'flycheck-rust-setup)
(if (featurep 'prelude-lsp) (if (featurep 'prelude-lsp)
(progn (require 'lsp-rust) (add-hook 'rust-mode-hook 'lsp)
(add-hook 'rust-mode-hook #'lsp-rust-enable))
(add-hook 'rust-mode-hook 'racer-mode) (add-hook 'rust-mode-hook 'racer-mode)
(add-hook 'racer-mode-hook 'eldoc-mode) (add-hook 'racer-mode-hook 'eldoc-mode))
(add-hook 'rust-mode-hook 'flycheck-rust-setup)
(add-hook 'flycheck-mode-hook 'flycheck-rust-setup))
(defun prelude-rust-mode-defaults () (defun prelude-rust-mode-defaults ()
(unless (featurep 'prelude-lsp) (unless (featurep 'prelude-lsp)