Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

No shell quoting whatsoever for deps.edn projects on Windows #1164

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

No shell quoting whatsoever for deps.edn projects on Windows #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ec9bb5
Write deps.edn win jack-in command line to a file
PEZ May 1, 2021
5637164
Use jack-in.cmd for file name
PEZ May 1, 2021
514800a
Await the writing of the file
PEZ May 1, 2021
076d5d2
Stop deps.edn win quoting all together
PEZ May 1, 2021
1cec422
Update changelog [skip ci]
PEZ May 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changes to Calva.

## [Unreleased]
- Update cider-nrepl to [0.26.0](https://github.com/clojure-emacs/cider-nrepl/releases/tag/v0.26.0)
- Fix [Getting Started Repl not working on some Windows machines](https://github.com/BetterThanTomorrow/calva/issues/1162)

## [2.0.194] - 2021-04-26
- [Make Clojure-lsp Server Info command always enabled](https://github.com/BetterThanTomorrow/calva/issues/1143)
Expand Down
10 changes: 5 additions & 5 deletions src/nrepl/project-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ const cljsMiddleware: { [id: string]: string[] } = {
const serverPrinterDependencies = pprint.getServerSidePrinterDependencies();

function depsCljWindowsPath() {
return `"${path.join('.', '.calva', 'deps.clj.jar')}"`;
return `${path.join('.', '.calva', 'deps.clj.jar')}`;
}

const projectTypes: { [id: string]: ProjectType } = {
Expand Down Expand Up @@ -368,7 +368,7 @@ const projectTypes: { [id: string]: ProjectType } = {
resolveBundledPathWin: depsCljWindowsPath,
resolveBundledPathUnix: () => `'${path.join(state.extensionContext.extensionPath, 'deps.clj.jar')}'`,
processShellUnix: true,
processShellWin: true,
processShellWin: false,
useWhenExists: undefined,
nReplPortFile: [".nrepl-port"],
commandLine: async (connectSequence: ReplConnectSequence, cljsType: CljsTypes) => {
Expand Down Expand Up @@ -448,8 +448,8 @@ async function cljCommandLine(connectSequence: ReplConnectSequence, cljsType: Cl
};
const useMiddleware = [...middleware, ...(cljsType ? cljsMiddleware[cljsType] : [])];
const aliasesOption = aliases.length > 0 ? `-A${aliases.join("")}` : '';
const q = isWin ? '"' : "'";
const dQ = isWin ? '""' : '"';
const q = isWin ? '' : "'";
const dQ = '"';
for (let dep in dependencies)
out.push(dep + ` {:mvn/version,${dQ}${dependencies[dep]}${dQ}}`)

Expand All @@ -458,7 +458,7 @@ async function cljCommandLine(connectSequence: ReplConnectSequence, cljsType: Cl
if (selectedAliasesHasMain) {
args.push(aliasesOption);
} else {
args.push(aliasesOption, "-m", "nrepl.cmdline", "--middleware", `"[${useMiddleware.join(' ')}]"`);
args.push(aliasesOption, "-m", "nrepl.cmdline", "--middleware", `${q}[${useMiddleware.join(' ')}]${q}`);
}

return args;
Expand Down