Fix diffAcceptRejectHunk with partial FileDiffMetadata#428
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
2 tasks
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a regression in @pierre/diffs where diffAcceptRejectHunk could throw when operating on FileDiffMetadata parsed from patch files (isPartial = true) that contain omitted context tracked via collapsedBefore.
Changes:
- Update
resolveRegionto avoid materializing collapsed context lines whendiff.isPartialis true, while still advancing virtual cursor metrics correctly. - Add a regression test ensuring accepting a hunk from a partial patch works without requiring the omitted context lines.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| packages/diffs/src/utils/resolveRegion.ts | Skips pushing collapsed context lines for partial diffs and introduces a helper to keep cursor/metrics consistent. |
| packages/diffs/test/diffAcceptRejectHunk.test.ts | Adds coverage for accepting hunks on parsePatchFiles-produced (partial) diffs. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a regression when I refactored the patch resolving architecture, where i didn't account for FileDiffMetadata that was
isPartial = true.Fixed the issue and added a test to ensure we don't regress.
Fixes #427