From 7a74ae105a3415270337aaef69c93170285e0546 Mon Sep 17 00:00:00 2001 From: Alexander Dalshov Date: Mon, 4 Dec 2017 15:27:00 +0300 Subject: [PATCH] c-c++ rtags: integration with evil --- layers/+lang/c-c++/packages.el | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/layers/+lang/c-c++/packages.el b/layers/+lang/c-c++/packages.el index c8baa53ae..25eb4a1aa 100644 --- a/layers/+lang/c-c++/packages.el +++ b/layers/+lang/c-c++/packages.el @@ -34,8 +34,9 @@ xcscope rtags (company-rtags :requires company rtags) - (flycheck-rtags :requires flycheck) - (helm-rtags :requires helm) + (flycheck-rtags :requires flycheck rtags) + (helm-rtags :requires helm rtags) + (ivy-rtags :requires ivy rtags) )) (defun c-c++/init-cc-mode () @@ -257,7 +258,7 @@ :if c-c++-enable-rtags-support :init (setq rtags-autostart-diagnostics t) - (setq rtags-display-result-backend 'helm) + (add-hook 'rtags-jump-hook 'evil-set-jump) (rtags-diagnostics) (define-key evil-normal-state-map (kbd "RET") 'rtags-select-other-window) (define-key evil-normal-state-map (kbd "M-RET") 'rtags-select) @@ -286,4 +287,14 @@ (defun c-c++/init-helm-rtags () (use-package helm-rtags - :if c-c++-enable-rtags-support)) + :if c-c++-enable-rtags-support + :init + (setq rtags-display-result-backend 'helm) + )) + +(defun c-c++/init-ivy-rtags () + (use-package ivy-rtags + :if c-c++-enable-rtags-support + :init + (setq rtags-display-result-backend 'ivy) + ))