From f7461325bf0abd1feccc5190739d54f8d624d13c Mon Sep 17 00:00:00 2001 From: David Florness Date: Sat, 16 Jul 2022 14:47:03 -0400 Subject: [PATCH] Replace rtags with ccls To get all of the language-server-protocol features --- lisp/dev.el | 36 ++++-------------------------------- straight/versions/default.el | 1 + 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/lisp/dev.el b/lisp/dev.el index 880b68a..114dac2 100644 --- a/lisp/dev.el +++ b/lisp/dev.el @@ -92,38 +92,6 @@ (use-package stickyfunc-enhance) -(defun rtags-hook () - "Setup rtags and flycheck." - (require 'flycheck-rtags) - (rtags-start-process-unless-running) - (flycheck-select-checker 'rtags) - (setq-local flycheck-highlighting-mode nil)) - -(use-package rtags - :straight nil - :hook - (c-mode . rtags-hook) - (c++-mode . rtags-hook) - (objc-mode . rtags-hook) - :config - (dolist (map (list c-mode-map c++-mode-map objc-mode-map)) - (evil-define-key 'normal map (kbd "gd") 'rtags-find-symbol-at-point) - (evil-define-key 'normal map (kbd "M-?") 'rtags-find-references-at-point) - (evil-define-key 'normal map (kbd "C-<") 'rtags-find-virtuals-at-point) - (evil-define-key 'normal map (kbd "C->") 'rtags-diagnostics) - (evil-define-key 'normal map (kbd "C-t") 'rtags-location-stack-back) - (evil-define-key 'normal map (kbd "M-[") 'rtags-location-stack-back) - (evil-define-key 'normal map (kbd "M-]") 'rtags-location-stack-forward)) - (use-package company-rtags - :straight nil) - (use-package flycheck-rtags - :straight nil) - (setq rtags-autostart-diagnostics t - rtags-completions-enabled t) - (with-eval-after-load 'company - (add-to-list 'company-backends 'company-rtags)) - (setq rtags-display-result-backend 'ivy)) - (use-package pkgbuild-mode :mode ("\\`PKGBUILD\\'" "APKBUILD") @@ -156,3 +124,7 @@ (interactive) (let ((browse-at-remote-prefer-symbolic nil)) (browse-at-remote-kill)))))) + +(use-package ccls + :hook ((c-mode c++-mode objc-mode cuda-mode) . + (lambda () (require 'ccls) (lsp)))) diff --git a/straight/versions/default.el b/straight/versions/default.el index c864c1a..d325901 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -28,6 +28,7 @@ ("el-get" . "bf3dba444dcd240b8cb358a0850c8c5a92606134") ("eldoc" . "88f5e70a8868bef0d685a57a623e51a233a33380") ("elisp-slime-nav" . "8588d80d414aee1fafce5b9da0e913612ee0bcdd") + ("emacs-ccls" . "ae74a39303457a5e6976dd1c6816cde97d357a0d") ("emacs-hcl-mode" . "e4d9eef631e8a386341ae8f94f7c2579586e65b5") ("emacs-load-env-vars" . "3808520efaf9492033f6e11a9bffd68eabf02a0f") ("emacs-lorem-ipsum" . "da75c155da327c7a7aedb80f5cfe409984787049") -- 2.38.4