Skip to content

Commit 6a17686

Browse files
rwtoddbbatsov
authored andcommitted
[Fix #3074] Makes cider recognize 'pwsh' as powershell.
The recent powershell executables (in the .NET Core era) are named pwsh.exe, and should be treated the same as powershell for the purposes of cider-jack-in.
1 parent 0a9d0ef commit 6a17686

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
* [#2746](https://github.com/clojure-emacs/cider/issues/2746): Handle gracefully Clojure versions with non-standard qualifiers (e.g. `1.11.0-master-SNAPSHOT`).
2424
* [#3069](https://github.com/clojure-emacs/cider/pull/3069): Fix cursor color changing when it shouldn't in evil-mode
2525
* [#3071](https://github.com/clojure-emacs/cider/issues/3071): Use xref instead of etags to push point to marker stack
26+
* [#3074](https://github.com/clojure-emacs/cider/issues/3074): Recognize pwsh as a powershell executable
2627

2728
## 1.1.1 (2021-05-24)
2829

cider.el

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1315,7 +1315,8 @@ non-nil, don't start if ClojureScript requirements are not met."
13151315
(and (null project-dir)
13161316
(eq cider-allow-jack-in-without-project 'warn)
13171317
(y-or-n-p "Are you sure you want to run `cider-jack-in' without a Clojure project? ")))
1318-
(let ((cmd (format "%s %s" command-resolved (if (string-equal command "powershell")
1318+
(let ((cmd (format "%s %s" command-resolved (if (or (string-equal command "powershell")
1319+
(string-equal command "pwsh"))
13191320
(cider--powershell-encode-command cmd-params)
13201321
cmd-params))))
13211322
(plist-put params :jack-in-cmd (if (or cider-edit-jack-in-command

0 commit comments

Comments
 (0)