[No QA] fix: Handle newline markers in Git.parseDiff#77354
Merged
mountiny merged 1 commit intoExpensify:mainfrom Dec 11, 2025
Merged
[No QA] fix: Handle newline markers in Git.parseDiff#77354mountiny merged 1 commit intoExpensify:mainfrom
Git.parseDiff#77354mountiny merged 1 commit intoExpensify:mainfrom
Conversation
chrispader
changed the title
\ No newline at end of file markers correctly lines in Git.parseDiffGit.parseDiff
chrispader
changed the title
Git.parseDiffGit.parseDiff
Codecov Report✅ All modified and coverable lines are covered by tests. |
chrispader
changed the title
Git.parseDiffGit.parseDiff
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / SafariMacOS: Desktop |
mountiny
approved these changes
Dec 11, 2025
| const result = Git.diff('main'); | ||
| const file = result.files.at(0); | ||
| expect(file).toBeDefined(); | ||
| if (!file) { |
Contributor
There was a problem hiding this comment.
Suggested change
| if (!file) { | |
| if (!file) { |
| expect(file.filePath).toBe('file.ts'); | ||
| expect(file.hunks).toHaveLength(1); | ||
| expect(file.modifiedLines.size).toBe(1); | ||
| // The "No newline" marker should be ignored, not counted as a line |
Contributor
There was a problem hiding this comment.
Suggested change
| // The "No newline" marker should be ignored, not counted as a line | |
| // The "No newline" marker should be ignored, not counted as a line |
Contributor
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
Contributor
|
🚀 Deployed to staging by https://github.com/mountiny in version: 9.2.78-0 🚀
|
Contributor
|
🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.78-8 🚀
|
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
3 participants
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.
@roryabraham
Explanation of Change
In #77269 i updated the logic of
Git.parseDiffto add metadata about added/removed files. With this change, the logic lacked handling of\ No newline at end of filelines.Fixed Issues
$ #68765
PROPOSAL:
Tests
None needed
Offline tests
None needed.
QA Steps
None needed.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari