Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make sure file is non-nil in cider--jump-to-loc-from-info #807

Merged
merged 2 commits into from
Sep 16, 2014
Merged

make sure file is non-nil in cider--jump-to-loc-from-info #807

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1b367a
make sure file is non-nil in `cider--jump-to-loc-from-info`
vspinu Sep 16, 2014
fb7e019
[Fix #781] Insert the full ns-form on into dummy eval file
vspinu Sep 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions cider-interaction.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,9 +707,10 @@ INFO object is returned by `cider-var-info' or `cider-member-info'.
OTHER-BUFFER is passed to `cider-jamp-to'."
(let* ((line (nrepl-dict-get info "line"))
(file (nrepl-dict-get info "file"))
(buffer (unless (cider--tooling-file-p file)
(cider-find-file file))))
(if buffer
(buffer (and file
(not (cider--tooling-file-p file))
(cider-find-file file))))
(if buffer
(cider-jump-to buffer line other-buffer)
(message "No source location"))))

Expand Down Expand Up @@ -1276,12 +1277,15 @@ When invoked with a prefix ARG the command doesn't prompt for confirmation."
(cider-current-ns))))

(defun cider--dummy-file-contents (form start-pos)
(let ((current-ns (cider-current-ns))
(start-line (line-number-at-pos start-pos))
(start-column (save-excursion (goto-char start-pos) (current-column))))
(let* ((ns-form (if (cider-ns-form-p form)
""
(cider-ns-form)))
(ns-form-lines (length (split-string ns-form "\n")))
(start-line (line-number-at-pos start-pos))
(start-column (save-excursion (goto-char start-pos) (current-column))))
(concat
(format "(ns %s)" current-ns)
(make-string (1- start-line) ?\n)
ns-form
(make-string (- start-line ns-form-lines) ?\n)
(make-string start-column ? )
form)))

Expand Down