diff options
| author | Michael Howell <michael@notriddle.com> | 2024-10-07 10:30:27 -0700 |
|---|---|---|
| committer | Michael Howell <michael@notriddle.com> | 2024-10-07 10:52:39 -0700 |
| commit | e23419fc97a8ca2fb3f6331115c13b2a5948d2c9 (patch) | |
| tree | 3c479ccd102b1a44ca59b0555b264f6776d8b10f | |
| parent | 7caad6925314911eefe54b040d4bc5be940e8f92 (diff) | |
| download | rust-e23419fc97a8ca2fb3f6331115c13b2a5948d2c9.tar.gz rust-e23419fc97a8ca2fb3f6331115c13b2a5948d2c9.zip | |
rustdoc: improve `<wbr>`-insertion for SCREAMING_CAMEL_CASE
| -rw-r--r-- | src/librustdoc/html/escape.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/html/escape/tests.rs | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/librustdoc/html/escape.rs b/src/librustdoc/html/escape.rs index 691f86847b5..72ad42c2bd0 100644 --- a/src/librustdoc/html/escape.rs +++ b/src/librustdoc/html/escape.rs @@ -108,7 +108,7 @@ impl<'a> fmt::Display for EscapeBodyTextWithWbr<'a> { || pk.map_or(true, |(_, t)| t.chars().any(|c| c.is_uppercase())); let next_is_underscore = || pk.map_or(true, |(_, t)| t.contains('_')); let next_is_colon = || pk.map_or(true, |(_, t)| t.contains(':')); - if i - last > 3 && is_uppercase() && !next_is_uppercase() { + if i - last > 3 && is_uppercase() && !next_is_uppercase() && !next_is_underscore() { EscapeBodyText(&text[last..i]).fmt(fmt)?; fmt.write_str("<wbr>")?; last = i; diff --git a/src/librustdoc/html/escape/tests.rs b/src/librustdoc/html/escape/tests.rs index a09649e9e18..de702e16063 100644 --- a/src/librustdoc/html/escape/tests.rs +++ b/src/librustdoc/html/escape/tests.rs @@ -24,6 +24,10 @@ fn escape_body_text_with_wbr() { assert_eq!(&E("first:second").to_string(), "first:<wbr>second"); assert_eq!(&E("first::second").to_string(), "first::<wbr>second"); assert_eq!(&E("MY_CONSTANT").to_string(), "MY_<wbr>CONSTANT"); + assert_eq!( + &E("_SIDD_MASKED_NEGATIVE_POLARITY").to_string(), + "_SIDD_<wbr>MASKED_<wbr>NEGATIVE_<wbr>POLARITY" + ); // a string won't get wrapped if it's less than 8 bytes assert_eq!(&E("HashSet").to_string(), "HashSet"); // an individual word won't get wrapped if it's less than 4 bytes |