Skip to content

Commit 120fd88

Browse files
committed
Reformat some thread-lasts
This style is closer to Clojure's, and indents consistently across more Emacs versions.
1 parent 128bf92 commit 120fd88

File tree

1 file changed

+36
-39
lines changed

1 file changed

+36
-39
lines changed

cider.el

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -601,16 +601,15 @@ returned by this function does not include keyword arguments."
601601
("mx.cider/lein-enrich-classpath" "1.18.6")))
602602
(append cider-jack-in-lein-plugins
603603
`(("cider/cider-nrepl" ,cider-injected-middleware-version))))))
604-
(thread-last
605-
plugins
606-
(seq-filter
607-
(lambda (spec)
608-
(if-let* ((pred (plist-get (seq-drop spec 2) :predicate)))
609-
(funcall pred spec)
610-
t)))
611-
(mapcar
612-
(lambda (spec)
613-
(seq-take spec 2))))))
604+
(thread-last plugins
605+
(seq-filter
606+
(lambda (spec)
607+
(if-let* ((pred (plist-get (seq-drop spec 2) :predicate)))
608+
(funcall pred spec)
609+
t)))
610+
(mapcar
611+
(lambda (spec)
612+
(seq-take spec 2))))))
614613

615614
(defvar cider-jack-in-nrepl-middlewares nil
616615
"List of Clojure variable names.
@@ -634,19 +633,18 @@ Added to `cider-jack-in-nrepl-middlewares' (which see) when doing
634633
"Return a normalized list of middleware variable names.
635634
See `cider-jack-in-nrepl-middlewares' for the format, except that the list
636635
returned by this function only contains strings."
637-
(thread-last
638-
cider-jack-in-nrepl-middlewares
639-
(seq-filter
640-
(lambda (spec)
641-
(or (not (listp spec))
642-
(if-let* ((pred (plist-get (cdr spec) :predicate)))
643-
(funcall pred spec)
644-
t))))
645-
(mapcar
646-
(lambda (spec)
647-
(if (listp spec)
648-
(car spec)
649-
spec)))))
636+
(thread-last cider-jack-in-nrepl-middlewares
637+
(seq-filter
638+
(lambda (spec)
639+
(or (not (listp spec))
640+
(if-let* ((pred (plist-get (cdr spec) :predicate)))
641+
(funcall pred spec)
642+
t))))
643+
(mapcar
644+
(lambda (spec)
645+
(if (listp spec)
646+
(car spec)
647+
spec)))))
650648

651649
(defun cider--list-as-boot-artifact (list)
652650
"Return a boot artifact string described by the elements of LIST.
@@ -822,22 +820,21 @@ Does so by concatenating DEPENDENCIES, PARAMS and GLOBAL-OPTIONS into a
822820
suitable `clojure` invocation and quoting, also accounting for COMMAND if
823821
provided. The main is placed in an inline alias :cider/nrepl so that if
824822
your aliases contain any mains, the cider/nrepl one will be the one used."
825-
(let* ((all-deps (thread-last
826-
dependencies
827-
(append (cider--jack-in-required-dependencies))
828-
;; Duplicates are never OK since they would result in
829-
;; `java.lang.IllegalArgumentException: Duplicate key [...]`:
830-
(cider--dedupe-deps)
831-
(seq-map (lambda (dep)
832-
(if (listp (cadr dep))
833-
(format "%s {%s}"
834-
(car dep)
835-
(seq-reduce
836-
(lambda (acc v)
837-
(concat acc (format " :%s \"%s\" " (car v) (cdr v))))
838-
(cadr dep)
839-
""))
840-
(format "%s {:mvn/version \"%s\"}" (car dep) (cadr dep)))))))
823+
(let* ((all-deps (thread-last dependencies
824+
(append (cider--jack-in-required-dependencies))
825+
;; Duplicates are never OK since they would result in
826+
;; `java.lang.IllegalArgumentException: Duplicate key [...]`:
827+
(cider--dedupe-deps)
828+
(seq-map (lambda (dep)
829+
(if (listp (cadr dep))
830+
(format "%s {%s}"
831+
(car dep)
832+
(seq-reduce
833+
(lambda (acc v)
834+
(concat acc (format " :%s \"%s\" " (car v) (cdr v))))
835+
(cadr dep)
836+
""))
837+
(format "%s {:mvn/version \"%s\"}" (car dep) (cadr dep)))))))
841838
(middleware (mapconcat
842839
(apply-partially #'format "%s")
843840
(cider-jack-in-normalized-nrepl-middlewares)

0 commit comments

Comments
 (0)