mirror of
https://github.com/servo/servo.git
synced 2025-07-22 06:43:40 +01:00
d490fdf83c
Bumps Stylo to servo/stylo#37 `white-space` is split into `white-space-collapse` and `text-wrap-mode`: | white-space | white-space-collapse | text-wrap-mode | | ----------- | -------------------- | -------------- | | normal | collapse | wrap | | nowrap | collapse | nowrap | | pre-wrap | preserve | wrap | | pre | preserve | nowrap | | pre-line | preserve-breaks | wrap | | - | preserve-breaks | nowrap | Note this introduces a combination that wasn't previously possible, but I think the existing logic can handle it well enough. The old `allow_wrap()` is replaced by checking whether `text-wrap-mode` is set to `wrap`. The old `preserve_newlines()` is replaced by checking whether `white-space-collapse` is *not* set to `collapse`. The old `preserve_spaces()` is replaced by checking whether `white-space-collapse` is set to `preserve`.
63 lines
2.3 KiB
Rust
63 lines
2.3 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
mod text {
|
|
use layout_2020::flow::text_run::WhitespaceCollapse;
|
|
use style::computed_values::white_space_collapse::T as WhiteSpaceCollapse;
|
|
|
|
#[test]
|
|
fn test_collapse_whitespace() {
|
|
let collapse = |input: &str, white_space_collapse, trim_beginning_white_space| {
|
|
WhitespaceCollapse::new(
|
|
input.chars(),
|
|
white_space_collapse,
|
|
trim_beginning_white_space,
|
|
)
|
|
.collect::<String>()
|
|
};
|
|
|
|
let output = collapse("H ", WhiteSpaceCollapse::Collapse, false);
|
|
assert_eq!(output, "H ");
|
|
|
|
let output = collapse(" W", WhiteSpaceCollapse::Collapse, true);
|
|
assert_eq!(output, "W");
|
|
|
|
let output = collapse(" W", WhiteSpaceCollapse::Collapse, false);
|
|
assert_eq!(output, " W");
|
|
|
|
let output = collapse(" H W", WhiteSpaceCollapse::Collapse, false);
|
|
assert_eq!(output, " H W");
|
|
|
|
let output = collapse("\n H \n \t W", WhiteSpaceCollapse::Collapse, false);
|
|
assert_eq!(output, " H W");
|
|
|
|
let output = collapse("\n H \n \t W \n", WhiteSpaceCollapse::Preserve, false);
|
|
assert_eq!(output, "\n H \n \t W \n");
|
|
|
|
let output = collapse(
|
|
"\n H \n \t W \n ",
|
|
WhiteSpaceCollapse::PreserveBreaks,
|
|
false,
|
|
);
|
|
assert_eq!(output, "\nH\nW\n");
|
|
|
|
let output = collapse("Hello \n World", WhiteSpaceCollapse::PreserveBreaks, true);
|
|
assert_eq!(output, "Hello\nWorld");
|
|
|
|
let output = collapse(" \n World", WhiteSpaceCollapse::PreserveBreaks, true);
|
|
assert_eq!(output, "\nWorld");
|
|
|
|
let output = collapse(" ", WhiteSpaceCollapse::Collapse, true);
|
|
assert_eq!(output, "");
|
|
|
|
let output = collapse(" ", WhiteSpaceCollapse::Collapse, false);
|
|
assert_eq!(output, " ");
|
|
|
|
let output = collapse("\n ", WhiteSpaceCollapse::Collapse, true);
|
|
assert_eq!(output, "");
|
|
|
|
let output = collapse("\n ", WhiteSpaceCollapse::Collapse, false);
|
|
assert_eq!(output, " ");
|
|
}
|
|
}
|