Skip to content

cider compatibility #5

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
abp wants to merge 2 commits into
base: master
Choose a base branch
from
Open

cider compatibility #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6581234
cider compatibility
abp Apr 1, 2014
6f2e04c
Missed a function when renaming nrepl-* to cider-*
abp Apr 1, 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
19 changes: 10 additions & 9 deletions expectations-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
;;; Code:

(require 'clojure-mode)
(require 'nrepl)
(require 'nrepl-client)
(require 'cider-interaction)

(defface expectations-failure-face
'((((class color) (background light))
Expand Down Expand Up @@ -84,19 +85,19 @@
(lambda (buffer value)
(when stdout-handler
(funcall stdout-handler value))
(nrepl-emit-interactive-output value))
(cider-repl-emit-interactive-output value))
(lambda (buffer err)
(message (format "%s" err)))
'())))

(defun expectations-eval (string &optional handler stdout-handler synch)
(if synch
(funcall handler (current-buffer)
(plist-get (nrepl-send-string-sync string (nrepl-current-ns)) :value)
(plist-get (nrepl-send-string-sync string (cider-current-ns)) :value)
synch)
(nrepl-send-string string
(expectations-response-handler (or handler #'identity) stdout-handler)
(nrepl-current-ns))))
(cider-current-ns))))

(defun expectations-test-clear (&optional callback synch)
"Clear all counters and unmap generated vars for expectations"
Expand Down Expand Up @@ -160,7 +161,7 @@
(defun expectations-run-and-extract-results (runner-fn buffer value &optional synch)
(expectations-kill-compilation-buffer)
(with-current-buffer buffer
(nrepl-load-current-buffer)
(cider-load-current-buffer)
(expectations-eval
(format "(do
%s
Expand Down Expand Up @@ -224,7 +225,7 @@ it."
(filename
(read
(plist-get (nrepl-send-string-sync (format "(-> \"%s\" symbol ns-publics first val meta :file)" ns)
(nrepl-current-ns))
(cider-current-ns))
:value))))
(list filename)))

Expand All @@ -243,7 +244,7 @@ it."
(defun expectations-display-compilation-buffer (out)
(with-current-buffer (get-buffer-create "*expectations*")
(expectations-results-mode)
(nrepl-emit-into-color-buffer (current-buffer) out)
(cider-emit-into-color-buffer (current-buffer) out)
(display-buffer (current-buffer))
(setq next-error-last-buffer (current-buffer))
(compilation-set-window-height (get-buffer-window "*expectations*"))))
Expand All @@ -264,8 +265,8 @@ it."
(let ((clj (format "(first (filter (fn [v] (>= (-> v meta :line) %d))
(sort-by (comp :line meta) (vals (ns-publics (find-ns '%s))))))"
(line-number-at-pos)
(nrepl-current-ns))))
(plist-get (nrepl-send-string-sync clj (nrepl-current-ns)) :value)))
(cider-current-ns))))
(plist-get (nrepl-send-string-sync clj (cider-current-ns)) :value)))

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