From acb5fdebfa63de8892ee1152c53d0fd19998e594 Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sat, 16 Mar 2019 23:36:47 +0100
Subject: [PATCH] Add LSP mode and replace racer for rust

---
 .gitignore                |  1 +
 emacs-deferred            |  1 -
 emacs-racer               |  1 -
 modules/em-programming.el | 58 +++++++++++++++++++++------------------
 4 files changed, 32 insertions(+), 29 deletions(-)
 delete mode 160000 emacs-deferred
 delete mode 160000 emacs-racer

diff --git a/.gitignore b/.gitignore
index 21d0a44..ed23a01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,6 @@ session*
 eww-bookmarks
 eshell
 \.cache
+\.lsp-session*
 \#*
 *~
diff --git a/emacs-deferred b/emacs-deferred
deleted file mode 160000
index 0f2af90..0000000
--- a/emacs-deferred
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0f2af90a70362b41aa4428b6f6eeb895ed6c60a9
diff --git a/emacs-racer b/emacs-racer
deleted file mode 160000
index e6a0f35..0000000
--- a/emacs-racer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e6a0f35c383f035d446a9c36340f038308fef848
diff --git a/modules/em-programming.el b/modules/em-programming.el
index eaaf5a7..c137863 100644
--- a/modules/em-programming.el
+++ b/modules/em-programming.el
@@ -20,8 +20,10 @@
 
 (defvar emodule/em-programming-packages
 
-  '(company
+  '(cargo
+    company
     company-c-headers
+    company-lsp
     dockerfile-mode
     elpy
     fic-mode
@@ -33,6 +35,8 @@
     haskell-mode
     highlight-numbers
     highlight-symbol
+    lsp-mode
+    lsp-ui
     plantuml-mode
     py-autopep8
     rust-mode
@@ -42,10 +46,7 @@
     vala-mode
     yaml-mode
     yasnippet
-    yasnippet-snippets
-
-    s
-    f)
+    yasnippet-snippets)
 
   )
 
@@ -54,6 +55,20 @@
 (defun emodule/em-programming-init ()
   "Initialise the `em-programming' module."
 
+  ;; --------------------------------------------------------------------------
+  ;; Set up LSP first.
+  ;; --------------------------------------------------------------------------
+
+  (use-package lsp-mode
+    :commands lsp
+    :config (require 'lsp-clients))
+
+  (use-package lsp-ui
+    :commands lsp-ui-mode
+    :config
+    (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))
+
   ;; --------------------------------------------------------------------------
   ;; Company - complete anything.
   ;; --------------------------------------------------------------------------
@@ -70,6 +85,9 @@
     (setq company-backends (delete 'company-clang company-backends))
     (setq company-backends (delete 'company-dabbrev company-backends)))
 
+  (use-package company-lsp
+    :commands company-lsp)
+
   ;; Functions args -----------------------------------------------------------
 
   (use-package function-args
@@ -209,32 +227,18 @@
     (interactive "sLibrary project name: ")
     (rust-new-project project-name "lib"))
 
+  ;; LSP requires RLS, install with
+  ;; rustup component add rls rust-analysis rust-src
   (use-package rust-mode
     :defer t
+    :hook (rust-mode . lsp)
     :config
-    (setq exec-path (append exec-path '("/home/wojtek/.cargo/bin"))))
+    (setq exec-path (append exec-path '("/home/wojtek/.cargo/bin")))
+    (add-hook 'rust-mode-hook 'flycheck-mode))
 
-  ;; This requires some additional setup as the racer binary must be installed
-  ;; and the Rust libstd sources must be installed.
-  ;; $ rustup component add rust-src
-  ;; $ cargo install racer
-  (add-to-list 'load-path "~/.emacs.d/emacs-deferred")
-  (add-to-list 'load-path "~/.emacs.d/emacs-racer")
-  (use-package racer
-    :init
-    (add-hook 'rust-mode-hook #'racer-mode)
-    (add-hook 'racer-mode-hook #'eldoc-mode)
-    :config
-    ;; For racer to work, it needs to know where to find the standard library
-    ;; sources.  The easiest way to do it without having a machine dependent
-    ;; setup is to set the environment variable RUST_SRC_PATH.  If that's
-    ;; undesirable or not possible, set the variable below instead.
-    ;; (setq-default
-    ;;  racer-rust-src-path
-    ;;  "~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src/")
-    (setq-default racer-use-company-backend t)
-    (define-key rust-mode-map (kbd "TAB") #'company-indent-or-complete-common)
-    (setq-default company-tooltip-align-annotations t))
+  ;; Add keybindings for interacting with Cargo
+  (use-package cargo
+    :hook (rust-mode . cargo-minor-mode))
 
   (use-package toml-mode
     :mode "\\.lock\\'")