layout: Fix line breaking opportunities for Chinese and Japanese - #43744
Merged
Conversation
servo-highfive
added
the
S-awaiting-review
|
🔨 Triggering try run (#23704025326) for Linux (WPT) |
Loirooriol
reviewed
Mar 29, 2026
Loirooriol
left a comment
Loirooriol
left a comment
Contributor
There was a problem hiding this comment.
The testcase from #43677 doesn't seem to use japanese/chinese at all?
|
Test results for linux-wpt from try job (#23704025326): Flaky unexpected result (17)
Stable unexpected results that are known to be intermittent (19)
Stable unexpected results (23)
|
|
|
Contributor
Author
|
I've totally refactored this to ditch the character sniffing, now it just checks for lang="ja" or lang="zh" using the computed _x_lang attribute. |
SharanRP
force-pushed
the
fix-43677-text-wrap-overflow
branch
from
March 29, 2026 17:36
6fa759c to
80334ab
Compare
|
🔨 Triggering try run (#23715380684) for Linux (WPT) |
|
Test results for linux-wpt from try job (#23715380684): Flaky unexpected result (29)
Stable unexpected results that are known to be intermittent (14)
Stable unexpected results (12)
|
|
|
Contributor
|
Test results look good. You can automatically update expectations by running the following command: |
Contributor
|
Are you sure this fixes #43677? I don't see how that is related to CJK. Btw the new unit test doesn't look very helpful to me, as it's just testing the |
SharanRP
force-pushed
the
fix-43677-text-wrap-overflow
branch
from
March 30, 2026 18:46
80334ab to
f5c70a1
Compare
Contributor
Author
|
The TPAC page uses |
Contributor
If this is not fixing #43677, drop |
Loirooriol
reviewed
Mar 31, 2026
| // has a Japanese or Chinese language set. | ||
| options.ja_zh = { | ||
| let lang_str = lang.0.as_ref(); | ||
| lang_str.starts_with("zh") || lang_str.starts_with("ja") |
Contributor
There was a problem hiding this comment.
Should this check that there is an hyphen after zh or ja? Even if no other language code starts with these letters, I guess an invalid one could be provided?
Or https://github.com/unicode-org/icu4x/blob/030624fc705b92bc2b8c32f68d1cc2a78cbb2fce/components/segmenter/src/line.rs#L241-L243 just checks for equality 🤔
Contributor
There was a problem hiding this comment.
Ah, no, icu4x 2 checks the .language.
So maybe LanguageIdentifier::from_str(lang_str).is_ok_and(|lang_id| lang_id.language, language!("ja") | language!("zh"))?
With the idea of just using LanguageIdentifier::from_str(lang_str) once we update to icu4x 2.
SharanRP
force-pushed
the
fix-43677-text-wrap-overflow
branch
from
April 1, 2026 20:03
f5c70a1 to
f41df98
Compare
Contributor
Author
|
|
Loirooriol
reviewed
Apr 1, 2026
| use icu_locid::LanguageIdentifier; | ||
| let lang_str = lang.0.as_ref(); | ||
| LanguageIdentifier::from_str(lang_str).is_ok_and(|lang_id| { | ||
| let lang = lang_id.language.as_str(); |
Contributor
There was a problem hiding this comment.
Better use the language!() macro instead of serializing and comparing as a string
Loirooriol
reviewed
Apr 2, 2026
Loirooriol
left a comment
Loirooriol
left a comment
Contributor
There was a problem hiding this comment.
You need to sign off your commits: https://github.com/servo/servo/pull/43744/checks?check_run_id=69730605068
| let lang = lang_id.language.as_str(); | ||
| lang == "ja" || lang == "zh" | ||
| }) | ||
| use icu_locid::subtags_language as language; |
Contributor
There was a problem hiding this comment.
Can you move the import to the start of the file? Also, I think this should work:
use icu_locid::subtags::language;
Comment on lines
+1910
to
+1912
| lang.0 | ||
| .as_ref() | ||
| .parse::<icu_locid::LanguageIdentifier>() |
Contributor
There was a problem hiding this comment.
Nit: this was a bit shorter as LanguageIdentifier::from_str(lang_str). str::parse just uses FromStr::from_str(self).
You can also import LanguageIdentifier at the start of the file.
SharanRP
force-pushed
the
fix-43677-text-wrap-overflow
branch
from
April 2, 2026 17:17
490e815 to
7596ee3
Compare
Signed-off-by: SharanRP <z8903830@gmail.com>
Signed-off-by: SharanRP <z8903830@gmail.com>
Signed-off-by: SharanRP <z8903830@gmail.com>
SharanRP
force-pushed
the
fix-43677-text-wrap-overflow
branch
from
April 4, 2026 18:10
7596ee3 to
95b394d
Compare
Signed-off-by: SharanRP <z8903830@gmail.com>
SharanRP
force-pushed
the
fix-43677-text-wrap-overflow
branch
from
April 4, 2026 19:38
95b394d to
f35ad25
Compare
Loirooriol
reviewed
Apr 5, 2026
| use icu_locid::LanguageIdentifier; | ||
| use icu_locid::subtags::language; | ||
|
|
||
| lang.0.as_ref().parse::<LanguageIdentifier>().is_ok_and(|lang_id| { |
Contributor
There was a problem hiding this comment.
./mach fmt doesn't like this.
Suggested change
| lang.0.as_ref().parse::<LanguageIdentifier>().is_ok_and(|lang_id| { | |
| lang.0.parse::<LanguageIdentifier>().is_ok_and(|lang_id| { |
Comment on lines
+1854
to
+1855
| use icu_locid::LanguageIdentifier; | ||
| use icu_locid::subtags::language; |
Contributor
There was a problem hiding this comment.
Move to the top of the file.
Loirooriol
reviewed
Apr 5, 2026
| use icu_locid::subtags::language; | ||
|
|
||
| lang.0.as_ref().parse::<LanguageIdentifier>().is_ok_and(|lang_id| { | ||
| lang_id.language == language!("ja") || lang_id.language == language!("zh") |
Contributor
There was a problem hiding this comment.
Can use matches!():
Suggested change
| lang_id.language == language!("ja") || lang_id.language == language!("zh") | |
| const JA: Language = language!("ja"); | |
| const ZH: Language = language!("zh"); | |
| matches!(lang_id.language, JA | ZH) |
Signed-off-by: SharanRP <z8903830@gmail.com>
SharanRP
force-pushed
the
fix-43677-text-wrap-overflow
branch
from
April 5, 2026 11:42
72e760b to
6a42521
Compare
Loirooriol
approved these changes
Apr 5, 2026
servo-highfive
removed
the
S-awaiting-review
Contributor
I don't see such thing, editing out |
Loirooriol
changed the title
servo-highfive
added
the
S-awaiting-merge
servo-highfive
removed
the
S-awaiting-merge
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
5 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.
Enable
CJK-awareline breaking in inline layout so Chinese/Japanese text gets proper wrap opportunities instead of overflowing containers.Testing: some WPT are now passing