[Fix #625] Fix imenu displaying metadata instead of var name (#626)

Fix metadata being captured instead of var name in clojure-match-next-def.

Co-authored-by: Vadim Rodionov <rodionov@tuta.io>

Author: OknoLombarda

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+### Bugs fixed
+
+* [#625](https://github.com/clojure-emacs/clojure-mode/issues/625): Fix metadata being displayed in imenu instead of var name
+
 ## 5.15.0 (2022-07-19)
 
 ### Changes

clojure-mode.el

@@ -757,7 +757,7 @@ Called by `imenu--generic-function'."
             (when (char-equal ?^ (char-after def-beg))
               ;; move to the beginning of next sexp
               (progn (forward-sexp) (backward-sexp)))
-            (when (or (not (char-equal ?^ (char-after (point))))
+            (when (or (not (char-equal ?^ (char-after def-beg)))
                       (and (char-equal ?^ (char-after (point))) (= def-beg (point))))
               (setq found? t)
               (when (string= deftype "defmethod")

test.clj

@@ -227,6 +227,10 @@
 ;; definitions with metadata only don't cause freezing
 (def ^String)
 
+(defmulti multi (fn [a _] a))
+(defmethod multi :test [_ b] b)
+(defmethod multi :best [_ b] b)
+
 (defn ^String reverse
   "Returns s with its characters reversed."
   {:added "1.2"}

test/clojure-mode-syntax-test.el

@@ -89,7 +89,31 @@
         (with-clojure-buffer (concat form some-sexp)
           (end-of-buffer)
           (clojure-match-next-def)
-          (expect (looking-at "(def")))))))
+          (expect (looking-at "(def"))))))
+
+  (it "captures var name"
+    (let ((var-name "some-name"))
+      (dolist (form '("(def %s 1)"
+                      "(def %s)"
+                      "(def ^:private %s 2)"
+                      "(def ^{:private true} %s 3)"))
+        (with-clojure-buffer (format form var-name)
+          (end-of-buffer)
+          (clojure-match-next-def)
+          (cl-destructuring-bind (name-beg name-end) (match-data)
+            (expect (string= var-name (buffer-substring name-beg name-end))))))))
+
+  (it "captures var name with dispatch value for defmethod"
+    (let ((name "some-name :key"))
+      (dolist (form '("(defmethod %s [a])"
+                      "(defmethod ^:meta %s [a])"
+                      "(defmethod ^{:meta true} %s [a])"
+                      "(defmethod %s)"))
+        (with-clojure-buffer (format form name)
+          (end-of-buffer)
+          (clojure-match-next-def)
+          (cl-destructuring-bind (name-beg name-end) (match-data)
+            (expect (string= name (buffer-substring name-beg name-end)))))))))
 
 (describe "clojure syntax"
   (it "handles prefixed symbols"