diff --git a/apps/desktop/src/lib/trpc/routers/changes/utils/parse-status.test.ts b/apps/desktop/src/lib/trpc/routers/changes/utils/parse-status.test.ts index de472551f3e..03e1a967cf6 100644 --- a/apps/desktop/src/lib/trpc/routers/changes/utils/parse-status.test.ts +++ b/apps/desktop/src/lib/trpc/routers/changes/utils/parse-status.test.ts @@ -92,6 +92,18 @@ def456|def|another|person|2024-01-16T14:20:00Z`; }); describe("parseDiffNumstat", () => { + test("expands compact rename paths", () => { + const stats = parseDiffNumstat("7\t3\tsrc/{old => new}/file.ts"); + + expect(stats.get("src/old/file.ts")).toEqual({ + additions: 7, + deletions: 3, + isBinary: false, + }); + expect(stats.get("src/new/file.ts")).toEqual(stats.get("src/old/file.ts")); + expect(stats.size).toBe(2); + }); + test("parses basic numstat output", () => { const numstatOutput = `10 5 src/file1.ts 20 3 src/file2.ts`; diff --git a/apps/desktop/src/lib/trpc/routers/changes/utils/parse-status.ts b/apps/desktop/src/lib/trpc/routers/changes/utils/parse-status.ts index cd643188900..55d0311ba1b 100644 --- a/apps/desktop/src/lib/trpc/routers/changes/utils/parse-status.ts +++ b/apps/desktop/src/lib/trpc/routers/changes/utils/parse-status.ts @@ -141,8 +141,13 @@ export function parseDiffNumstat( isBinary: addStr === "-" && delStr === "-", }; + const compactRenameMatch = rawPath.match(/^(.*?)\{(.*?) => (.*?)\}(.*)$/); const renameMatch = rawPath.match(/^(.+) => (.+)$/); - if (renameMatch) { + if (compactRenameMatch) { + const [, prefix, oldPart, newPart, suffix] = compactRenameMatch; + stats.set(`${prefix}${newPart}${suffix}`, statEntry); + stats.set(`${prefix}${oldPart}${suffix}`, statEntry); + } else if (renameMatch) { const oldPath = renameMatch[1]; const newPath = renameMatch[2]; stats.set(newPath, statEntry);