Skip to content

Update nREPL requests. #12

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

Open
edipofederle wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update nREPL requests. #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
607acf9
Update nREPL requests.
edipofederle Dec 18, 2015
3585d80
use repl-dict-get
edipofederle Dec 18, 2015
626fe48
use repl-dict-get all places
edipofederle Dec 18, 2015
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
21 changes: 13 additions & 8 deletions expectations-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,16 @@
(defun expectations-eval (string &optional handler stdout-handler synch)
(if synch
(funcall handler (current-buffer)
(plist-get (nrepl-send-string-sync string (cider-current-ns)) :value)
(nrepl-dict-get (nrepl-sync-request:eval string (cider-current-connection) (cider-current-session) (cider-current-ns)) "value")
synch)
(nrepl-send-string string
(expectations-response-handler (or handler #'identity) stdout-handler)
(cider-current-ns))))

(cider-nrepl-send-request
(list "op" "eval"
"ns" (cider-current-ns)
"code" string
"session" (cider-current-session))
(expectations-response-handler (or handler #'identity) stdout-handler))))


(defun expectations-test-clear (&optional callback synch)
"Clear all counters and unmap generated vars for expectations"
Expand Down Expand Up @@ -257,9 +262,9 @@ it."
(let* ((ns (match-string 2))
(filename
(read
(plist-get (nrepl-send-string-sync (format "(-> \"%s\" symbol ns-publics first val meta :file)" ns)
(cider-current-ns))
:value))))
(nrepl-dict-get (nrepl-sync-request:eval (format "(-> \"%s\" symbol ns-publics first val meta :file)" ns)
(cider-current-connection) (cider-current-session) (cider-current-ns) )
"value"))))
(list filename)))

(defun expectations-kill-compilation-buffer ()
Expand Down Expand Up @@ -324,7 +329,7 @@ it."
(sort-by (comp :line meta) (vals (ns-publics (find-ns '%s))))))"
(line-number-at-pos)
(cider-current-ns))))
(plist-get (nrepl-send-string-sync clj (cider-current-ns)) :value)))
(nrepl-dict-get (nrepl-sync-request:eval clj (cider-current-connection) (cider-current-session) (cider-current-ns)) "value")))

(defun expectations-run-test (&optional synch)
"Run test at point"
Expand Down