branch: elpa/go-mode
commit 3f02a165dba38295ae4b961482fe50e012a2112a
Author: Jeff Hodges <[email protected]>
Commit: Dominik Honnef <[email protected]>
Add go-guru-definition-other-window
Adds go-guru-definition-other-window that opens the defintion of the
target in another window. Equivalent to godef-jump-other-window.
Fixes #175
---
go-guru.el | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/go-guru.el b/go-guru.el
index c2ac658..ca83cbc 100644
--- a/go-guru.el
+++ b/go-guru.el
@@ -319,11 +319,11 @@ If BUFFER, return the number of characters in that buffer
instead."
"Go to the OFFSETth byte in the current line."
(goto-char (byte-to-position (+ (position-bytes (point-at-bol)) (1-
offset)))))
-(defun go-guru--goto-pos (posn)
+(defun go-guru--goto-pos (posn other-window)
"Find the file containing the position POSN (of the form `file:line:col')
set the point to it, switching the current buffer."
(let ((file-line-pos (split-string posn ":")))
- (find-file (car file-line-pos))
+ (funcall (if other-window #'find-file-other-window #'find-file) (car
file-line-pos))
(goto-char (point-min))
(forward-line (1- (string-to-number (cadr file-line-pos))))
(go-guru--goto-byte-column (string-to-number (cl-caddr file-line-pos)))))
@@ -359,7 +359,7 @@ function containing the current point."
(go-guru--start "callstack"))
;;;###autoload
-(defun go-guru-definition ()
+(defun go-guru-definition (&optional other-window)
"Jump to the definition of the selected identifier."
(interactive)
(or buffer-file-name
@@ -371,10 +371,16 @@ function containing the current point."
;; TODO: Integrate this facility with XRef.
(xref-push-marker-stack)
(ring-insert find-tag-marker-ring (point-marker)))
- (go-guru--goto-pos (cdr (assoc 'objpos res)))
+ (go-guru--goto-pos (cdr (assoc 'objpos res)) other-window)
(message "%s" desc)))
;;;###autoload
+(defun go-guru-definition-other-window ()
+ "Jump to the defintion of the selected identifier in another window"
+ (interactive)
+ (go-guru-definition t))
+
+;;;###autoload
(defun go-guru-describe ()
"Describe the selected syntax, its kind, type and methods."
(interactive)
