More experimentation with rtags

1 files changed, 45 insertions, 8 deletions

diff --git a/lisp/ravi-init-cpp.el b/lisp/ravi-init-cpp.el
index 09a0d5b..7e69bec 100644
--- a/lisp/ravi-init-cpp.el
+++ b/lisp/ravi-init-cpp.el
@@ -107,17 +107,30 @@
   :ensure t)
 
 ;; Bind to f6 later; to do: pretty docstrings
-(defhydra rtags-hydra (:color blue)
+(defhydra rtags-hydra (:color blue :hint nil)
+  "
+^At point^          ^Location^     ^File^            ^Information
+^^^^^^^^----------------------------------------------------------------
+_._: symbol         _[_: back      _p_: dependencies _D_: diagnostics
+_,_: references     _]_: forward   _e_: reparse      _S_: summary
+_v_: virtuals       _L_: copy      _E_: preprocess   _B_: rtags buffer
+_V_: enum value     _O_: to offset _C_: compile      _h_: class hierarchy
+_/_: all references _F_: fixit     _I_: imenu        _>_: find symbol
+_G_: guess function _K_: member    _T_: tag list     _<_: find references
+_X_: fix fixit      _Z_: stack     _;_: find file    _R_: rename symbol
+_M_: symbol info    _A_: functions _a_: source args  _P_: all deps
+"
   ("." rtags-find-symbol-at-point "find-symbol-at-point")
   ("," rtags-find-references-at-point "find-references-at-point")
   ("v" rtags-find-virtuals-at-point "find-virtuals-at-point")
   ("V" rtags-print-enum-value-at-point "print-enum-value-at-point")
   ("/" rtags-find-all-references-at-point "find-all-references-at-point")
-  ("Y" rtags-cycle-overlays-on-screen "cycle-overlays-on-screen")
+  ;; ("Y" rtags-cycle-overlays-on-screen "cycle-overlays-on-screen")
   (">" rtags-find-symbol "find-symbol")
   ("<" rtags-find-references "find-references")
-  ("[" rtags-location-stack-back "location-stack-back")
-  ("]" rtags-location-stack-forward "location-stack-forward")
+  ("[" rtags-location-stack-back "location-stack-back" :exit nil)
+  ("]" rtags-location-stack-forward "location-stack-forward" :exit nil)
+  ("Z" rtags-location-stack-visualize "location-stack-visualize")
   ("D" rtags-diagnostics "diagnostics")
   ("C" rtags-compile-file "compile-file")
   ("G" rtags-guess-function-at-point "guess-function-at-point")
@@ -127,27 +140,47 @@
   ("E" rtags-preprocess-file "preprocess-file")
   ("R" rtags-rename-symbol "rename-symbol")
   ("M" rtags-symbol-info "symbol-info")
-  ("S" rtags-display-summary "display-summary")
+  ("S" rtags-display-summary-as-message "display-summary")
   ("O" rtags-goto-offset "goto-offset")
   (";" rtags-find-file "find-file")
   ("F" rtags-fixit "fixit")
   ("L" rtags-copy-and-print-current-location "copy-and-print-current-location")
   ("X" rtags-fix-fixit-at-point "fix-fixit-at-point")
   ("B" rtags-show-rtags-buffer "show-rtags-buffer")
+  ("K" rtags-make-member "make-member")
+  ("A" rtags-find-functions-called-by-this-function "find-functions-called-by-this-function")
   ("I" rtags-imenu "imenu")
   ("T" rtags-taglist "taglist")
   ("h" rtags-print-class-hierarchy "print-class-hierarchy")
   ("a" rtags-print-source-arguments "print-source-arguments"))
-(defhydra hydra-cextra (:color blue)
-  "c extra"
+(defhydra hydra-cextra (:color blue :hint nil)
+  "
+------------------------------------------------------------------
+_i_: hide ifdef     _C-i_: show    _b_: hide/show      _o_: other file
+"
   ("i" hide-ifdef-block "hide ifdef")
   ("C-i" show-ifdef-block "show ifdef")
   ("b" hs-toggle-hiding "hide/show block")
   ("o" ff-find-other-file "other file"))
 (defhydra cextra-rtags-hydra (:inherit
                               (hydra-cextra/heads rtags-hydra/heads)
+                              :hint nil
                               :color blue)
-  "rtags + cextra")
+  "
+^At point^          ^Location^     ^File^            ^Information
+^^^^^^^^----------------------------------------------------------------
+_._: symbol         _[_: back      _p_: dependencies _D_: diagnostics
+_,_: references     _]_: forward   _e_: reparse      _S_: summary
+_v_: virtuals       _L_: copy      _E_: preprocess   _B_: rtags buffer
+_V_: enum value     _O_: to offset _C_: compile      _h_: class hierarchy
+_/_: all references _F_: fixit     _I_: imenu        _>_: find symbol
+_G_: guess function _K_: member    _T_: tag list     _<_: find references
+_X_: fix fixit      _Z_: stack     _;_: find file    _R_: rename symbol
+_M_: symbol info    _A_: functions _a_: source args  _P_: all deps
+^^^^^^^------------------------------------------------------------------
+_i_: hide ifdef     _C-i_: show    _b_: hide/show    _o_: other file
+"
+  )
 
 (use-package cc-mode
 
@@ -455,7 +488,11 @@ this to 3 makes header-protection define KIG_MISC_NEWTYPE_H for a file named
       (progn
         (setq use-rtags-hydra t)
         (setq rtags-path (ravi/emacs-file "site-lisp/rtags/bin"))
+        (setq rtags-autostart-diagnostics t)
+        (setq rtags-completions-enabled t)
         (rtags-start-process-unless-running)
+        (when ravi/use-helm-instead-of-ido
+          (setq rtags-display-result-backend 'helm))
 
         ;; Extra support for company-c-headers if we can get include paths
         ;; from the compilation command line from rtags