Skip to content

fix(windows): support spaces in Node path #94

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

Open
Flow-Fly wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −8
Open

fix(windows): support spaces in Node path #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/copilot/CopilotAgent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import Logger from "../helpers/Logger";
import Json from "../helpers/Json";
import Client, { CopilotResponse } from "./Client";
import File from "../helpers/File";
import Node from "../helpers/Node";
import { GetCompletionsParams } from "@pierrad/ts-lsp-client";
import { InlineSuggestionEffect } from "../extensions/InlineSuggestionState";

Expand Down Expand Up @@ -51,10 +52,10 @@ class CopilotAgent implements SettingsObserver {
public startAgent(): void {
try {
this.agent = spawn(
File.wrapFilePath(this.plugin.settings.nodePath),
[File.wrapFilePath(this.agentPath), "--stdio"],
// Spawn the executable directly to avoid shell parsing issues with spaces
Node.normalizePath(this.plugin.settings.nodePath),
[Node.normalizePath(this.agentPath), "--stdio"],
{
shell: true,
stdio: "pipe",
...(this.plugin.settings.proxy && {
env: {
Expand Down
18 changes: 13 additions & 5 deletions src/helpers/Node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ class Node {
return nodePath;
}

// Trim surrounding whitespace and remove surrounding quotes if the user
// pasted a quoted path (common on Windows when copying paths).
nodePath = nodePath.trim();

if ((nodePath.startsWith('"') && nodePath.endsWith('"')) || (nodePath.startsWith("'") && nodePath.endsWith("'"))) {
nodePath = nodePath.slice(1, -1);
}

if (nodePath.startsWith("~")) {
nodePath = nodePath.replace(/^~(?=$|\/|\\)/, os.homedir());
}
Expand Down Expand Up @@ -74,11 +82,11 @@ class Node {
}

const result = await new Promise<string>((resolve, reject) => {
let spawnOptions = {};

if (os.platform() === "win32") {
spawnOptions = { shell: true };
}
// Do not run under a shell. Using a shell on Windows will split paths
// that contain spaces (eg. "C:\Program Files\nodejs\node.exe") and
// cause the command to fail. Spawn the executable directly so paths
// with spaces are handled correctly.
const spawnOptions = {};

const nodeProcess = child_process.spawn(
normalizedPath,
Expand Down