Merge pull request #761 from vitoshka/jump-to-var

`cider-jump-to-var` is broken when there is no symbol at point

Author: bbatsov

cider-interaction.el

@@ -649,11 +649,15 @@ not found."
                (file (cadr (assoc "file" info))))
     (cider-find-file file)))
 
-(defun cider-jump-to (buffer &optional pos)
+(defun cider-jump-to (buffer &optional pos other-buffer)
   "Push current point onto marker ring, and jump to BUFFER to position POS.
 POS can be either a cons cell (LINE . COLUMN) or a number representing the
-character position in a buffer. "
+character position in a buffer. If OTHER-BUFFER is non-nil use
+`pop-to-buffer' to jump to the location, otherwise `switch-to-buffer'."
   (ring-insert find-tag-marker-ring (point-marker))
+  (if other-buffer
+      (pop-to-buffer buffer)
+    (switch-to-buffer buffer))
   (with-current-buffer buffer
     (widen)
     ;; check if we have a (line . column) pair or just a buffer position
@@ -664,8 +668,7 @@ character position in a buffer. "
       (if (cdr pos)
           (move-to-column (cdr pos))
         (back-to-indentation)))
-    (cider-mode +1))
-  (switch-to-buffer buffer))
+    (cider-mode +1)))
 
 (defun cider-jump-to-resource (path &optional line)
   "Jump to the resource at the relative PATH, optionally at a specific LINE.
@@ -679,24 +682,34 @@ When called interactively, this operates on point."
       (cider-jump-to buffer (cons line nil))
     (message "Cannot find resource %s" path)))
 
-(defun cider-jump-to-var (var &optional line)
-  "Jump to the definition of VAR, optionally at a specific LINE.
-When called interactively, this operates on point, or falls back to a prompt."
-  (interactive (list (cider-read-symbol-name "Symbol: " 'identity)))
-  (cider-ensure-op-supported "info")
-  (-if-let (info (cider-var-info var))
-      (-if-let* ((file (cadr (assoc "file" info)))
-                 (line (or line (cadr (assoc "line" info))))
-                 (buffer (cider-find-file file)))
-          (cider-jump-to buffer (cons line nil))
+(defun cider--jump-to-loc-from-info (info &optional other-buffer)
+  "Jump to location give by INFO.
+INFO object is returned by `cider-var-info' or `cider-member-info'.
+OTHER-BUFFER is passed to `cider-jamp-to'."
+  (-if-let* ((file (cadr (assoc "file" info)))
+             (line (cadr (assoc "line" info)))
+             (buffer (cider-find-file file)))
+      (cider-jump-to buffer (cons line nil) other-buffer)
         ;; var was created interactively and has no file info
         (-if-let* ((ns (cadr (assoc "ns" info)))
                    (name (cadr (assoc "name" info)))
                    (buffer (cider-find-buffer ns))
-                   (pos (cider-locate-def buffer name)))
-            (cider-jump-to buffer pos)
-          (message "No source available for %s" var)))
-    (message "Symbol %s not resolved" var)))
+                   (pos (cider-locate-def name buffer line)))
+            (cider-jump-to buffer pos other-buffer)
+          (-if-let (name (cadr (assoc "name" info)))
+              (message "No location found for %s" name)
+            (message "No source info")))))
+
+(defun cider-jump-to-var (&optional var line)
+  "Jump to the definition of VAR, optionally at a specific LINE.
+When called interactively, this operates on point, or falls back to a prompt."
+  (interactive)
+  (cider-ensure-op-supported "info")
+  (cider-read-symbol-name
+   "Symbol: " (lambda (var)
+                (-if-let (info (cider-var-info var))
+                    (cider--jump-to-loc-from-info info)
+                  (message "Symbol %s not resolved" var)))))
 
 (define-obsolete-function-alias 'cider-jump 'cider-jump-to-var "0.7.0")
 (defalias 'cider-jump-back 'pop-tag-mark)

cider-stacktrace.el

@@ -401,20 +401,12 @@ it wraps to 0."
   (let* ((var (button-get button 'var))
          (class (button-get button 'class))
          (method (button-get button 'method))
-         (line (button-get button 'line))
-         (info (if var
-                   (cider-var-info var)
-                 (cider-member-info class method))))
-    (-if-let* ((file (cadr (assoc "file" info)))
-               (buffer (cider-find-file file)))
-        (cider-jump-to buffer (cons line nil))
-      ;; when no file info, find the location by regexp search
-      (-if-let* ((ns (cadr (assoc "ns" info)))
-                 (name (cadr (assoc "name" info)))
-                 (buffer (cider-find-buffer ns))
-                 (pos (cider-locate-def buffer name)))
-          (cider-jump-to buffer pos)
-        (message "No source info")))))
+         (info (or (and var (cider-var-info var))
+                   (and class method (cider-member-info class method))))
+         ;; stacktrace returns more accurate line numbers
+         (info (cons `("line" ,(button-get button 'line))
+                     info)))
+    (cider--jump-to-loc-from-info info t)))
 
 (defun cider-stacktrace-jump ()
   "Like `cider-jump', but uses the stack frame source at point, if available."

cider-util.el

@@ -152,17 +152,21 @@ Unless you specify a BUFFER it will default to the current one."
     (--filter (equal ns (with-current-buffer it (clojure-find-ns))))
     (car)))
 
-(defun cider-locate-def (buffer name)
-  "Locate in BUFFER the definition of var NAME.
-This is a regexp search and currently works only for top level clojure
-forms that start with '(def'."
+(defun cider-locate-def (name buffer &optional offset-lines)
+  "Locate the definition of var NAME in BUFFER.
+When OFFSET-LINES is non-nil, adjust the returned position by this many
+lines. This is a regexp search and currently works only for top level
+clojure forms that start with '(def'."
   (with-current-buffer buffer
     (save-restriction
       (widen)
       (goto-char (point-min))
       (re-search-forward (format "(def.* %s\\( \\|$\\)" name)
                          nil 'no-error)
-      (goto-char (match-beginning 0)))))
+      (goto-char (match-beginning 0))
+      (when offset-lines
+        (forward-line (1- offset-lines)))
+      (point))))
 
 ;;; Strings