[elpa] externals/leaf 74d3498 05/29: Merge pull request #444 from conao3/feature#443

[Stefan Monnier]

branch: externals/leaf
commit 74d3498789fdf8b6d5c692afec6dcfe51a80548b
Merge: a2f9c2b 09f2e23
Author: Naoya Yamashita <conao3@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #444 from conao3/feature#443
    
    feature#443
---
 leaf-tests.el | 19 ++++++++++++++++++-
 leaf.el       | 21 +++++++++++----------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/leaf-tests.el b/leaf-tests.el
index a069fc3..477ccc3 100644
--- a/leaf-tests.el
+++ b/leaf-tests.el
@@ -2761,7 +2761,24 @@ Example:
               :init
               (leaf package-baz)))))
        (mapcar 'car (cdr (assoc "Leaf" (funcall 
imenu-create-index-function)))))
-     '("package-foo" "package-bar" "package-baz"))))
+     '("package-foo" "package-bar" "package-baz"))
+
+    ((with-temp-buffer
+       (require 'imenu)
+       (emacs-lisp-mode)
+       (insert
+        "\
+(leaf scala-mode
+  :ensure t
+  :after t
+  :init
+  (defun lsp-format-before-save ()
+    (add-hook 'before-save-hook 'lsp-format-buffer nil t))
+  :hook (scala-mode-hook . lsp-format-before-save)
+  :config (leaf lsp-metals :ensure t :require t)
+  (leaf *scala-flycheck-integration))")
+       (mapcar 'car (cdr (assoc "Leaf" (funcall 
imenu-create-index-function)))))
+     '("scala-mode" "lsp-metals" "*scala-flycheck-integration"))))
 
 ;; (provide 'leaf-tests)
 
diff --git a/leaf.el b/leaf.el
index 583356c..5bf7e68 100644
--- a/leaf.el
+++ b/leaf.el
@@ -5,7 +5,7 @@
 ;; Author: Naoya Yamashita <conao3@gmail.com>
 ;; Maintainer: Naoya Yamashita <conao3@gmail.com>
 ;; Keywords: lisp settings
-;; Version: 4.2.6
+;; Version: 4.2.7
 ;; URL: https://github.com/conao3/leaf.el
 ;; Package-Requires: ((emacs "24.4"))
 
@@ -415,18 +415,19 @@ Ref: `lisp-imenu-generic-expression'."
          (set sym value)
          (eval-after-load 'lisp-mode
            (let ((regexp (eval-when-compile
-                           (require 'regexp-opt)
-                           (concat "^\\s-*("
-                                   (regexp-opt '("leaf") t)
-                                   "\\s-+\\("
-                                   (or (bound-and-true-p 
lisp-mode-symbol-regexp)
-                                       "\\(?:\\sw\\|\\s_\\|\\\\.\\)+")
-                                   "\\)"))))
+                           (require 'rx)
+                           (rx-to-string
+                            `(and (* any) "(" (* space) "leaf" (+ space)
+                                  (group
+                                   (regexp
+                                    ,(or (bound-and-true-p 
lisp-mode-symbol-regexp)
+                                         "\\(?:\\sw\\|\\s_\\|\\\\.\\)+"))))
+                            'nogroup))))
              (if value
                  `(add-to-list 'lisp-imenu-generic-expression
-                               '("Leaf" ,regexp 2))
+                               '("Leaf" ,regexp 1))
                `(setq lisp-imenu-generic-expression
-                      (remove '("Leaf" ,regexp 2)
+                      (delete '("Leaf" ,regexp 1)
                               lisp-imenu-generic-expression))))))
   :group 'leaf)