- Notifications
You must be signed in to change notification settings - Fork26.7k
fix(compiler): ensure that placeholders have the correct sourceSpan#39717
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Closed
petebacondarwin wants to merge4 commits intoangular:masterfrompetebacondarwin:i18n-more-equiv-text-source-span-woes-issue-39671
Closed
Uh oh!
There was an error while loading.Please reload this page.
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
06d498c to73df49dCompareUh oh!
There was an error while loading.Please reload this page.
dab6e08 to08f5c7eCompareAndrewKushnir approved these changesNov 17, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Thanks for the cleanup and the fix@petebacondarwin 👍
@petebacondarwin FYI, presubmit is successful for the changes in this PR. Thank you. |
15 tasks
This helper improves the message given when an expectationfails in a source-mapping test.
When the `preserveWhitespaces` is not true, the template parser willprocess the parsed AST nodes to remove excess whitespace. Since thegenerated `goog.getMsg()` statements rely upon the AST nodes afterthis whitespace is removed, the i18n extraction must make a second pass.Previously this resulted in innacurrate source-spans for the i18n text andplaceholder nodes that were extracted in the second pass.This commit fixes this by reusing the source-spans from the first passwhen extracting the nodes in the second pass.Fixesangular#39671
When parsing for i18n messages, interpolated strings aresplit into `Text` and `Placeholder` pieces. The method thatdoes this `_visitTextWithInterpolation()` was becoming toocomplex. This commit refactors that method along with someassociated functions that it uses.
08f5c7e to9ee0012CompareAndrewKushnir pushed a commit that referenced this pull requestNov 20, 2020
This helper improves the message given when an expectationfails in a source-mapping test.PRClose#39717
AndrewKushnir pushed a commit that referenced this pull requestNov 20, 2020
…39717)When the `preserveWhitespaces` is not true, the template parser willprocess the parsed AST nodes to remove excess whitespace. Since thegenerated `goog.getMsg()` statements rely upon the AST nodes afterthis whitespace is removed, the i18n extraction must make a second pass.Previously this resulted in innacurrate source-spans for the i18n text andplaceholder nodes that were extracted in the second pass.This commit fixes this by reusing the source-spans from the first passwhen extracting the nodes in the second pass.Fixes#39671PRClose#39717
AndrewKushnir pushed a commit that referenced this pull requestNov 20, 2020
When parsing for i18n messages, interpolated strings aresplit into `Text` and `Placeholder` pieces. The method thatdoes this `_visitTextWithInterpolation()` was becoming toocomplex. This commit refactors that method along with someassociated functions that it uses.PRClose#39717
AndrewKushnir pushed a commit that referenced this pull requestNov 20, 2020
…39717)When the `preserveWhitespaces` is not true, the template parser willprocess the parsed AST nodes to remove excess whitespace. Since thegenerated `goog.getMsg()` statements rely upon the AST nodes afterthis whitespace is removed, the i18n extraction must make a second pass.Previously this resulted in innacurrate source-spans for the i18n text andplaceholder nodes that were extracted in the second pass.This commit fixes this by reusing the source-spans from the first passwhen extracting the nodes in the second pass.Fixes#39671PRClose#39717
AndrewKushnir pushed a commit that referenced this pull requestNov 20, 2020
When parsing for i18n messages, interpolated strings aresplit into `Text` and `Placeholder` pieces. The method thatdoes this `_visitTextWithInterpolation()` was becoming toocomplex. This commit refactors that method along with someassociated functions that it uses.PRClose#39717
This issue has been automatically locked due to inactivity. Read more about ourautomatic conversation locking policy. This action has been performed automatically by a bot. |
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.
Labels
action: mergeThe PR is ready for merge by the caretaker area: compilerIssues related to `ngc`, Angular's template compiler area: i18nIssues related to localization and internationalization cla: yestarget: patchThis PR is targeted for the next patch release
2 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.
When the
preserveWhitespacesis not true, the template parser willprocess the parsed AST nodes to remove excess whitespace. Since the
generated
goog.getMsg()statements rely upon the AST nodes afterthis whitespace is removed, the i18n extraction must make a second pass.
Previously this resulted in innacurrate source-spans for the i18n text and
placeholder nodes that were extracted in the second pass.
This commit fixes this by reusing the source-spans from the first pass
when extracting the nodes in the second pass.
Fixes#39671