@@ -1511,42 +1511,42 @@ PARAMS is a plist with the following keys (non-exhaustive list)
1511
1511
((plist-get params :jack-in-cmd ) params)
1512
1512
(cider-jack-in-cmd (plist-put params :jack-in-cmd cider-jack-in-cmd))
1513
1513
(t (let* ((params (cider--update-do-prompt params))
1514
- (project-dir (plist-get params :project-dir ))
1515
- (params-project-type (plist-get params :project-type ))
1516
- (project-type (or params-project-type
1517
- (cider-project-type project-dir)))
1518
- (command (cider-jack-in-command project-type))
1519
- (command-resolved (cider-jack-in-resolve-command project-type))
1520
- (command-global-opts (cider-jack-in-global-options project-type))
1521
- (command-params (cider-jack-in-params project-type)))
1522
- (if command-resolved
1523
- (with-current-buffer (or (plist-get params :--context-buffer )
1524
- (current-buffer ))
1525
- (let* ((command-params (if (plist-get params :do-prompt )
1526
- (read-string " nREPL server command: "
1527
- command-params
1528
- 'cider--jack-in-nrepl-params-history )
1529
- command-params))
1530
- (cmd-params (if cider-inject-dependencies-at-jack-in
1531
- (cider-inject-jack-in-dependencies command-global-opts command-params project-type)
1532
- command-params)))
1533
- (if (or project-dir cider-allow-jack-in-without-project)
1534
- (when (or project-dir
1535
- (eq cider-allow-jack-in-without-project t )
1536
- (and (null project-dir)
1537
- (eq cider-allow-jack-in-without-project 'warn )
1538
- (or params-project-type
1539
- (y-or-n-p " Are you sure you want to run `cider-jack-in' without a Clojure project? " ))))
1540
- (let ((cmd (format " %s %s " command-resolved (if (or (string-equal command " powershell" )
1541
- (string-equal command " pwsh" ))
1542
- (cider--powershell-encode-command cmd-params)
1543
- cmd-params))))
1544
- (plist-put params :jack-in-cmd (if (or cider-edit-jack-in-command
1545
- (plist-get params :edit-jack-in-command ))
1546
- (read-string " jack-in command: " cmd 'cider--jack-in-cmd-history )
1547
- cmd))))
1548
- (user-error " `cider-jack-in' is not allowed without a Clojure project" ))))
1549
- (user-error " The %s executable isn't on your `exec-path' " command))))))
1514
+ (project-dir (plist-get params :project-dir ))
1515
+ (params-project-type (plist-get params :project-type ))
1516
+ (project-type (or params-project-type
1517
+ (cider-project-type project-dir)))
1518
+ (command (cider-jack-in-command project-type))
1519
+ (command-resolved (cider-jack-in-resolve-command project-type))
1520
+ (command-global-opts (cider-jack-in-global-options project-type))
1521
+ (command-params (cider-jack-in-params project-type)))
1522
+ (if command-resolved
1523
+ (with-current-buffer (or (plist-get params :--context-buffer )
1524
+ (current-buffer ))
1525
+ (let* ((command-params (if (plist-get params :do-prompt )
1526
+ (read-string " nREPL server command: "
1527
+ command-params
1528
+ 'cider--jack-in-nrepl-params-history )
1529
+ command-params))
1530
+ (cmd-params (if cider-inject-dependencies-at-jack-in
1531
+ (cider-inject-jack-in-dependencies command-global-opts command-params project-type)
1532
+ command-params)))
1533
+ (if (or project-dir cider-allow-jack-in-without-project)
1534
+ (when (or project-dir
1535
+ (eq cider-allow-jack-in-without-project t )
1536
+ (and (null project-dir)
1537
+ (eq cider-allow-jack-in-without-project 'warn )
1538
+ (or params-project-type
1539
+ (y-or-n-p " Are you sure you want to run `cider-jack-in' without a Clojure project? " ))))
1540
+ (let ((cmd (format " %s %s " command-resolved (if (or (string-equal command " powershell" )
1541
+ (string-equal command " pwsh" ))
1542
+ (cider--powershell-encode-command cmd-params)
1543
+ cmd-params))))
1544
+ (plist-put params :jack-in-cmd (if (or cider-edit-jack-in-command
1545
+ (plist-get params :edit-jack-in-command ))
1546
+ (read-string " jack-in command: " cmd 'cider--jack-in-cmd-history )
1547
+ cmd))))
1548
+ (user-error " `cider-jack-in' is not allowed without a Clojure project" ))))
1549
+ (user-error " The %s executable isn't on your `exec-path' " command))))))
1550
1550
1551
1551
(defun cider--update-host-port (params )
1552
1552
" Update :host and :port; or :socket-file in PARAMS."
0 commit comments