diff options
| -rw-r--r-- | cider-browse-spec.el | 6 | ||||
| -rw-r--r-- | cider-cheatsheet.el | 2 | ||||
| -rw-r--r-- | cider-client.el | 32 | ||||
| -rw-r--r-- | cider-eldoc.el | 26 | ||||
| -rw-r--r-- | cider-interaction.el | 36 | ||||
| -rw-r--r-- | cider-overlays.el | 6 | ||||
| -rw-r--r-- | cider-repl-history.el | 10 | ||||
| -rw-r--r-- | cider-repl.el | 4 | ||||
| -rw-r--r-- | cider.el | 2 |
9 files changed, 62 insertions, 62 deletions
diff --git a/cider-browse-spec.el b/cider-browse-spec.el index 3e1a307f..b88ca300 100644 --- a/cider-browse-spec.el +++ b/cider-browse-spec.el @@ -237,9 +237,9 @@ Display TITLE at the top and SPECS are indented underneath." (string-empty-p (cl-second s))))) (mapcar (lambda (s) (format "\n%-11s: %s" (pcase (cl-first s) - (":args" "arguments") - (":ret" "returns") - (":fn" "invariants")) + (":args" "arguments") + (":ret" "returns") + (":fn" "invariants")) (cider-browse-spec--pprint (cl-second s))))) (cl-reduce #'concat) (format "%s"))) diff --git a/cider-cheatsheet.el b/cider-cheatsheet.el index 677fe77d..d870c5a5 100644 --- a/cider-cheatsheet.el +++ b/cider-cheatsheet.el @@ -294,7 +294,7 @@ (clojure.core .. doto bean comparator enumeration-seq import iterator-seq memfn definterface supers bases)) ("Cast" (clojure.core boolean byte short char int long float double bigdec bigint num cast biginteger)) - ("Exceptions" + ("Exceptions" (:special throw try catch finally) (clojure.core ex-info ex-data Throwable->map StackTraceElement->vec) (clojure.repl pst)) diff --git a/cider-client.el b/cider-client.el index be281e9d..5e1e874c 100644 --- a/cider-client.el +++ b/cider-client.el @@ -162,11 +162,11 @@ precedence over other connections associated with the same project. If ALL-CONNECTIONS is non-nil, the return value is a list and all matching connections are returned, instead of just the most recent." (when-let* ((project-directory (or project-directory - (clojure-project-dir (cider-current-dir)))) - (fn (if all-connections #'seq-filter #'seq-find))) + (clojure-project-dir (cider-current-dir)))) + (fn (if all-connections #'seq-filter #'seq-find))) (or (funcall fn (lambda (conn) (when-let* ((conn-proj-dir (with-current-buffer conn - nrepl-project-dir))) + nrepl-project-dir))) (equal (file-truename project-directory) (file-truename conn-proj-dir)))) cider-connections) @@ -246,9 +246,9 @@ using the default list of connections." ;; obfuscation (kill-local-variable 'cider-connections) (if-let* ((other-conn (cider-other-connection current-conn))) - (progn - (setq-local cider-connections (list other-conn)) - (message (format "Connection set to %s" (cider--connection-type other-conn)))) + (progn + (setq-local cider-connections (list other-conn)) + (message (format "Connection set to %s" (cider--connection-type other-conn)))) (progn (when was-local (setq-local cider-connections original-connections)) @@ -327,7 +327,7 @@ at all." Only return connections in the same project or nil. CONNECTION defaults to `cider-current-connection'." (when-let* ((connection (or connection (cider-current-connection))) - (connection-type (cider--connection-type connection))) + (connection-type (cider--connection-type connection))) (cider-current-connection (pcase connection-type (`"clj" "cljs") (_ "clj"))))) @@ -340,14 +340,14 @@ DO NOT USE THIS FUNCTION. It was written only to be used in `cider-map-connections', as a workaround to a still-undetermined bug in the state-stracker backend." (when-let* ((project-connections (cider-find-connection-buffer-for-project-directory - nil :all-connections)) - (cljs-conn - ;; So we have multiple connections. Look for the connection type we - ;; want, prioritizing the current project. - (or (seq-find (lambda (c) (string-match "\\bCLJS\\b" (buffer-name c))) - project-connections) - (seq-find (lambda (c) (string-match "\\bCLJS\\b" (buffer-name c))) - (cider-connections))))) + nil :all-connections)) + (cljs-conn + ;; So we have multiple connections. Look for the connection type we + ;; want, prioritizing the current project. + (or (seq-find (lambda (c) (string-match "\\bCLJS\\b" (buffer-name c))) + project-connections) + (seq-find (lambda (c) (string-match "\\bCLJS\\b" (buffer-name c))) + (cider-connections))))) (unless cider--has-warned-about-bad-repl-type (setq cider--has-warned-about-bad-repl-type t) (read-key @@ -1180,7 +1180,7 @@ default connection." (append (cdr cider-connections) (list (car cider-connections)))) (message "Default nREPL connection: %s" - (cider--connection-info (car cider-connections))))) + (cider--connection-info (car cider-connections))))) (declare-function cider-connect "cider") diff --git a/cider-eldoc.el b/cider-eldoc.el index bd105173..b055824d 100644 --- a/cider-eldoc.el +++ b/cider-eldoc.el @@ -439,19 +439,19 @@ Only useful for interop forms. Clojure forms would be returned unchanged." (defun cider--eldoc-add-datomic-query-inputs-to-arglists (arglists) "Add the expected inputs of the datomic query to the ARGLISTS." (if (cider-second-sexp-in-list) - (let* ((query (cider-second-sexp-in-list)) - (query-inputs (nrepl-dict-get - (cider-sync-request:eldoc-datomic-query query) - "inputs"))) - (if query-inputs - (thread-first - (thread-last arglists - (car) - (remove "&") - (remove "inputs")) - (append (car query-inputs)) - (list)) - arglists)) + (let* ((query (cider-second-sexp-in-list)) + (query-inputs (nrepl-dict-get + (cider-sync-request:eldoc-datomic-query query) + "inputs"))) + (if query-inputs + (thread-first + (thread-last arglists + (car) + (remove "&") + (remove "inputs")) + (append (car query-inputs)) + (list)) + arglists)) arglists)) (defun cider-eldoc () diff --git a/cider-interaction.el b/cider-interaction.el index d9f2a758..962bcd1d 100644 --- a/cider-interaction.el +++ b/cider-interaction.el @@ -660,9 +660,9 @@ has started." Returns the cons of the buffer itself and the location of VAR's definition in the buffer." (when-let* ((info (cider-var-info var)) - (file (nrepl-dict-get info "file")) - (line (nrepl-dict-get info "line")) - (buffer (cider-find-file file))) + (file (nrepl-dict-get info "file")) + (line (nrepl-dict-get info "line")) + (buffer (cider-find-file file))) (with-current-buffer buffer (save-excursion (goto-char (point-min)) @@ -856,16 +856,16 @@ COMMENT-PREFIX is the comment prefix for the first line of output. CONTINUED-PREFIX is the comment prefix to use for the remaining lines. COMMENT-POSTFIX is the text to output after the last line." (cl-flet ((multiline-comment-handler (buffer value) - (with-current-buffer buffer - (save-excursion - (goto-char location) - (let ((lines (split-string value "[\n]+" t))) - ;; only the first line gets the normal comment-prefix - (insert (concat comment-prefix (pop lines))) - (dolist (elem lines) - (insert (concat "\n" continued-prefix elem))) - (unless (string= comment-postfix "") - (insert comment-postfix))))))) + (with-current-buffer buffer + (save-excursion + (goto-char location) + (let ((lines (split-string value "[\n]+" t))) + ;; only the first line gets the normal comment-prefix + (insert (concat comment-prefix (pop lines))) + (dolist (elem lines) + (insert (concat "\n" continued-prefix elem))) + (unless (string= comment-postfix "") + (insert comment-postfix))))))) (nrepl-make-response-handler buffer '() #'multiline-comment-handler @@ -1448,10 +1448,10 @@ incomplete expression complete." (let ((result nil)) (save-excursion (condition-case nil - (while t - (backward-up-list) - (push (char-after) result)) - (error result))))) + (while t + (backward-up-list) + (push (char-after) result)) + (error result))))) (defun cider--matching-delimiter (delimiter) "Get the matching (opening/closing) delimiter for DELIMITER." @@ -2014,7 +2014,7 @@ START and END represent the region's boundaries." (interactive) (cider-ensure-connected) (nrepl-sync-request:close (cider-current-connection)) - (message "Closed nREPL session")) + (message "Closed nREPL session")) ;;; quiting (defun cider--close-buffer (buffer) diff --git a/cider-overlays.el b/cider-overlays.el index c61c241c..1a92b35f 100644 --- a/cider-overlays.el +++ b/cider-overlays.el @@ -153,9 +153,9 @@ END is the position where the sexp ends, and defaults to point." 'before-string cider--fringe-overlay-good))))) (cl-defun cider--make-result-overlay (value &rest props &key where duration (type 'result) - (format (concat " " cider-eval-result-prefix "%s ")) - (prepend-face 'cider-result-overlay-face) - &allow-other-keys) + (format (concat " " cider-eval-result-prefix "%s ")) + (prepend-face 'cider-result-overlay-face) + &allow-other-keys) "Place an overlay displaying VALUE at the end of line. VALUE is used as the overlay's after-string property, meaning it is displayed at the end of the overlay. The overlay itself is placed from diff --git a/cider-repl-history.el b/cider-repl-history.el index c1a5a387..c4d66dbc 100644 --- a/cider-repl-history.el +++ b/cider-repl-history.el @@ -676,8 +676,8 @@ text from the *cider-repl-history* buffer." (interactive) (cl-assert (eq major-mode 'cider-repl-history-mode)) (cider-repl-history-setup cider-repl-history-repl-window - cider-repl-history-repl-buffer - (current-buffer)) + cider-repl-history-repl-buffer + (current-buffer)) (cider-repl-history-resize-window)) (defun cider-repl-history-occur (regexp) @@ -687,9 +687,9 @@ text from the *cider-repl-history* buffer." "Display command history entries matching" nil))) (cl-assert (eq major-mode 'cider-repl-history-mode)) (cider-repl-history-setup cider-repl-history-repl-window - cider-repl-history-repl-buffer - (current-buffer) - regexp) + cider-repl-history-repl-buffer + (current-buffer) + regexp) (cider-repl-history-resize-window)) (put 'cider-repl-history-mode 'mode-class 'special) diff --git a/cider-repl.el b/cider-repl.el index d2f3a9bc..1e0e3cd8 100644 --- a/cider-repl.el +++ b/cider-repl.el @@ -89,7 +89,7 @@ set to `display-only' the buffer will be displayed, but it will not become focused. Otherwise the buffer is displayed and focused." :type '(choice (const :tag "Create the buffer, but don't display it" nil) (const :tag "Create and display the buffer, but don't focus it" - display-only) + display-only) (const :tag "Create, display, and focus the buffer" t)) :group 'cider-repl) @@ -123,7 +123,7 @@ change the setting's value." This sets the wrap point for pretty printing on the repl. If nil, it defaults to the variable `fill-column'." :type '(restricted-sexp :match-alternatives - (integerp 'nil)) + (integerp 'nil)) :group 'cider-repl :package-version '(cider . "0.15.0")) @@ -647,7 +647,7 @@ be reused." (if (get-buffer-process exact-buff) (when (y-or-n-p (format "REPL buffer already exists (%s). \ Do you really want to create a new one? " - exact-buff)) + exact-buff)) 'new) exact-buff) (or (cider--select-zombie-buffer repl-buffers) 'new))) |