Don't use shell and always use deps.clj on windows

* Fixes #2592
BetterThanTomorrow · Jul 3, 2024 · 90e8458 · 90e8458
1 parent e284cf2
commit 90e8458
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/nrepl/project-types.ts b/src/nrepl/project-types.ts
@@ -329,7 +329,6 @@ function depsCljWindowsPath() {
 }
 
 const clojureCmdFn = () => {
-  const q = isWin ? '"' : "'";
   const configuredCmd =
     getConfig().depsEdnJackInExecutable === 'clojure or deps.clj'
       ? getStateValue('depsEdnJackInDefaultExecutable') ?? 'deps.clj'
@@ -339,6 +338,10 @@ const clojureCmdFn = () => {
     : ['clojure'];
 };
 
+const clojureCmdWinFn = () => {
+  return ['java', '-jar', `${path.join(state.extensionContext.extensionPath, 'deps.clj.jar')}`];
+};
+
 const projectTypes: { [id: string]: ProjectType } = {
   lein: {
     name: 'Leiningen',
@@ -375,10 +378,10 @@ const projectTypes: { [id: string]: ProjectType } = {
       'ClojureScript built-in for node',
     ],
     cmd: clojureCmdFn,
-    winCmd: clojureCmdFn,
+    winCmd: clojureCmdWinFn,
     resolveBundledPathWin: depsCljWindowsPath,
     processShellUnix: true,
-    processShellWin: true,
+    processShellWin: false,
     useWhenExists: ['deps.edn'],
     nReplPortFile: ['.nrepl-port'],
     /** Build the command line args for a clj-project.
@@ -669,7 +672,7 @@ async function cljCommandLine(connectSequence: ReplConnectSequence, cljsType: Cl
   const aliasesOption =
     aliases.length > 0 ? `${aliasesFlag[0]}${aliases.join('')}` : aliasesFlag[1];
   const q = isWin ? '"' : "'";
-  const dQ = isWin ? '""' : '"';
+  const dQ = isWin ? '\\"' : '"';
   for (const dep in dependencies) {
     out.push(dep + ` {:mvn/version,${dQ}${dependencies[dep]}${dQ}}`);
   }