Skip to content

Detect quoted path from ninja on Windows #1120

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

Merged
merged 2 commits into from
Aug 27, 2025
Merged

Detect quoted path from ninja on Windows #1120

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba25160
Detect quoted path from ninja on Windows
nojaf Aug 27, 2025
88e4851
Changelog entry
nojaf Aug 27, 2025
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
25 changes: 21 additions & 4 deletions server/src/incrementalCompilation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { performance } from "perf_hooks";
import * as p from "vscode-languageserver-protocol";
import * as cp from "node:child_process";
import semver from "semver";
import * as os from "os";
import config, { send } from "./config";
import * as c from "./constants";
import { fileCodeActions } from "./codeActions";
Expand Down Expand Up @@ -555,6 +556,9 @@ function verifyTriggerToken(filePath: string, triggerToken: number): boolean {
triggerToken
);
}

const isWindows = os.platform() === "win32";

async function figureOutBscArgs(entry: IncrementallyCompiledFileInfo) {
const project = projectsFiles.get(entry.project.rootPath);
if (project?.rescriptVersion == null) {
Expand Down Expand Up @@ -591,10 +595,23 @@ async function figureOutBscArgs(entry: IncrementallyCompiledFileInfo) {
buildArgs.forEach(([key, value]: Array<string>) => {
if (key === "-I") {
if (isBsb) {
callArgs.push(
"-I",
path.resolve(entry.project.rootPath, c.compilerDirPartialPath, value),
);
/*build.ninja could have quoted paths on Windows
Example:
rule mij
command = "C:\Users\moi\Projects\my-project\node_modules\rescript\win32\bsc.exe" -I src -I "C:\Users\moi\Projects\my-project\node_modules\@rescript\core\lib\ocaml" -open RescriptCore -uncurried -bs-package-name rewindow -bs-package-output esmodule:$in_d:.res.mjs -bs-v $g_finger $i
*/
if (isWindows && value.startsWith('"') && value.endsWith('"')) {
callArgs.push("-I", value.substring(1, value.length - 1));
} else {
callArgs.push(
"-I",
path.resolve(
entry.project.rootPath,
c.compilerDirPartialPath,
value,
),
);
}
} else {
// TODO: once ReScript v12 is out we can remove this check for `.`
if (value === ".") {
Expand Down
Loading