shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

str-len is a count of characters, not bytes

Browse Source
This commit is contained in:
ConnorSkees 2020-03-22 18:24:09 -04:00
parent c392c33ad8
commit d19c112765
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/builtin/string.rs
View File

@ -35,7 +35,7 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
Box::new(|args, _| { Box::new(|args, _| {
max_args!(args, 1); max_args!(args, 1);
match arg!(args, 0, "string") { match arg!(args, 0, "string") {
Value::Ident(i, _) => Ok(Value::Dimension(Number::from(i.len()), Unit::None)), Value::Ident(i, _) => Ok(Value::Dimension(Number::from(i.chars().count()), Unit::None)),
v => Err(format!("$string: {} is not a string.", v).into()), v => Err(format!("$string: {} is not a string.", v).into()),
} }
}), }),

10
tests/strings.rs
View File

@ -103,6 +103,16 @@ test!(
"a {\n color: str-length(\"foo bar\");\n}\n", "a {\n color: str-length(\"foo bar\");\n}\n",
"a {\n color: 7;\n}\n" "a {\n color: 7;\n}\n"
); );
test!(
str_len_double_wide,
"a {\n color: str-length(\"👭\");\n}\n",
"@charset \"UTF-8\";\na {\n color: 1;\n}\n"
);
test!(
str_len_combining,
"a {\n color: str-length(\"c\\0308\");\n}\n",
"a {\n color: 2;\n}\n"
);
test!( test!(
str_index_char, str_index_char,
"a {\n color: str-index(abcd, a);\n}\n", "a {\n color: str-index(abcd, a);\n}\n",