From 13b8c1d2da15537b7ee36b462bf2428160df7915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20K=C5=82osko?= Date: Thu, 26 Mar 2026 22:32:50 +0100 Subject: [PATCH] Fix patch parsing to trim newline from prevName on pure renames --- packages/diffs/src/utils/parsePatchFiles.ts | 2 +- .../parsePatchFiles.test.ts.snap | 20 ++++--------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/packages/diffs/src/utils/parsePatchFiles.ts b/packages/diffs/src/utils/parsePatchFiles.ts index 3d98d6f2b..b92f04b96 100644 --- a/packages/diffs/src/utils/parsePatchFiles.ts +++ b/packages/diffs/src/utils/parsePatchFiles.ts @@ -219,7 +219,7 @@ export function processFile( // We have to handle these for pure renames because there won't be // --- and +++ lines if (line.startsWith('rename from ')) { - currentFile.prevName = line.replace('rename from ', ''); + currentFile.prevName = line.replace('rename from ', '').trim(); } if (line.startsWith('rename to ')) { currentFile.name = line.replace('rename to ', '').trim(); diff --git a/packages/diffs/test/__snapshots__/parsePatchFiles.test.ts.snap b/packages/diffs/test/__snapshots__/parsePatchFiles.test.ts.snap index 9e39dcbc9..30d4b9983 100644 --- a/packages/diffs/test/__snapshots__/parsePatchFiles.test.ts.snap +++ b/packages/diffs/test/__snapshots__/parsePatchFiles.test.ts.snap @@ -1206,10 +1206,7 @@ exports[`parsePatchFiles should parse diff.patch and match snapshot: git pr patc "hunks": [], "isPartial": true, "name": "packages/diffs/src/components/web-components.ts", - "prevName": -"packages/diffs/src/custom-components/Container.ts -" -, + "prevName": "packages/diffs/src/custom-components/Container.ts", "splitLineCount": 0, "type": "rename-pure", "unifiedLineCount": 0, @@ -1932,10 +1929,7 @@ exports[`parsePatchFiles should parse diff.patch and match snapshot: git pr patc "hunks": [], "isPartial": true, "name": "packages/diffs/src/managers/ScrollSyncManager.ts", - "prevName": -"packages/diffs/src/ScrollSyncManager.ts -" -, + "prevName": "packages/diffs/src/ScrollSyncManager.ts", "splitLineCount": 0, "type": "rename-pure", "unifiedLineCount": 0, @@ -1947,10 +1941,7 @@ exports[`parsePatchFiles should parse diff.patch and match snapshot: git pr patc "hunks": [], "isPartial": true, "name": "packages/diffs/src/managers/UniversalRenderingManager.ts", - "prevName": -"packages/diffs/src/UniversalRenderer.ts -" -, + "prevName": "packages/diffs/src/UniversalRenderer.ts", "splitLineCount": 0, "type": "rename-pure", "unifiedLineCount": 0, @@ -71660,10 +71651,7 @@ Subject: [PATCH 7/9] Update test snapshots "hunks": [], "isPartial": true, "name": "apps/docs/app/ssr/SSRPage.tsx", - "prevName": -"apps/docs/app/ssr/SSR_Page.tsx -" -, + "prevName": "apps/docs/app/ssr/SSR_Page.tsx", "splitLineCount": 0, "type": "rename-pure", "unifiedLineCount": 0,