Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2024-11-23 12:43:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore: update with master

Browse source
This commit is contained in:
Jonathan Kelley 2022-12-19 16:17:59 -08:00
parent 4313dea351
commit 182f11d0f3
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
packages/autofmt/src/element.rs
View file

@ -298,7 +298,7 @@ impl Buffer {
}
[BodyNode::RawExpr(ref expr)] => {
// TODO: let rawexprs to be inlined
get_expr_length(&expr.expr)
get_expr_length(expr)
}
[BodyNode::Element(ref el)] => {
let attr_len = self.is_short_attrs(&el.attributes);
@ -309,10 +309,10 @@ impl Buffer {
if el.children.len() == 1 {
if let BodyNode::Text(ref text) = el.children[0] {
if text.text.value().len() + el.name.to_string().len() + attr_len < 80 {
return Some(
text.text.value().len() + el.name.to_string().len() + attr_len,
);
let value = text.source.as_ref().unwrap().value();
if value.len() + el.name.to_string().len() + attr_len < 80 {
return Some(value.len() + el.name.to_string().len() + attr_len);
}
}
}
@ -326,11 +326,15 @@ impl Buffer {
for item in items {
match item {
BodyNode::Component(_) | BodyNode::Element(_) => return None,
BodyNode::Text(text) => total_count += text.text.value().len(),
BodyNode::RawExpr(expr) => match get_expr_length(&expr.expr) {
BodyNode::Text(text) => {
total_count += text.source.as_ref().unwrap().value().len()
}
BodyNode::RawExpr(expr) => match get_expr_length(expr) {
Some(len) => total_count += len,
None => return None,
},
BodyNode::ForLoop(_) => todo!(),
BodyNode::IfChain(_) => todo!(),
}
}