Skip to content

🧹 refactor: update skeleton items for formatting digits #360

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.

Sign up for GitHub

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

Open
filmil wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🧹 refactor: update skeleton items for formatting digits #360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 52 additions & 45 deletions rust_icu_ecma402/src/numberformat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ pub(crate) mod internal {
skel.push(format!("scientific/*ee/sign-never"));
}
options::SignDisplay::ExceptZero => {
skel.push(format!("scientific/*ee/sign-expect-zero"));
skel.push(format!("scientific/*ee/sign-except-zero"));
}
},
options::Notation::Scientific => {
Expand All @@ -139,33 +139,35 @@ pub(crate) mod internal {
skel.push("sign-always".into());
}
options::SignDisplay::ExceptZero => {
skel.push("sign-always".into());
skel.push("sign-except-zero".into());
}
}
}

let minimum_integer_digits = opts.minimum_integer_digits.unwrap_or(1);
// TODO: this should match the list at:
// https://www.currency-iso.org/en/home/tables/table-a1.html
let minimum_fraction_digits = opts.minimum_fraction_digits.unwrap_or(match opts.style {
options::Style::Currency => 2,
_ => 0,
});
let maximum_fraction_digits = opts.maximum_fraction_digits.unwrap_or(match opts.style {
options::Style::Currency => std::cmp::max(2, minimum_fraction_digits),
_ => 3,
});
let minimum_significant_digits = opts.minimum_significant_digits.unwrap_or(1);
let maximum_significant_digits = opts.maximum_significant_digits.unwrap_or(21);

// TODO: add skeleton items for min and max integer, fraction and significant digits.
skel.push(integer_digits(minimum_integer_digits as usize));
skel.push(fraction_digits(
minimum_fraction_digits as usize,
maximum_fraction_digits as usize,
minimum_significant_digits as usize,
maximum_significant_digits as usize,
));

if opts.minimum_significant_digits.is_some() || opts.maximum_significant_digits.is_some() {
let minimum_significant_digits = opts.minimum_significant_digits.unwrap_or(1);
let maximum_significant_digits = opts.maximum_significant_digits.unwrap_or(21);
skel.push(significant_digits(
minimum_significant_digits as usize,
maximum_significant_digits as usize,
));
} else {
let minimum_fraction_digits = opts.minimum_fraction_digits.unwrap_or(match opts.style {
options::Style::Currency => 2,
_ => 0,
});
let maximum_fraction_digits = opts.maximum_fraction_digits.unwrap_or(match opts.style {
options::Style::Currency => std::cmp::max(2, minimum_fraction_digits),
_ => std::cmp::max(3, minimum_fraction_digits),
});
skel.push(fraction_precision(
minimum_fraction_digits as usize,
maximum_fraction_digits as usize,
));
}

Ok(skel.iter().map(|s| format!("{} ", s)).collect())
}
Expand All @@ -181,37 +183,33 @@ pub(crate) mod internal {
return format!("integer-width/+{}", zeroes);
}

fn fraction_digits(min: usize, max: usize, min_sig: usize, max_sig: usize) -> String {
eprintln!(
"fraction_digits: min: {}, max: {} min_sig: {}, max_sig: {}",
min, max, min_sig, max_sig
);
assert!(min <= max, "fraction_digits: min: {}, max: {}", min, max);
Copy link
Copy Markdown
Contributor

@clydegerber clydegerber May 14, 2026

Choose a reason for hiding this comment

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

Might want to retain the min <= max assertion in significant_digits() and fraction_precision() - it will give a clearer error message than the current failure does.

let zeroes: String = std::iter::repeat("0").take(min).collect();
let hashes: String = std::iter::repeat("#").take(max - min).collect();

assert!(
min_sig <= max_sig,
"significant_digits: min: {}, max: {}",
min_sig,
max_sig
);
let ats: String = std::iter::repeat("@").take(min_sig).collect();
let hashes_sig: String = std::iter::repeat("#").take(max_sig - min_sig).collect();
fn significant_digits(min: usize, max: usize) -> String {
let ats = std::iter::repeat("@").take(min).collect::<String>();
let hashes = std::iter::repeat("#").take(max - min).collect::<String>();
format!("{}{}", ats, hashes)
}

return format!(".{}{}/{}{}", zeroes, hashes, ats, hashes_sig,);
fn fraction_precision(min: usize, max: usize) -> String {
let zeroes = std::iter::repeat("0").take(min).collect::<String>();
let hashes = std::iter::repeat("#").take(max - min).collect::<String>();
format!(".{}{}", zeroes, hashes)
}

#[cfg(test)]
mod testing {
use super::*;

#[test]
fn fraction_digits_skeleton_fragment() {
assert_eq!(fraction_digits(0, 3, 1, 21), ".###/@####################");
assert_eq!(fraction_digits(2, 2, 1, 21), ".00/@####################");
assert_eq!(fraction_digits(0, 0, 0, 0), "./");
assert_eq!(fraction_digits(0, 3, 3, 3), ".###/@@@");
fn fraction_precision_skeleton_fragment() {
assert_eq!(fraction_precision(0, 3), ".###");
assert_eq!(fraction_precision(2, 2), ".00");
assert_eq!(fraction_precision(0, 0), ".");
}

#[test]
fn significant_digits_skeleton_fragment() {
assert_eq!(significant_digits(1, 21), "@####################");
assert_eq!(significant_digits(3, 3), "@@@");
}
}
}
Expand Down Expand Up @@ -320,6 +318,15 @@ mod testing {
numbers: vec![123456.789],
expected: vec!["1,23,000"],
},
TestCase {
locale: "sr-RS",
opts: ecma402_traits::numberformat::Options {
minimum_fraction_digits: Some(5),
..Default::default()
},
numbers: vec![1.2],
expected: vec!["1,20000"],
},
];
for test in tests {
let locale = crate::Locale::FromULoc(
Expand Down
Loading