From e50157bcecb2e06a5450a0cd35a72f354fa839e9 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 13 Mar 2019 01:35:46 -0400 Subject: [PATCH] Restore reverted ee6e4a8b Although Yevgnen/ivy-rich#51 was merged upstream, due to Melpa issues, it hasn't been pulled. I'll restore this under it has. --- modules/completion/ivy/config.el | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index e07c7db23..e3389b867 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -93,7 +93,17 @@ immediately runs it on the current candidate (ending the ivy session)." (colplist (plist-get plist :columns)) (switch-buffer-alist (assq 'ivy-rich-candidate colplist))) (when switch-buffer-alist - (setcar switch-buffer-alist '+ivy-rich-buffer-name)))) + (setcar switch-buffer-alist '+ivy-rich-buffer-name))) + + (defun +ivy*rich-counsel-function-docstring (candidate) + (let ((doc (replace-regexp-in-string + ":\\(\\(before\\|after\\)\\(-\\(whilte\\|until\\)\\)?\\|around\\|override\\|\\(filter-\\(args\\|return\\)\\)\\) advice:[ ]*‘.+?’[\r\n]+" + "" + (or (ignore-errors (documentation (intern-soft candidate))) "")))) + (if (string-match "^\\(.+\\)\\([\r\n]\\)?" doc) + (setq doc (match-string 1 doc)) + ""))) + (advice-add #'ivy-rich-counsel-function-docstring :override #'+ivy*rich-counsel-function-docstring)) (def-package! counsel