From 68aeaebff423a88361b4d80cfd59c93580c520d2 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 23 Sep 2017 21:29:45 +0200
Subject: [PATCH] Move imenu plugins from core to tools/imenu

---
 core/core-editor.el             |  5 -----
 core/packages.el                |  2 --
 modules/tools/imenu/config.el   | 25 +++++++++++++++++++++++++
 modules/tools/imenu/packages.el |  5 +++++
 4 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 modules/tools/imenu/config.el
 create mode 100644 modules/tools/imenu/packages.el

diff --git a/core/core-editor.el b/core/core-editor.el
index 0597aa95a..fa000a031 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -269,11 +269,6 @@ with functions that require it (like modeline segments)."
   :commands (describe-buffer describe-command describe-file
              describe-keymap describe-option describe-option-of-type))
 
-(def-package! imenu-anywhere
-  :commands (ido-imenu-anywhere ivy-imenu-anywhere helm-imenu-anywhere))
-
-(def-package! imenu-list :commands imenu-list-minor-mode)
-
 (def-package! pcre2el :commands rxt-quote-pcre)
 
 (def-package! smart-forward
diff --git a/core/packages.el b/core/packages.el
index 1f19f2ef5..779ff3b85 100644
--- a/core/packages.el
+++ b/core/packages.el
@@ -36,8 +36,6 @@
 (package! editorconfig)
 (package! expand-region)
 (package! help-fns+)
-(package! imenu-anywhere)
-(package! imenu-list)
 (package! pcre2el)
 (package! smart-forward)
 (package! smartparens)
diff --git a/modules/tools/imenu/config.el b/modules/tools/imenu/config.el
new file mode 100644
index 000000000..cbef99643
--- /dev/null
+++ b/modules/tools/imenu/config.el
@@ -0,0 +1,25 @@
+;;; tools/imenu/config.el -*- lexical-binding: t; -*-
+
+(def-package! imenu-anywhere
+  :commands (ido-imenu-anywhere ivy-imenu-anywhere helm-imenu-anywhere)
+  :config (setq imenu-anywhere-delimiter ": "))
+
+
+(def-package! imenu-list
+  :commands imenu-list-minor-mode
+  :config
+  (setq imenu-list-focus-after-activation t)
+  (set! :popup imenu-list-buffer-name :size 35 :align 'right)
+
+  ;; use popups
+  (defun doom*imenu-list-show ()
+    (doom-popup-buffer (get-buffer imenu-list-buffer-name)))
+  (advice-add #'imenu-list-show :override #'doom*imenu-list-show)
+  (advice-add #'imenu-list-show-noselect :override #'doom*imenu-list-show)
+
+  ;; auto kill imenu-list on deactivation
+  (defun doom|kill-imenu-list ()
+    (when (and (not imenu-list-minor-mode)
+               (get-buffer imenu-list-buffer-name))
+      (kill-buffer (get-buffer imenu-list-buffer-name))))
+  (add-hook 'imenu-list-minor-mode-hook #'doom|kill-imenu-list))
diff --git a/modules/tools/imenu/packages.el b/modules/tools/imenu/packages.el
new file mode 100644
index 000000000..0328b7016
--- /dev/null
+++ b/modules/tools/imenu/packages.el
@@ -0,0 +1,5 @@
+;; -*- no-byte-compile: t; -*-
+;;; tools/imenu/packages.el
+
+(package! imenu-anywhere)
+(package! imenu-list)