i18n: treat Infinity and NaN as numeric values #9687
Merged
Conversation
This file contains 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
brendankenny
commented
Sep 17, 2019
|
|
||
| it('formats correctly with NaN and Infinity numeric values', () => { | ||
| const helloInfinityStr = str_(UIStrings.helloBytesWorld, {in: Infinity}); | ||
| expect(helloInfinityStr).toBeDisplayString('Hello ∞ World'); |
There was a problem hiding this comment.
expect(helloInfinityStr).toBeDisplayString('Hello ∞ World');
I guess this is how it's supposed to get formatted? 🤷♀
exterkamp
approved these changes
Sep 17, 2019
lighthouse-core/lib/i18n/i18n.js
Outdated
| values[id] = value / 1024; | ||
| formattedValues[id] = value / 1024; | ||
| } else { | ||
| // All other numbers passed through unchanged. |
There was a problem hiding this comment.
Suggested change
| // All other numbers passed through unchanged. | |
| // All other numbers (e.g. ∞) passed through unchanged. |
There was a problem hiding this comment.
Infinity could be passed to the other styles as well (the issue in #9684 is passing it through bytes, it's just that Infinity / 1024 === Infinity :)
There was a problem hiding this comment.
tried to make this comment clearer as well
| } | ||
| } | ||
|
|
||
| // Throw an error if a value is provided but has no placeholder in the message. | ||
| for (const valueId of Object.keys(values)) { | ||
| // errorCode is a special case always allowed to help ease of LHError use. | ||
| if (valueId === 'errorCode') continue; | ||
| if (valueId in formattedValues) continue; |
paulirish
approved these changes
Sep 17, 2019
|
|
||
| it('formats correctly with NaN and Infinity numeric values', () => { | ||
| const helloInfinityStr = str_(UIStrings.helloBytesWorld, {in: Infinity}); | ||
| expect(helloInfinityStr).toBeDisplayString('Hello ∞ World'); |
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.
fixes the crasher part of #9684
The issue was that we were
JSON.parse(JSON.stringify(values))ing to make sure we weren't modifying the original ICU replacement values, but bothInfinityandNaNget converted tonullwhen stringified, which then fails the check that we're only replacing numeric placeholders with numbers.Instead, this copies over the values one by one to a new object, formatting if needed. Also smushes
_preformatValuesand_processParsedElementstogether because the first was mostly just calling the second, but the first had a way better name.