fix(migrations): avoid conflicts with some greek letters in control flow migration#55113
Closed
crisbeto wants to merge 1 commit intoangular:mainfrom
Closed
fix(migrations): avoid conflicts with some greek letters in control flow migration#55113crisbeto wants to merge 1 commit intoangular:mainfrom
crisbeto wants to merge 1 commit intoangular:mainfrom
Conversation
…low migration The control flow migration was using a couple of Greek letters as placeholders. This ended up conflicting with templates authored in Greek. These changes use a more obscure placeholder to make conflicts less likely. It also moves the placeholder generation to a centralized function so it's easier to make changes if we decide to update the pattern again. Fixes angular#55085.
crisbeto
commented
Mar 29, 2024
| export function getPlaceholder( | ||
| value: string, kind: PlaceholderKind = PlaceholderKind.Default): string { | ||
| const name = `<<<ɵɵngControlFlowMigration_${kind}ɵɵ>>>`; | ||
| return `___${name}${value}${name}___`; |
Member
Author
There was a problem hiding this comment.
Technically things can still break if somebody is wrapping their content in ___<<<ɵɵngControlFlowMigration_0ɵɵ>>><<<ɵɵngControlFlowMigration_0ɵɵ>>>___ but hopefully it's a bit less likely than before.
Member
Author
|
Caretaker note: the presubmit is failing because of one unrelated flaky target. |
|
Nice, thanks for the fast response to the issue! I now wish had reported it sooner 😊 |
jessicajaniuk
approved these changes
Mar 29, 2024
Contributor
jessicajaniuk
left a comment
There was a problem hiding this comment.
LGTM! Thanks for fixing this, @crisbeto
atscott
pushed a commit
that referenced
this pull request
Mar 29, 2024
…low migration (#55113) The control flow migration was using a couple of Greek letters as placeholders. This ended up conflicting with templates authored in Greek. These changes use a more obscure placeholder to make conflicts less likely. It also moves the placeholder generation to a centralized function so it's easier to make changes if we decide to update the pattern again. Fixes #55085. PR Close #55113
Contributor
|
This PR was merged into the repository by commit 0c20c40. |
jessicajaniuk
pushed a commit
to jessicajaniuk/angular
that referenced
this pull request
Mar 29, 2024
…low migration (angular#55113) The control flow migration was using a couple of Greek letters as placeholders. This ended up conflicting with templates authored in Greek. These changes use a more obscure placeholder to make conflicts less likely. It also moves the placeholder generation to a centralized function so it's easier to make changes if we decide to update the pattern again. Fixes angular#55085. PR Close angular#55113
This was referenced Apr 26, 2024
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
The control flow migration was using a couple of Greek letters as placeholders. This ended up conflicting with templates authored in Greek.
These changes use a more obscure placeholder to make conflicts less likely. It also moves the placeholder generation to a centralized function so it's easier to make changes if we decide to update the pattern again.
Fixes #55085.