1111; ; Steve Purcell <[email protected] >1212; ; Maintainer: Bozhidar Batsov <[email protected] >1313; ; URL: https://www.github.com/clojure-emacs/cider
14- ; ; Version: 1.12.0-snapshot
14+ ; ; Version: 1.12.0
1515; ; Package-Requires: ((emacs "26") (clojure-mode "5.18.1") (parseedn "1.2.0") (queue "0.2") (spinner "1.7") (seq "2.22") (sesman "0.3.2") (transient "0.4.1"))
1616; ; Keywords: languages, clojure, cider
1717
9393(require 'sesman )
9494(require 'package )
9595
96- (defconst cider-version " 1.12.0-snapshot "
96+ (defconst cider-version " 1.12.0"
9797 " The current version of CIDER." )
9898
9999(defconst cider-codename " Split"
@@ -602,15 +602,15 @@ returned by this function does not include keyword arguments."
602602 (append cider-jack-in-lein-plugins
603603 `((" cider/cider-nrepl" , cider-injected-middleware-version ))))))
604604 (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 ))))))
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 ))))))
614614
615615(defvar cider-jack-in-nrepl-middlewares nil
616616 " List of Clojure variable names.
@@ -635,18 +635,18 @@ Added to `cider-jack-in-nrepl-middlewares' (which see) when doing
635635See `cider-jack-in-nrepl-middlewares' for the format, except that the list
636636returned by this function only contains strings."
637637 (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)))))
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)))))
650650
651651(defun cider--list-as-boot-artifact (list )
652652 " Return a boot artifact string described by the elements of LIST.
@@ -823,21 +823,21 @@ suitable `clojure` invocation and quoting, also accounting for COMMAND if
823823provided. The main is placed in an inline alias :cider/nrepl so that if
824824your aliases contain any mains, the cider/nrepl one will be the one used."
825825 (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)))))))
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)))))))
841841 (middleware (mapconcat
842842 (apply-partially #'format " %s" )
843843 (cider-jack-in-normalized-nrepl-middlewares)
@@ -1345,10 +1345,10 @@ been determined."
13451345Updates :project-dir and :jack-in-cmd.
13461346Also checks whether a matching session already exists."
13471347 (thread-first
1348- params
1349- (cider--update-project-dir)
1350- (cider--check-existing-session)
1351- (cider--update-jack-in-cmd)))
1348+ params
1349+ (cider--update-project-dir)
1350+ (cider--check-existing-session)
1351+ (cider--update-jack-in-cmd)))
13521352
13531353;;;### autoload
13541354(defun cider-jack-in-clj (params )
@@ -1388,10 +1388,10 @@ these parameters."
13881388 (orig-buffer (current-buffer )))
13891389 ; ; cider--update-jack-in-cmd relies indirectly on the above dynamic vars
13901390 (let ((params (thread-first
1391- params
1392- (cider--update-project-dir)
1393- (cider--check-existing-session)
1394- (cider--update-jack-in-cmd))))
1391+ params
1392+ (cider--update-project-dir)
1393+ (cider--check-existing-session)
1394+ (cider--update-jack-in-cmd))))
13951395 (nrepl-start-server-process
13961396 (plist-get params :project-dir )
13971397 (plist-get params :jack-in-cmd )
@@ -1418,13 +1418,13 @@ only when the ClojureScript dependencies are met."
14181418 (orig-buffer (current-buffer )))
14191419 ; ; cider--update-jack-in-cmd relies indirectly on the above dynamic vars
14201420 (let ((params (thread-first
1421- params
1422- (cider--update-project-dir)
1423- (cider--check-existing-session)
1424- (cider--update-jack-in-cmd)
1425- (cider--update-cljs-type)
1426- ; ; already asked, don't ask on sibling connect
1427- (plist-put :do-prompt nil ))))
1421+ params
1422+ (cider--update-project-dir)
1423+ (cider--check-existing-session)
1424+ (cider--update-jack-in-cmd)
1425+ (cider--update-cljs-type)
1426+ ; ; already asked, don't ask on sibling connect
1427+ (plist-put :do-prompt nil ))))
14281428 (nrepl-start-server-process
14291429 (plist-get params :project-dir )
14301430 (plist-get params :jack-in-cmd )
@@ -1450,12 +1450,12 @@ server is created."
14501450 (ses-name (unless (nrepl-server-p other-repl)
14511451 (sesman-session-name-for-object 'CIDER other-repl))))
14521452 (thread-first
1453- params
1454- (cider--update-do-prompt)
1455- (append other-params)
1456- (plist-put :repl-init-function nil )
1457- (plist-put :repl-type 'clj )
1458- (plist-put :session-name ses-name)))))
1453+ params
1454+ (cider--update-do-prompt)
1455+ (append other-params)
1456+ (plist-put :repl-init-function nil )
1457+ (plist-put :repl-type 'clj )
1458+ (plist-put :session-name ses-name)))))
14591459
14601460;;;### autoload
14611461(defun cider-connect-sibling-cljs (params &optional other-repl )
@@ -1475,13 +1475,13 @@ server buffer, in which case a new session for that server is created."
14751475 (sesman-session-name-for-object 'CIDER other-repl))))
14761476 (cider-nrepl-connect
14771477 (thread-first
1478- params
1479- (cider--update-do-prompt)
1480- (append other-params)
1481- (cider--update-cljs-type)
1482- (cider--update-cljs-init-function)
1483- (plist-put :session-name ses-name)
1484- (plist-put :repl-type 'cljs )))))
1478+ params
1479+ (cider--update-do-prompt)
1480+ (append other-params)
1481+ (cider--update-cljs-type)
1482+ (cider--update-cljs-init-function)
1483+ (plist-put :session-name ses-name)
1484+ (plist-put :repl-type 'cljs )))))
14851485
14861486;;;### autoload
14871487(defun cider-connect-clj (&optional params )
@@ -1491,13 +1491,13 @@ prefix argument, prompt for all the parameters."
14911491 (interactive " P" )
14921492 (cider-nrepl-connect
14931493 (thread-first
1494- params
1495- (cider--update-project-dir)
1496- (cider--update-host-port)
1497- (cider--check-existing-session)
1498- (plist-put :repl-init-function nil )
1499- (plist-put :session-name nil )
1500- (plist-put :repl-type 'clj ))))
1494+ params
1495+ (cider--update-project-dir)
1496+ (cider--update-host-port)
1497+ (cider--check-existing-session)
1498+ (plist-put :repl-init-function nil )
1499+ (plist-put :session-name nil )
1500+ (plist-put :repl-type 'clj ))))
15011501
15021502;;;### autoload
15031503(defun cider-connect-cljs (&optional params )
@@ -1510,14 +1510,14 @@ parameters regardless of their supplied or default values."
15101510 (interactive " P" )
15111511 (cider-nrepl-connect
15121512 (thread-first
1513- params
1514- (cider--update-project-dir)
1515- (cider--update-host-port)
1516- (cider--check-existing-session)
1517- (cider--update-cljs-type)
1518- (cider--update-cljs-init-function)
1519- (plist-put :session-name nil )
1520- (plist-put :repl-type 'cljs ))))
1513+ params
1514+ (cider--update-project-dir)
1515+ (cider--update-host-port)
1516+ (cider--check-existing-session)
1517+ (cider--update-cljs-type)
1518+ (cider--update-cljs-init-function)
1519+ (plist-put :session-name nil )
1520+ (plist-put :repl-type 'cljs ))))
15211521
15221522;;;### autoload
15231523(defun cider-connect-clj&cljs (params &optional soft-cljs-start )
@@ -1527,15 +1527,15 @@ PARAMS is a plist optionally containing :host, :port, :project-dir and
15271527non-nil, don't start if ClojureScript requirements are not met."
15281528 (interactive " P" )
15291529 (let* ((params (thread-first
1530- params
1531- (cider--update-project-dir)
1532- (cider--update-host-port)
1533- (cider--check-existing-session)
1534- (cider--update-cljs-type)))
1530+ params
1531+ (cider--update-project-dir)
1532+ (cider--update-host-port)
1533+ (cider--check-existing-session)
1534+ (cider--update-cljs-type)))
15351535 (clj-params (thread-first
1536- params
1537- copy-sequence
1538- (map-delete :cljs-repl-type )))
1536+ params
1537+ copy-sequence
1538+ (map-delete :cljs-repl-type )))
15391539 (clj-repl (cider-connect-clj clj-params)))
15401540 (when (if soft-cljs-start
15411541 (cider--check-cljs (plist-get params :cljs-repl-type ) 'no-error )
@@ -1606,9 +1606,9 @@ Params is a plist with the following keys (non-exhaustive)
16061606 (let ((default-directory proj-dir))
16071607 (hack-dir-local-variables-non-file-buffer )
16081608 (thread-first
1609- params
1610- (plist-put :project-dir proj-dir)
1611- (plist-put :--context-buffer (current-buffer )))))))))
1609+ params
1610+ (plist-put :project-dir proj-dir)
1611+ (plist-put :--context-buffer (current-buffer )))))))))
16121612
16131613(defun cider--update-cljs-type (params )
16141614 " Update :cljs-repl-type in PARAMS."
@@ -1705,9 +1705,9 @@ PARAMS is a plist with the following keys (non-exhaustive list)
17051705 (if (equal " local-unix-domain-socket" (car endpoint))
17061706 (plist-put params :socket-file (cdr endpoint))
17071707 (thread-first
1708- params
1709- (plist-put :host (car endpoint))
1710- (plist-put :port (cdr endpoint)))))))
1708+ params
1709+ (plist-put :host (car endpoint))
1710+ (plist-put :port (cdr endpoint)))))))
17111711
17121712(defun cider--update-cljs-init-function (params )
17131713 " Update repl type and any init PARAMS for cljs connections.
@@ -1729,20 +1729,20 @@ over to cljs.
17291729 (plist-put params :cider-repl-cljs-upgrade-pending nil )
17301730
17311731 (thread-first
1732- params
1733- (plist-put :cider-repl-cljs-upgrade-pending t )
1734- (plist-put :repl-init-function
1735- (lambda ()
1736- (cider--check-cljs cljs-type)
1737- (cider-nrepl-send-request
1738- (list " op" " eval"
1739- " ns" (cider-current-ns)
1740- " code" repl-init-form)
1741- (cider-repl-handler (current-buffer )))
1742- (when (and (buffer-live-p nrepl-server-buffer)
1743- cider-offer-to-open-cljs-app-in-browser)
1744- (cider--offer-to-open-app-in-browser nrepl-server-buffer))))
1745- (plist-put :repl-init-form repl-init-form))))))
1732+ params
1733+ (plist-put :cider-repl-cljs-upgrade-pending t )
1734+ (plist-put :repl-init-function
1735+ (lambda ()
1736+ (cider--check-cljs cljs-type)
1737+ (cider-nrepl-send-request
1738+ (list " op" " eval"
1739+ " ns" (cider-current-ns)
1740+ " code" repl-init-form)
1741+ (cider-repl-handler (current-buffer )))
1742+ (when (and (buffer-live-p nrepl-server-buffer)
1743+ cider-offer-to-open-cljs-app-in-browser)
1744+ (cider--offer-to-open-app-in-browser nrepl-server-buffer))))
1745+ (plist-put :repl-init-form repl-init-form))))))
17461746
17471747(defun cider--check-existing-session (params )
17481748 " Ask for confirmation if a session with similar PARAMS already exists.
0 commit comments