Repository navigation
Fix extracted lineno with nested calls - #1126
Merged
akx merged 1 commit intoOct 19, 2024
Merged
akx merged 1 commit into
akx merged 1 commit into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
akx
approved these changes
Oct 19, 2024
akx
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
LGTM, thanks!
Sorry, something went wrong.
When a gettext call had a nested function call on a new line, the extract function would use that nested call's line number when extracting the terms for the gettext call. The reason is that we set the line number on any encounter of an opening parenthesis after a gettext keyword. This does not work if either we have a nested call, or our first term starts on a new line. This commit fixes that by only setting the line number when we encounter the first argument inside a gettext call. Existing tests were adapted to work according to `xgettext` with regards to the line numbers. Fixes python-babel#1123
akx
force-pushed
the
fix-linenno-nested-call
branch
from
7095897 to
5795711
Compare
October 19, 2024 12:14
akx
enabled auto-merge (squash)
October 19, 2024 12:14
Copy link
Copy Markdown
Codecov ReportAll modified and coverable lines are covered by tests ✅ Additional details and impacted files @@ Coverage Diff @@
## master #1126 +/- ##
=======================================
Coverage 91.30% 91.31%
=======================================
Files 27 27
Lines 4610 4615 +5
=======================================
+ Hits 4209 4214 +5
Misses 401 401
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Sorry, something went wrong.
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.
When a gettext call had a nested function call on a new line, the extract function would use that nested call's line number when extracting the terms for the gettext call.
The reason is that we set the line number on any encounter of an opening parenthesis after a gettext keyword. This does not work if either we have a nested call, or our first term starts on a new line.
This commit fixes that by only setting the line number when we encounter the first argument inside a gettext call.
Existing tests were adapted to work according to xgettext with regards to the line numbers.
Fixes #1123