Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(compiler): compute correct offsets when interpolations have HTML entities #44811

Closed
wants to merge 2 commits into from

Conversation

atscott
Copy link
Contributor

@atscott atscott commented Jan 24, 2022

When parsing interpolations, the input string is decoded from what was
in the original template. This means that we cannot solely rely on the input
string to compute source spans because it does not necessarily reflect
the exact content of the original template. Specifically, when there is
an HTML entity (i.e.  ), this will show up in its decoded form
when processing the interpolation (' '). We need to compute offsets
using the original encoded string.

Note that this problem only surfaces in the splitting of interpolations.
The spans to this point have already been tracked accurately. For
example, given the template &nbsp;<div></div>, the source span for the
div is already correctly determined to be 6. Only when we encounter
interpolations with many parts do we run into situations where we need
to compute new spans for the individual parts of the interpolation.

@atscott atscott force-pushed the encodedentitybug branch 4 times, most recently from 144d5a0 to 2243930 Compare January 25, 2022 00:36
…entities

When parsing interpolations, the input string is _decoded_ from what was
in the orginal template. This means that we cannot soley rely on the input
string to compute source spans because it does not necessarily reflect
the exact content of the original template. Specifically, when there is
an HTML entity (i.e. `&nbsp;`), this will show up in its decoded form
when processing the interpolation (' '). We need to compute offsets
using the original _encoded_ string.

Note that this problem only surfaces in the splitting of interpolations.
The spans to this point have already been tracked accurately. For
example, given the template `&nbsp;<div></div>`, the source span for the
`div` is already correctly determined to be 6. Only when we encounter
interpolations with many parts do we run into situations where we need
to compute new spans for the individual parts of the interpolation.
@atscott
Copy link
Contributor Author

atscott commented Jan 26, 2022

global presubmit (green)

@atscott atscott marked this pull request as ready for review January 26, 2022 17:40
@jessicajaniuk jessicajaniuk added the area: compiler Issues related to `ngc`, Angular's template compiler label Jan 27, 2022
@ngbot ngbot bot added this to the Backlog milestone Jan 27, 2022
@atscott atscott added the target: patch This PR is targeted for the next patch release label Feb 3, 2022
Copy link
Contributor

@AndrewKushnir AndrewKushnir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@atscott atscott added the action: merge The PR is ready for merge by the caretaker label Mar 8, 2022
@AndrewKushnir
Copy link
Contributor

This PR was merged into the repository by commit 2b7553d.

AndrewKushnir pushed a commit that referenced this pull request Mar 8, 2022
…entities (#44811)

When parsing interpolations, the input string is _decoded_ from what was
in the orginal template. This means that we cannot soley rely on the input
string to compute source spans because it does not necessarily reflect
the exact content of the original template. Specifically, when there is
an HTML entity (i.e. `&nbsp;`), this will show up in its decoded form
when processing the interpolation (' '). We need to compute offsets
using the original _encoded_ string.

Note that this problem only surfaces in the splitting of interpolations.
The spans to this point have already been tracked accurately. For
example, given the template `&nbsp;<div></div>`, the source span for the
`div` is already correctly determined to be 6. Only when we encounter
interpolations with many parts do we run into situations where we need
to compute new spans for the individual parts of the interpolation.

PR Close #44811
crapStone pushed a commit to Calciumdibromid/CaBr2 that referenced this pull request Mar 18, 2022
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [@angular/animations](https://github.com/angular/angular) | dependencies | patch | [`13.2.5` -> `13.2.6`](https://renovatebot.com/diffs/npm/@angular%2fanimations/13.2.5/13.2.6) |
| [@angular/common](https://github.com/angular/angular) | dependencies | patch | [`13.2.5` -> `13.2.6`](https://renovatebot.com/diffs/npm/@angular%2fcommon/13.2.5/13.2.6) |
| [@angular/compiler](https://github.com/angular/angular) | dependencies | patch | [`13.2.5` -> `13.2.6`](https://renovatebot.com/diffs/npm/@angular%2fcompiler/13.2.5/13.2.6) |
| [@angular/compiler-cli](https://github.com/angular/angular) | devDependencies | patch | [`13.2.5` -> `13.2.6`](https://renovatebot.com/diffs/npm/@angular%2fcompiler-cli/13.2.5/13.2.6) |
| [@angular/core](https://github.com/angular/angular) | dependencies | patch | [`13.2.5` -> `13.2.6`](https://renovatebot.com/diffs/npm/@angular%2fcore/13.2.5/13.2.6) |
| [@angular/forms](https://github.com/angular/angular) | dependencies | patch | [`13.2.5` -> `13.2.6`](https://renovatebot.com/diffs/npm/@angular%2fforms/13.2.5/13.2.6) |
| [@angular/platform-browser](https://github.com/angular/angular) | dependencies | patch | [`13.2.5` -> `13.2.6`](https://renovatebot.com/diffs/npm/@angular%2fplatform-browser/13.2.5/13.2.6) |
| [@angular/platform-browser-dynamic](https://github.com/angular/angular) | dependencies | patch | [`13.2.5` -> `13.2.6`](https://renovatebot.com/diffs/npm/@angular%2fplatform-browser-dynamic/13.2.5/13.2.6) |
| [@angular/router](https://github.com/angular/angular) | dependencies | patch | [`13.2.5` -> `13.2.6`](https://renovatebot.com/diffs/npm/@angular%2frouter/13.2.5/13.2.6) |

---

### Release Notes

<details>
<summary>angular/angular</summary>

### [`v13.2.6`](https://github.com/angular/angular/blob/HEAD/CHANGELOG.md#&#8203;1326-2022-03-09)

[Compare Source](angular/angular@13.2.5...13.2.6)

##### compiler

| Commit | Type | Description |
| -- | -- | -- |
| [6efa366e2c](angular/angular@6efa366) | fix | compute correct offsets when interpolations have HTML entities ([#&#8203;44811](angular/angular#44811)) |

##### language-service

| Commit | Type | Description |
| -- | -- | -- |
| [9bce9ce89e](angular/angular@9bce9ce) | fix | Prioritize Angular-specific completions over DOM completions ([#&#8203;45293](angular/angular#45293)) |

##### service-worker

| Commit | Type | Description |
| -- | -- | -- |
| [cff1c5622f](angular/angular@cff1c56) | fix | file system hash in batch of 500 elements ([#&#8203;45262](angular/angular#45262)) |

#### Special Thanks

Andrew Scott, Anner Visser, Aristeidis Bampakos, JiaLiPassion, Joey Perrott, Kristiyan Kostadinov, Luca, Mladen Jakovljević, Paul Gschwendtner, Srikanth Kolli and nanda18

<!-- CHANGELOG SPLIT MARKER -->

</details>

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

Co-authored-by: cabr2-bot <cabr2.help@gmail.com>
Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1211
Reviewed-by: Epsilon_02 <epsilon_02@noreply.codeberg.org>
Co-authored-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
Co-committed-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Apr 8, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker area: compiler Issues related to `ngc`, Angular's template compiler target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants