TypeScript
fix(shared): Linux file links preserve literal backslashes (#29245)
Lakshmi Tanmayefcb93769599
diff --git a/packages/shared/src/path.test.ts b/packages/shared/src/path.test.tsindex 9b0ccd88262..1d634885272 100644--- a/packages/shared/src/path.test.ts+++ b/packages/shared/src/path.test.ts@@ -106,6 +106,21 @@ describe("workspaceRelativeFilePath", () => {["/repo/project/../other/notes.md", "/repo/project", null],["C:\\repo\\project\\src\\..\\..\\notes.md", "C:\\repo\\project", null],["/repo/project/docs/a/../b.md", "/repo/project", "docs/a/../b.md"],+ ["/repo/a\\b.txt", "/repo", "a\\b.txt"],+ ["/repo/a/b.txt", "/repo", "a/b.txt"],+ ["/repo/a\\", "/repo", "a\\"],+ ["/repo/..\\notes.md", "/repo", "..\\notes.md"],+ ["/repo/a\\/../../notes.md", "/repo", null],+ ["/repo\\project/a.txt", "/repo\\project/", "a.txt"],+ ["/repo/project/a.txt", "/repo\\project", null],+ ["/repo\\project/a.txt", "/repo/project", null],+ ["C:\\Repo\\src\\main.ts", "c:/repo/", "src/main.ts"],+ ["/C:/Repo/src/main.ts", "c:\\repo", "src/main.ts"],+ ["C:\\Repo\\src\\main.ts", "/c:/repo", "src/main.ts"],+ ["\\\\SERVER\\Share\\Repo\\src\\main.ts", "\\\\server\\share\\repo", "src/main.ts"],+ ["\\\\SERVER\\Share\\Repo\\src\\main.ts", "//server/share/repo", "src/main.ts"],+ ["//server/share/a\\b.txt", "//server/share", "a\\b.txt"],+ ["\\\\server\\share\\repo\\..\\notes.md", "\\\\server\\share\\repo", null],])("relates %s to %s", (path, workspaceRoot, relativePath) => {expect(workspaceRelativeFilePath(path, workspaceRoot)).toBe(relativePath);});diff --git a/packages/shared/src/path.ts b/packages/shared/src/path.tsindex a7cce7cb88f..e2c3cd3117a 100644--- a/packages/shared/src/path.ts+++ b/packages/shared/src/path.ts@@ -95,11 +95,17 @@ export function workspaceRelativeFilePath(workspaceRoot: string | null | undefined,): string | null {if (!workspaceRoot) return null;- const normalizedPath = stripSlashPrefixedWindowsDrive(path.replaceAll("\\", "/"));- const normalizedRoot = stripSlashPrefixedWindowsDrive(- workspaceRoot.replaceAll("\\", "/"),+ const caseInsensitive =+ isWindowsAbsolutePath(stripSlashPrefixedWindowsDrive(workspaceRoot)) ||+ (isNetworkPath(workspaceRoot) && isUncPath(path));+ const normalizedPath = caseInsensitive+ ? stripSlashPrefixedWindowsDrive(path.replaceAll("\\", "/"))+ : path;+ const normalizedRoot = (+ caseInsensitive+ ? stripSlashPrefixedWindowsDrive(workspaceRoot.replaceAll("\\", "/"))+ : workspaceRoot).replace(/\/+$/, "");- const caseInsensitive = isWindowsAbsolutePath(stripSlashPrefixedWindowsDrive(workspaceRoot));const pathForCompare = caseInsensitive ? normalizedPath.toLowerCase() : normalizedPath;const rootForCompare = caseInsensitive ? normalizedRoot.toLowerCase() : normalizedRoot;if (pathForCompare.replace(/\/+$/, "") === rootForCompare) return ".";