Write deps.edn win jack-in command line to a file

Then execute that file Fixes #1162
BetterThanTomorrow · May 1, 2021 · 4ec9bb5 · 4ec9bb5
1 parent 25c2c7a
commit 4ec9bb5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/nrepl/jack-in.ts b/src/nrepl/jack-in.ts
@@ -162,6 +162,13 @@ async function getJackInTerminalOptions(projectConnectSequence: ReplConnectSeque
     }
     executable = cmd[0];
     args = [...cmd.slice(1), ...args];
+    if (projectTypes.isWin && projectType.resolveBundledPathWin) {
+        const cmdFile = path.join('.calva', 'start.cmd');
+        const cmdFileUri = vscode.Uri.file(path.join(state.getProjectRootLocal(), '.calva', 'start.cmd'))
+        utilities.writeTextToFile(cmdFileUri, createCommandLine(executable, args))
+        executable = cmdFile;
+        args = [];
+    }
 
     const terminalOptions: JackInTerminalOptions = {
         name: `Calva Jack-in: ${projectConnectSequence.name}`,

diff --git a/src/nrepl/project-types.ts b/src/nrepl/project-types.ts
@@ -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 } = {
@@ -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) => {
@@ -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;