diff options
| -rw-r--r-- | cider-browse-ns.el | 10 | ||||
| -rw-r--r-- | cider-client.el | 64 | ||||
| -rw-r--r-- | cider-compat.el | 2 | ||||
| -rw-r--r-- | cider-debug.el | 17 | ||||
| -rw-r--r-- | cider-eldoc.el | 12 | ||||
| -rw-r--r-- | cider-inspector.el | 20 | ||||
| -rw-r--r-- | cider-interaction.el | 57 | ||||
| -rw-r--r-- | cider-macroexpansion.el | 17 | ||||
| -rw-r--r-- | cider-test.el | 37 | ||||
| -rw-r--r-- | cider.el | 6 |
10 files changed, 122 insertions, 120 deletions
diff --git a/cider-browse-ns.el b/cider-browse-ns.el index b142ecfe..f44216fa 100644 --- a/cider-browse-ns.el +++ b/cider-browse-ns.el @@ -174,11 +174,11 @@ Each item consists of a ns-var and the first line of its docstring." Return a list of the type ('ns or 'var) and the value." (let ((line (car (split-string (string-trim (thing-at-point 'line)) " ")))) (if (string-match "\\." line) - (list 'ns line) - (list 'var (format "%s/%s" - (or (get-text-property (point) 'cider-browse-ns-current-ns) - cider-browse-ns-current-ns) - line))))) + `(ns ,line) + `(var ,(format "%s/%s" + (or (get-text-property (point) 'cider-browse-ns-current-ns) + cider-browse-ns-current-ns) + line))))) (defun cider-browse-ns-doc-at-point () "Show the documentation for the thing at current point." diff --git a/cider-client.el b/cider-client.el index f921af71..8d10ab93 100644 --- a/cider-client.el +++ b/cider-client.el @@ -731,9 +731,9 @@ with respect to the bound values of \\=`*print-length*\\=`, \\=`*print-level*\\= PPRINT-FN is the name of the Clojure function to use. RIGHT-MARGIN specifies the maximum column-width of the pretty-printed result, and is included in the request if non-nil." - (append (list "pprint" "true" - "pprint-fn" (or pprint-fn (cider--pprint-fn))) - (and right-margin (list "print-right-margin" right-margin)))) + (nconc `("pprint" "true" + "pprint-fn" ,(or pprint-fn (cider--pprint-fn))) + (and right-margin `("print-right-margin" ,right-margin)))) (defun cider-tooling-eval (input callback &optional ns) "Send the request INPUT and register the CALLBACK as the response handler. @@ -851,10 +851,10 @@ loaded. If CONNECTION is nil, use `cider-current-connection'. If CALLBACK is nil, use `cider-load-file-handler'." - (cider-nrepl-send-request (list "op" "load-file" - "file" file-contents - "file-path" file-path - "file-name" file-name) + (cider-nrepl-send-request `("op" "load-file" + "file" ,file-contents + "file-path" ,file-path + "file-name" ,file-name) (or callback (cider-load-file-handler (current-buffer))) connection)) @@ -897,17 +897,17 @@ Optional arguments include SEARCH-NS, DOCS-P, PRIVATES-P, CASE-SENSITIVE-P." (defun cider-sync-request:classpath () "Return a list of classpath entries." (cider-ensure-op-supported "classpath") - (thread-first (list "op" "classpath") + (thread-first '("op" "classpath") (cider-nrepl-send-sync-request) (nrepl-dict-get "classpath"))) (defun cider-sync-request:complete (str context) "Return a list of completions for STR using nREPL's \"complete\" op. CONTEXT represents a completion context for compliment." - (when-let ((dict (thread-first (list "op" "complete" - "ns" (cider-current-ns) - "symbol" str - "context" context) + (when-let ((dict (thread-first `("op" "complete" + "ns" ,(cider-current-ns) + "symbol" ,str + "context" ,context) (cider-nrepl-send-sync-request nil 'abort-on-input)))) (nrepl-dict-get dict "completions"))) @@ -915,9 +915,9 @@ CONTEXT represents a completion context for compliment." "Send \"info\" op with parameters SYMBOL or CLASS and MEMBER." (let ((var-info (thread-first `("op" "info" "ns" ,(cider-current-ns) - ,@(when symbol (list "symbol" symbol)) - ,@(when class (list "class" class)) - ,@(when member (list "member" member))) + ,@(when symbol `("symbol" ,symbol)) + ,@(when class `("class" ,class)) + ,@(when member `("member" ,member))) (cider-nrepl-send-sync-request)))) (if (member "no-info" (nrepl-dict-get var-info "status")) nil @@ -927,9 +927,9 @@ CONTEXT represents a completion context for compliment." "Send \"eldoc\" op with parameters SYMBOL or CLASS and MEMBER." (when-let ((eldoc (thread-first `("op" "eldoc" "ns" ,(cider-current-ns) - ,@(when symbol (list "symbol" symbol)) - ,@(when class (list "class" class)) - ,@(when member (list "member" member))) + ,@(when symbol `("symbol" ,symbol)) + ,@(when class `("class" ,class)) + ,@(when member `("member" ,member))) (cider-nrepl-send-sync-request nil 'abort-on-input)))) (if (member "no-eldoc" (nrepl-dict-get eldoc "status")) nil @@ -937,55 +937,55 @@ CONTEXT represents a completion context for compliment." (defun cider-sync-request:ns-list () "Get a list of the available namespaces." - (thread-first (list "op" "ns-list" - "filter-regexps" cider-filtered-namespaces-regexps) + (thread-first `("op" "ns-list" + "filter-regexps" ,cider-filtered-namespaces-regexps) (cider-nrepl-send-sync-request) (nrepl-dict-get "ns-list"))) (defun cider-sync-request:ns-vars (ns) "Get a list of the vars in NS." - (thread-first (list "op" "ns-vars" - "ns" ns) + (thread-first `("op" "ns-vars" + "ns" ,ns) (cider-nrepl-send-sync-request) (nrepl-dict-get "ns-vars"))) (defun cider-sync-request:ns-vars-with-meta (ns) "Get a map of the vars in NS to its metadata information." - (thread-first (list "op" "ns-vars-with-meta" - "ns" ns) + (thread-first `("op" "ns-vars-with-meta" + "ns" ,ns) (cider-nrepl-send-sync-request) (nrepl-dict-get "ns-vars-with-meta"))) (defun cider-sync-request:ns-load-all () "Load all project namespaces." - (thread-first (list "op" "ns-load-all") + (thread-first '("op" "ns-load-all") (cider-nrepl-send-sync-request) (nrepl-dict-get "loaded-ns"))) (defun cider-sync-request:resource (name) "Perform nREPL \"resource\" op with resource name NAME." - (thread-first (list "op" "resource" - "name" name) + (thread-first `("op" "resource" + "name" ,name) (cider-nrepl-send-sync-request) (nrepl-dict-get "resource-path"))) (defun cider-sync-request:resources-list () "Return a list of all resources on the classpath." - (thread-first (list "op" "resources-list") + (thread-first '("op" "resources-list") (cider-nrepl-send-sync-request) (nrepl-dict-get "resources-list"))) (defun cider-sync-request:format-code (code) "Perform nREPL \"format-code\" op with CODE." - (thread-first (list "op" "format-code" - "code" code) + (thread-first `("op" "format-code" + "code" ,code) (cider-nrepl-send-sync-request) (nrepl-dict-get "formatted-code"))) (defun cider-sync-request:format-edn (edn right-margin) "Perform \"format-edn\" op with EDN and RIGHT-MARGIN." - (let* ((response (thread-first (list "op" "format-edn" - "edn" edn) + (let* ((response (thread-first `("op" "format-edn" + "edn" ,edn) (append (cider--nrepl-pprint-request-plist right-margin)) (cider-nrepl-send-sync-request))) (err (nrepl-dict-get response "err"))) diff --git a/cider-compat.el b/cider-compat.el index c34bc7bf..4f6e9d8a 100644 --- a/cider-compat.el +++ b/cider-compat.el @@ -151,7 +151,7 @@ bound and (optionally) used in BODY, and its cadr is a sexp to be evalled to set symbol's value. In the special case you only want to bind a single value, BINDINGS can just be a plain tuple." (declare (indent 1) (debug if-let)) - (list 'if-let bindings (macroexp-progn body))))) + `(if-let ,bindings ,(macroexp-progn body))))) (provide 'cider-compat) ;;; cider-compat.el ends here diff --git a/cider-debug.el b/cider-debug.el index 9d762cd8..6626f1c9 100644 --- a/cider-debug.el +++ b/cider-debug.el @@ -122,7 +122,7 @@ This variable must be set before starting the repl connection." (defun cider-browse-instrumented-defs () "List all instrumented definitions." (interactive) - (if-let ((all (thread-first (cider-nrepl-send-sync-request (list "op" "debug-instrumented-defs")) + (if-let ((all (thread-first (cider-nrepl-send-sync-request '("op" "debug-instrumented-defs")) (nrepl-dict-get "list")))) (with-current-buffer (cider-popup-buffer cider-browse-ns-buffer t) (let ((inhibit-read-only t)) @@ -162,11 +162,11 @@ This variable must be set before starting the repl connection." (defun cider--debug-init-connection () "Initialize a connection with the cider.debug middleware." (cider-nrepl-send-request - (append '("op" "init-debugger") - (when cider-debug-print-level - (list "print-level" cider-debug-print-level)) - (when cider-debug-print-length - (list "print-length" cider-debug-print-length))) + (nconc '("op" "init-debugger") + (when cider-debug-print-level + `("print-level" ,cider-debug-print-level)) + (when cider-debug-print-length + `("print-length" ,cider-debug-print-length))) #'cider--debug-response-handler)) @@ -417,8 +417,9 @@ message." (when (and (string-prefix-p ":" command) force) (setq command (format "{:response %s :force? true}" command))) (cider-nrepl-send-unhandled-request - (list "op" "debug-input" "input" (or command ":quit") - "key" (or key (nrepl-dict-get cider--debug-mode-response "key")))) + `("op" "debug-input" + "input" ,(or command ":quit") + "key" ,(or key (nrepl-dict-get cider--debug-mode-response "key")))) (ignore-errors (cider--debug-mode -1))) (defun cider--debug-quit () diff --git a/cider-eldoc.el b/cider-eldoc.el index ed0a8bc4..5314ef26 100644 --- a/cider-eldoc.el +++ b/cider-eldoc.el @@ -313,9 +313,9 @@ Then go back to the point and return its eldoc." (goto-char current-point) (when-let (eldoc-info (cider-eldoc-info (cider--eldoc-remove-dot (cider-symbol-at-point)))) - (list "eldoc-info" eldoc-info - "thing" (cider-symbol-at-point) - "pos" 0))))))) + `("eldoc-info" ,eldoc-info + "thing" ,(cider-symbol-at-point) + "pos" 0))))))) (defun cider-eldoc-info-at-sexp-beginning () "Return eldoc info for first symbol in the sexp." @@ -328,9 +328,9 @@ Then go back to the point and return its eldoc." (cider-in-comment-p)) (when-let (eldoc-info (cider-eldoc-info (cider--eldoc-remove-dot (cider-symbol-at-point)))) - (list "eldoc-info" eldoc-info - "thing" (cider-symbol-at-point) - "pos" argument-index)))))) + `("eldoc-info" ,eldoc-info + "thing" ,(cider-symbol-at-point) + "pos" ,argument-index)))))) (defun cider-eldoc-info-in-current-sexp () "Return eldoc information from the sexp. diff --git a/cider-inspector.el b/cider-inspector.el index b173d21d..7c7c454c 100644 --- a/cider-inspector.el +++ b/cider-inspector.el @@ -192,39 +192,39 @@ Current page will be reset to zero." ;; nREPL interactions (defun cider-sync-request:inspect-pop () "Move one level up in the inspector stack." - (thread-first (list "op" "inspect-pop") + (thread-first '("op" "inspect-pop") (cider-nrepl-send-sync-request) (nrepl-dict-get "value"))) (defun cider-sync-request:inspect-push (idx) "Inspect the inside value specified by IDX." - (thread-first (list "op" "inspect-push" - "idx" idx) + (thread-first `("op" "inspect-push" + "idx" ,idx) (cider-nrepl-send-sync-request) (nrepl-dict-get "value"))) (defun cider-sync-request:inspect-refresh () "Re-render the currently inspected value." - (thread-first (list "op" "inspect-refresh") + (thread-first '("op" "inspect-refresh") (cider-nrepl-send-sync-request) (nrepl-dict-get "value"))) (defun cider-sync-request:inspect-next-page () "Jump to the next page in paginated collection view." - (thread-first (list "op" "inspect-next-page") + (thread-first '("op" "inspect-next-page") (cider-nrepl-send-sync-request) (nrepl-dict-get "value"))) (defun cider-sync-request:inspect-prev-page () "Jump to the previous page in paginated collection view." - (thread-first (list "op" "inspect-prev-page") + (thread-first '("op" "inspect-prev-page") (cider-nrepl-send-sync-request) (nrepl-dict-get "value"))) (defun cider-sync-request:inspect-set-page-size (page-size) "Set the page size in paginated view to PAGE-SIZE." - (thread-first (list "op" "inspect-set-page-size" - "page-size" page-size) + (thread-first `("op" "inspect-set-page-size" + "page-size" ,page-size) (cider-nrepl-send-sync-request) (nrepl-dict-get "value"))) @@ -232,8 +232,8 @@ Current page will be reset to zero." "Evaluate EXPR in context of NS and inspect its result. Set the page size in paginated view to PAGE-SIZE." (thread-first (append (nrepl--eval-request expr ns) - (list "inspect" "true" - "page-size" page-size)) + `("inspect" "true" + "page-size" ,page-size)) (cider-nrepl-send-sync-request) (nrepl-dict-get "value"))) diff --git a/cider-interaction.el b/cider-interaction.el index d08d6d09..dc1ed068 100644 --- a/cider-interaction.el +++ b/cider-interaction.el @@ -444,8 +444,8 @@ Invert meaning of `cider-prompt-for-symbol' if PREFIX indicates it should be." (defun cider-sync-request:ns-path (ns) "Get the path to the file containing NS." - (thread-first (list "op" "ns-path" - "ns" ns) + (thread-first `("op" "ns-path" + "ns" ,ns) cider-nrepl-send-sync-request (nrepl-dict-get "path"))) @@ -877,14 +877,13 @@ into a new error buffer." ;; Causes are returned as a series of messages, which we aggregate in `causes' (let (causes) (cider-nrepl-send-request - (append - (list "op" "stacktrace") - (when (cider--pprint-fn) - (list "pprint-fn" (cider--pprint-fn))) - (when cider-stacktrace-print-length - (list "print-length" cider-stacktrace-print-length)) - (when cider-stacktrace-print-level - (list "print-level" cider-stacktrace-print-level))) + (nconc '("op" "stacktrace") + (when (cider--pprint-fn) + `("pprint-fn" ,(cider--pprint-fn))) + (when cider-stacktrace-print-length + `("print-length" ,cider-stacktrace-print-length)) + (when cider-stacktrace-print-level + `("print-level" ,cider-stacktrace-print-level))) (lambda (response) ;; While the return value of `cider--handle-stacktrace-response' is not ;; meaningful for the last message, we do not need the value of `causes' @@ -1373,9 +1372,9 @@ See `cider-mode'." (defun cider-sync-request:toggle-trace-var (symbol) "Toggle var tracing for SYMBOL." - (thread-first (list "op" "toggle-trace-var" - "ns" (cider-current-ns) - "sym" symbol) + (thread-first `("op" "toggle-trace-var" + "ns" ,(cider-current-ns) + "sym" ,symbol) (cider-nrepl-send-sync-request))) (defun cider--toggle-trace-var (sym) @@ -1402,8 +1401,8 @@ opposite of what that option dictates." (defun cider-sync-request:toggle-trace-ns (ns) "Toggle namespace tracing for NS." - (thread-first (list "op" "toggle-trace-ns" - "ns" ns) + (thread-first `("op" "toggle-trace-ns" + "ns" ,ns) (cider-nrepl-send-sync-request))) (defun cider-toggle-trace-ns (query) @@ -1433,9 +1432,9 @@ Defaults to the current ns. With prefix arg QUERY, prompts for a ns." "Undefine symbol: " (lambda (sym) (cider-nrepl-send-request - (list "op" "undef" - "ns" (cider-current-ns) - "symbol" sym) + `("op" "undef" + "ns" ,(cider-current-ns) + "symbol" ,sym) (cider-interactive-eval-handler (current-buffer)))))) (defun cider-refresh--handle-response (response log-buffer) @@ -1522,16 +1521,17 @@ refresh functions (defined in `cider-refresh-before-fn' and (when inhibit-refresh-fns (cider-emit-into-popup-buffer log-buffer "inhibiting refresh functions\n")) (when clear? - (cider-nrepl-send-sync-request (list "op" "refresh-clear") conn)) + (cider-nrepl-send-sync-request '("op" "refresh-clear") conn)) (cider-nrepl-send-request - (append (list "op" (if refresh-all? "refresh-all" "refresh") - "print-length" cider-stacktrace-print-length - "print-level" cider-stacktrace-print-level) - (when (cider--pprint-fn) (list "pprint-fn" (cider--pprint-fn))) - (when (and (not inhibit-refresh-fns) cider-refresh-before-fn) - (list "before" cider-refresh-before-fn)) - (when (and (not inhibit-refresh-fns) cider-refresh-after-fn) - (list "after" cider-refresh-after-fn))) + (nconc `("op" ,(if refresh-all? "refresh-all" "refresh") + "print-length" ,cider-stacktrace-print-length + "print-level" ,cider-stacktrace-print-level) + (when (cider--pprint-fn) + `("pprint-fn" ,(cider--pprint-fn))) + (when (and (not inhibit-refresh-fns) cider-refresh-before-fn) + `("before" ,cider-refresh-before-fn)) + (when (and (not inhibit-refresh-fns) cider-refresh-after-fn) + `("after" ,cider-refresh-after-fn))) (lambda (response) (cider-refresh--handle-response response log-buffer)) conn))) @@ -1808,7 +1808,8 @@ With a prefix argument, prompt for function to run instead of -main." (cider-ensure-connected) (let ((name (or function "-main"))) (when-let ((response (cider-nrepl-send-sync-request - (list "op" "ns-list-vars-by-name" "name" name)))) + `("op" "ns-list-vars-by-name" + "name" ,name)))) (if-let ((vars (split-string (substring (nrepl-dict-get response "var-list") 1 -1)))) (cider-interactive-eval (if (= (length vars) 1) diff --git a/cider-macroexpansion.el b/cider-macroexpansion.el index d0ca9db9..473c6333 100644 --- a/cider-macroexpansion.el +++ b/cider-macroexpansion.el @@ -66,15 +66,14 @@ Possible values are: The default for DISPLAY-NAMESPACES is taken from `cider-macroexpansion-display-namespaces'." (cider-ensure-op-supported "macroexpand") - (thread-first (list "op" "macroexpand" - "expander" expander - "code" expr - "ns" (cider-current-ns) - "display-namespaces" - (or display-namespaces - (symbol-name cider-macroexpansion-display-namespaces))) - (append (when cider-macroexpansion-print-metadata - (list "print-meta" "true"))) + (thread-first `("op" "macroexpand" + "expander" ,expander + "code" ,expr + "ns" ,(cider-current-ns) + "display-namespaces" ,(or display-namespaces + (symbol-name cider-macroexpansion-display-namespaces))) + (nconc (when cider-macroexpansion-print-metadata + '("print-meta" "true"))) (cider-nrepl-send-sync-request) (nrepl-dict-get "expansion"))) diff --git a/cider-test.el b/cider-test.el index e5b8570e..b63048fc 100644 --- a/cider-test.el +++ b/cider-test.el @@ -261,15 +261,16 @@ prompt and whether to use a new window. Similar to `cider-find-var'." "Display stacktrace for the erring NS VAR test with the assertion INDEX." (let (causes) (cider-nrepl-send-request - (append - (list "op" "test-stacktrace" - "ns" ns "var" var "index" index) - (when (cider--pprint-fn) - (list "pprint-fn" (cider--pprint-fn))) - (when cider-stacktrace-print-length - (list "print-length" cider-stacktrace-print-length)) - (when cider-stacktrace-print-level - (list "print-level" cider-stacktrace-print-level))) + (nconc `("op" "test-stacktrace" + "ns" ,ns + "var" ,var + "index" ,index) + (when (cider--pprint-fn) + `("pprint-fn" ,(cider--pprint-fn))) + (when cider-stacktrace-print-length + `("print-length" ,cider-stacktrace-print-length)) + (when cider-stacktrace-print-level + `("print-level" ,cider-stacktrace-print-level))) (lambda (response) (nrepl-dbind-response response (class status) (cond (class (setq causes (cons response causes))) @@ -586,15 +587,15 @@ If SILENT is non-nil, suppress all messages other then test results." (cider-test-echo-running ns (car tests)) (cider-test-echo-running ns))) (cider-nrepl-send-request - (list "op" (cond ((stringp ns) "test") - ((eq :project ns) "test-all") - ((eq :loaded ns) "test-all") - ((eq :non-passing ns) "retest")) - "ns" (when (stringp ns) ns) - "tests" (when (stringp ns) tests) - "load?" (when (or (stringp ns) - (eq :project ns)) - "true")) + `("op" ,(cond ((stringp ns) "test") + ((eq :project ns) "test-all") + ((eq :loaded ns) "test-all") + ((eq :non-passing ns) "retest")) + "ns" ,(when (stringp ns) ns) + "tests" ,(when (stringp ns) tests) + "load?" ,(when (or (stringp ns) + (eq :project ns)) + "true")) (lambda (response) (nrepl-dbind-response response (summary results status out err) (cond ((member "namespace-not-found" status) @@ -527,9 +527,9 @@ should be the regular Clojure REPL started by the server process filter." (message "Starting a %s REPL%s" name (or info ""))) (_ (message "Starting a custom ClojureScript REPL"))) (cider-nrepl-send-request - (list "op" "eval" - "ns" (cider-current-ns) - "code" cljs-repl-form) + `("op" "eval" + "ns" ,(cider-current-ns) + "code" ,cljs-repl-form) (cider-repl-handler (current-buffer))) (cider--offer-to-open-app-in-browser nrepl-server-buffer)))) |