handle github.CommitFile multi-commit PR patch format #8
Conversation
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
crockeo
changed the title
crockeo
commented
Oct 19, 2023
Comment on lines
+173
to
+181
| rowDiff := newRows - oldRows | ||
| for i, bound := range lineBounds { | ||
| if oldStart < bound.start { | ||
| bound.start += rowDiff | ||
| bound.end += rowDiff | ||
| } else if oldStart < bound.end { | ||
| bound.end += rowDiff | ||
| } | ||
|
|
||
| lineBounds = append(lineBounds, lineBound{start: start, end: start + endOffset - 1}) | ||
| lineBounds[i] = bound |
There was a problem hiding this comment.
I don't like the asymptotic complexity of this little bit right here. Let me know if you expect this to be a problem and I can come back and do it right.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
As far as I know
github.CommitFilestructures patches such that:See:
multi_stage.patchbelow for an example.GitHub processes these multi-commit patch files intelligently and renders a PR diff so that each added line appears at the place it will be after merging. But
less-advanced-securitymakeslineBounds from each line number that appears in the diff, and doesn't shift them around based on subsequentlineBounds.All of this means that we can render annotations on lines which do not appear to be in a PR diff because that line number happened to appear in some commit's patch before it got shifted around by subsequent commits' edits.