Skip to content

Commit 9a2d737

Browse files
fix(web): keep backslashes in POSIX workspace directory names
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 464e2b3 commit 9a2d737

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎apps/web/src/diffFileActions.test.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@ describe("openDiffFilePrimaryAction", () => {
7070
repositoryRoot: "/repo",
7171
}),
7272
).toBe("src/a\\b.txt");
73+
expect(
74+
resolveDiffPathForWorkspace({
75+
filePath: "pkg\\one/src/index.ts",
76+
workspaceRoot: "/repo/pkg\\one",
77+
repositoryRoot: "/repo",
78+
}),
79+
).toBe("src/index.ts");
7380
});
7481

7582
// regression: #6174 opening diff files broke for repositories at a filesystem root

‎apps/web/src/diffFileActions.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,16 @@ function repositoryRelativeWorkspaceSegments(
4545
const normalizedRepositoryRoot = normalizeProjectPathForComparison(repositoryRoot);
4646
if (normalizedWorkspaceRoot === normalizedRepositoryRoot) return [];
4747

48-
const separator = normalizedRepositoryRoot.includes("\\") ? "\\" : "/";
48+
const windows = isWindowsAbsolutePath(workspaceRoot);
49+
const separator = windows ? "\\" : "/";
4950
const repositoryPrefix = normalizedRepositoryRoot.endsWith(separator)
5051
? normalizedRepositoryRoot
5152
: `${normalizedRepositoryRoot}${separator}`;
5253
if (!normalizedWorkspaceRoot.startsWith(repositoryPrefix)) return null;
5354

5455
return normalizedWorkspaceRoot
5556
.slice(repositoryPrefix.length)
56-
.split(/[\\/]+/)
57+
.split(windows ? /[\\/]+/ : /\/+/)
5758
.filter(Boolean);
5859
}
5960

0 commit comments

Comments
 (0)