diff options
author | Roger Gilliar <roger@gilliar.de> | 2015-10-12 18:56:08 +0200 |
---|---|---|
committer | Roger Gilliar <roger@gilliar.de> | 2015-10-19 20:43:22 +0200 |
commit | 915f5639d821be8f1847d80a770840437c358c88 (patch) | |
tree | f65edb8bd3f265e395f076e3d5a0669b476f4969 /cider-resolve.el | |
parent | e9909b86ac06a8df35fbc1280003ed381c25b7fe (diff) |
[Fix #1348] Remove dash dependency
Diffstat (limited to 'cider-resolve.el')
-rw-r--r-- | cider-resolve.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cider-resolve.el b/cider-resolve.el index 91a93a8a..c617f6f9 100644 --- a/cider-resolve.el +++ b/cider-resolve.el @@ -66,6 +66,7 @@ (require 'cider-client) (require 'nrepl-client) +(require 'cider-util) (defvar cider-repl-ns-cache) @@ -94,7 +95,7 @@ Return nil only if VAR cannot be resolved." (cider-resolve--get-in (or var-ns ns) "interns" name) (unless var-ns ;; If the var had no prefix, it might be referred. - (-if-let (referal (cider-resolve--get-in ns "refers" name)) + (if-let (referal (cider-resolve--get-in ns "refers" name)) (cider-resolve-var ns referal) ;; Or it might be from core. (unless (equal ns "clojure.core") @@ -106,16 +107,16 @@ This will be clojure.core or cljs.core depending on `cider-repl-type'." (when (cider-connected-p) (with-current-buffer (cider-current-connection) (cider-resolve--get-in (if (equal cider-repl-type "cljs") - "cljs.core" - "clojure.core"))))) + "cljs.core" + "clojure.core"))))) (defun cider-resolve-ns-symbols (ns) "Return a plist of all valid symbols in NS. Each entry's value is the metadata of the var that the symbol refers to. NS can be the namespace name, or a dict of the namespace itself." - (-when-let (dict (if (stringp ns) - (cider-resolve--get-in ns) - ns)) + (when-let (dict (if (stringp ns) + (cider-resolve--get-in ns) + ns)) (nrepl-dbind-response dict (interns refers aliases) (append (cdr interns) (nrepl-dict-flat-map (lambda (alias namespace) |