From f4b0a35c7f2add140825cd3a3cf2eec527a691ab Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Tue, 2 Apr 2024 16:37:04 -0700 Subject: [PATCH 1/4] fix: fmt unterminated if, be more aggressive with line splits --- packages/autofmt/.vscode/settings.json | 7 ++ packages/autofmt/src/component.rs | 9 +- packages/autofmt/src/element.rs | 94 ++++++---------- packages/autofmt/src/lib.rs | 21 ++-- packages/autofmt/src/prettier_please.rs | 21 +++- packages/autofmt/src/writer.rs | 13 ++- packages/autofmt/tests/samples.rs | 3 + .../autofmt/tests/samples/collapse_expr.rsx | 7 +- packages/autofmt/tests/samples/complex.rsx | 6 +- packages/autofmt/tests/samples/docsite.rsx | 106 ++++++++++++++++++ .../autofmt/tests/samples/immediate_expr.rsx | 5 +- packages/autofmt/tests/samples/letsome.rsx | 12 ++ .../autofmt/tests/samples/messy_indent.rsx | 6 +- packages/autofmt/tests/samples/multirsx.rsx | 12 +- .../autofmt/tests/samples/raw_strings.rsx | 7 +- packages/autofmt/tests/samples/shorthand.rsx | 62 ++++++++++ packages/autofmt/tests/samples/simple.rsx | 25 ++++- .../autofmt/tests/samples/trailing_expr.rsx | 5 +- packages/autofmt/tests/wrong.rs | 1 + packages/autofmt/tests/wrong/multi-4sp.rsx | 4 +- .../autofmt/tests/wrong/multi-4sp.wrong.rsx | 4 +- packages/autofmt/tests/wrong/multi-tab.rsx | 4 +- .../autofmt/tests/wrong/multi-tab.wrong.rsx | 4 +- packages/autofmt/tests/wrong/shortened.rsx | 5 + .../autofmt/tests/wrong/shortened.wrong.rsx | 5 + packages/rsx/src/attribute.rs | 26 +++++ packages/rsx/src/component.rs | 20 ++++ 27 files changed, 394 insertions(+), 100 deletions(-) create mode 100644 packages/autofmt/.vscode/settings.json create mode 100644 packages/autofmt/tests/samples/docsite.rsx create mode 100644 packages/autofmt/tests/samples/letsome.rsx create mode 100644 packages/autofmt/tests/samples/shorthand.rsx create mode 100644 packages/autofmt/tests/wrong/shortened.rsx create mode 100644 packages/autofmt/tests/wrong/shortened.wrong.rsx diff --git a/packages/autofmt/.vscode/settings.json b/packages/autofmt/.vscode/settings.json new file mode 100644 index 0000000000..c630528d69 --- /dev/null +++ b/packages/autofmt/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + // dont let our extension kick on the rsx files - we're fixing it! + "dioxus.formatOnSave": "disabled", + // enable this when modifying tab-based indentation + // When inside .rsx files, dont automatically use spaces + // "files.autoSave": "off" +} diff --git a/packages/autofmt/src/component.rs b/packages/autofmt/src/component.rs index 7115a078ac..ad92ba3451 100644 --- a/packages/autofmt/src/component.rs +++ b/packages/autofmt/src/component.rs @@ -91,8 +91,11 @@ impl Writer<'_> { write!(self.out, ", ")?; } - for child in children { + for (id, child) in children.iter().enumerate() { self.write_ident(child)?; + if id != children.len() - 1 && children.len() > 1 { + write!(self.out, ", ")?; + } } write!(self.out, " ")?; @@ -163,6 +166,10 @@ impl Writer<'_> { let name = &field.name; match &field.content { + ContentField::ManExpr(_exp) if field.can_be_shorthand() => { + write!(self.out, "{name}")?; + } + ContentField::ManExpr(exp) => { let out = unparse_expr(exp); let mut lines = out.split('\n').peekable(); diff --git a/packages/autofmt/src/element.rs b/packages/autofmt/src/element.rs index 12f75dcb23..39020bf130 100644 --- a/packages/autofmt/src/element.rs +++ b/packages/autofmt/src/element.rs @@ -71,12 +71,13 @@ impl Writer<'_> { let children_len = self.is_short_children(children); let is_small_children = children_len.is_some(); - // if we have few attributes and a lot of children, place the attrs on top + // if we have one long attribute and a lot of children, place the attrs on top if is_short_attr_list && !is_small_children { opt_level = ShortOptimization::PropsOnTop; } // even if the attr is long, it should be put on one line + // However if we have childrne we need to just spread them out for readability if !is_short_attr_list && attributes.len() <= 1 { if children.is_empty() { opt_level = ShortOptimization::Oneliner; @@ -303,8 +304,12 @@ impl Writer<'_> { fn write_named_attribute(&mut self, attr: &ElementAttrNamed) -> Result { self.write_attribute_name(&attr.attr.name)?; - write!(self.out, ": ")?; - self.write_attribute_value(&attr.attr.value)?; + + // if the attribute is a shorthand, we don't need to write the colon, just the name + if !attr.attr.can_be_shorthand() { + write!(self.out, ": ")?; + self.write_attribute_value(&attr.attr.value)?; + } Ok(()) } @@ -352,74 +357,47 @@ impl Writer<'_> { return Some(0); } - for child in children { - if self.current_span_is_primary(child.span()) { - 'line: for line in self.src[..child.span().start().line - 1].iter().rev() { - match (line.trim().starts_with("//"), line.is_empty()) { - (true, _) => return None, - (_, true) => continue 'line, - _ => break 'line, - } - } - } + // Any comments push us over the limit automatically + if self.children_have_comments(children) { + return None; } match children { [BodyNode::Text(ref text)] => Some(ifmt_to_string(text).len()), - [BodyNode::Component(ref comp)] => { - let attr_len = self.field_len(&comp.fields, &comp.manual_props); - if attr_len > 80 { - None - } else if comp.children.is_empty() { - Some(attr_len) - } else { - None - } - } // TODO: let rawexprs to be inlined [BodyNode::RawExpr(ref expr)] => get_expr_length(expr), - [BodyNode::Element(ref el)] => { - let attr_len = self.is_short_attrs(&el.attributes); - - if el.children.is_empty() && attr_len < 80 { - return Some(el.name.to_string().len()); - } - - if el.children.len() == 1 { - if let BodyNode::Text(ref text) = el.children[0] { - let value = ifmt_to_string(text); - if value.len() + el.name.to_string().len() + attr_len < 80 { - return Some(value.len() + el.name.to_string().len() + attr_len); - } - } - } + // TODO: let rawexprs to be inlined + [BodyNode::Component(ref comp)] if comp.fields.is_empty() => Some( + comp.name + .segments + .iter() + .map(|s| s.ident.to_string().len() + 2) + .sum::(), + ), + + // Feedback on discord indicates folks don't like combining multiple children on the same line + // We used to do a lot of math to figure out if we should expand out the line, but folks just + // don't like it. + _ => None, + } + } - None - } - // todo, allow non-elements to be on the same line - items => { - let mut total_count = 0; - - for item in items { - match item { - BodyNode::Component(_) | BodyNode::Element(_) => return None, - BodyNode::Text(text) => { - total_count += ifmt_to_string(text).len(); - } - BodyNode::RawExpr(expr) => match get_expr_length(expr) { - Some(len) => total_count += len, - None => return None, - }, - BodyNode::ForLoop(_forloop) => return None, - BodyNode::IfChain(_chain) => return None, + fn children_have_comments(&self, children: &[BodyNode]) -> bool { + for child in children { + if self.current_span_is_primary(child.span()) { + 'line: for line in self.src[..child.span().start().line - 1].iter().rev() { + match (line.trim().starts_with("//"), line.is_empty()) { + (true, _) => return true, + (_, true) => continue 'line, + _ => break 'line, } } - - Some(total_count) } } + + false } /// empty everything except for some comments diff --git a/packages/autofmt/src/lib.rs b/packages/autofmt/src/lib.rs index f17a72d18f..9cfb26c078 100644 --- a/packages/autofmt/src/lib.rs +++ b/packages/autofmt/src/lib.rs @@ -141,21 +141,14 @@ pub fn write_block_out(body: CallBody) -> Option { } fn write_body(buf: &mut Writer, body: &CallBody) { - let is_short = buf.is_short_children(&body.roots).is_some(); - let is_empty = buf.is_empty_children(&body.roots); - if (is_short && !buf.out.indent.split_line_attributes()) || is_empty { - // write all the indents with spaces and commas between - for idx in 0..body.roots.len() - 1 { - let ident = &body.roots[idx]; - buf.write_ident(ident).unwrap(); - write!(&mut buf.out.buf, ", ").unwrap(); + match body.roots.len() { + 0 => {} + 1 if matches!(body.roots[0], BodyNode::Text(_)) => { + write!(buf.out, " ").unwrap(); + buf.write_ident(&body.roots[0]).unwrap(); + write!(buf.out, " ").unwrap(); } - - // write the last ident without a comma - let ident = &body.roots[body.roots.len() - 1]; - buf.write_ident(ident).unwrap(); - } else { - buf.write_body_indented(&body.roots).unwrap(); + _ => buf.write_body_indented(&body.roots).unwrap(), } } diff --git a/packages/autofmt/src/prettier_please.rs b/packages/autofmt/src/prettier_please.rs index c6b21edc25..6b6a726e24 100644 --- a/packages/autofmt/src/prettier_please.rs +++ b/packages/autofmt/src/prettier_please.rs @@ -13,14 +13,20 @@ pub fn unparse_expr(expr: &Expr) -> String { // Split off the fn main and then cut the tabs off the front fn unwrapped(raw: String) -> String { - raw.strip_prefix("fn main() {\n") + let mut o = raw + .strip_prefix("fn main() {\n") .unwrap() .strip_suffix("}\n") .unwrap() .lines() .map(|line| line.strip_prefix(" ").unwrap()) // todo: set this to tab level .collect::>() - .join("\n") + .join("\n"); + + // remove the semicolon + o.pop(); + + o } fn wrapped(expr: &Expr) -> File { @@ -31,7 +37,7 @@ fn wrapped(expr: &Expr) -> File { // Item::Verbatim(quote::quote! { fn main() { - #expr + #expr; } }), ], @@ -42,7 +48,7 @@ fn wrapped(expr: &Expr) -> File { fn unparses_raw() { let expr = syn::parse_str("1 + 1").unwrap(); let unparsed = unparse(&wrapped(&expr)); - assert_eq!(unparsed, "fn main() {\n 1 + 1\n}\n"); + assert_eq!(unparsed, "fn main() {\n 1 + 1;\n}\n"); } #[test] @@ -52,6 +58,13 @@ fn unparses_completely() { assert_eq!(unparsed, "1 + 1"); } +#[test] +fn unparses_let_guard() { + let expr = syn::parse_str("let Some(url) = &link.location").unwrap(); + let unparsed = unparse_expr(&expr); + assert_eq!(unparsed, "let Some(url) = &link.location"); +} + #[test] fn weird_ifcase() { let contents = r##" diff --git a/packages/autofmt/src/writer.rs b/packages/autofmt/src/writer.rs index d6466a122a..553c26d73c 100644 --- a/packages/autofmt/src/writer.rs +++ b/packages/autofmt/src/writer.rs @@ -188,6 +188,11 @@ impl<'a> Writer<'a> { pub(crate) fn is_short_attrs(&mut self, attributes: &[AttributeType]) -> usize { let mut total = 0; + // No more than 3 attributes before breaking the line + if attributes.len() > 3 { + return 100000; + } + for attr in attributes { if self.current_span_is_primary(attr.start()) { 'line: for line in self.src[..attr.start().start().line - 1].iter().rev() { @@ -209,7 +214,13 @@ impl<'a> Writer<'a> { dioxus_rsx::ElementAttrName::Custom(name) => name.value().len() + 2, }; total += name_len; - total += self.attr_value_len(&attr.attr.value); + + // + if attr.attr.value.is_shorthand() { + total += 2; + } else { + total += self.attr_value_len(&attr.attr.value); + } } AttributeType::Spread(expr) => { let expr_len = self.retrieve_formatted_expr(expr).len(); diff --git a/packages/autofmt/tests/samples.rs b/packages/autofmt/tests/samples.rs index fda3531aa9..a9dcc066af 100644 --- a/packages/autofmt/tests/samples.rs +++ b/packages/autofmt/tests/samples.rs @@ -46,4 +46,7 @@ twoway![ tinynoopt, trailing_expr, many_exprs, + shorthand, + docsite, + letsome, ]; diff --git a/packages/autofmt/tests/samples/collapse_expr.rsx b/packages/autofmt/tests/samples/collapse_expr.rsx index 189717a0ae..cab114cf47 100644 --- a/packages/autofmt/tests/samples/collapse_expr.rsx +++ b/packages/autofmt/tests/samples/collapse_expr.rsx @@ -1,4 +1,7 @@ fn itworks() { - rsx!( "{name}", "{name}", "{name}" ) + rsx! { + "{name}" + "{name}" + "{name}" + } } - diff --git a/packages/autofmt/tests/samples/complex.rsx b/packages/autofmt/tests/samples/complex.rsx index 6ee62cfa55..9031deea1f 100644 --- a/packages/autofmt/tests/samples/complex.rsx +++ b/packages/autofmt/tests/samples/complex.rsx @@ -48,5 +48,9 @@ rsx! { } } - div { "asdbascasdbasd", "asbdasbdabsd", {asbdabsdbasdbas} } + div { + "asdbascasdbasd" + "asbdasbdabsd" + {asbdabsdbasdbas} + } } diff --git a/packages/autofmt/tests/samples/docsite.rsx b/packages/autofmt/tests/samples/docsite.rsx new file mode 100644 index 0000000000..e6943c9b98 --- /dev/null +++ b/packages/autofmt/tests/samples/docsite.rsx @@ -0,0 +1,106 @@ +pub(crate) fn Nav() -> Element { + rsx! { + SearchModal {} + header { + class: "sticky top-0 z-30 bg-white dark:text-gray-200 dark:bg-ideblack border-b dark:border-stone-700 h-16 bg-opacity-80 backdrop-blur-sm", + class: if HIGHLIGHT_NAV_LAYOUT() { "border border-orange-600 rounded-md" }, + div { class: "lg:py-2 px-2 max-w-screen-2xl mx-auto flex items-center justify-between text-sm leading-6 h-16", + button { + class: "bg-gray-100 rounded-lg p-2 mr-4 lg:hidden my-3 h-10 flex items-center text-lg z-[100]", + class: if !SHOW_DOCS_NAV() { "hidden" }, + onclick: move |_| { + let mut sidebar = SHOW_SIDEBAR.write(); + *sidebar = !*sidebar; + }, + MaterialIcon { name: "menu", size: 24, color: MaterialIconColor::Dark } + } + div { class: "flex z-50 md:flex-1 px-2", LinkList {} } + + div { class: "hidden md:flex h-full justify-end ml-2 flex-1", + div { class: "hidden md:flex items-center", + Search {} + div { class: "hidden lg:flex items-center border-l border-gray-200 ml-4 pl-4 dark:border-gray-800", + label { + class: "sr-only", + id: "headlessui-listbox-label-2", + "Theme" + } + Link { + to: "https://discord.gg/XgGxMSkvUM", + class: "block text-gray-400 hover:text-gray-500 dark:hover:text-gray-300", + new_tab: true, + span { class: "sr-only", "Dioxus on Discord" } + crate::icons::DiscordLogo {} + } + Link { + to: "https://github.com/dioxuslabs/dioxus", + class: "ml-4 block text-gray-400 hover:text-gray-500 dark:hover:text-gray-300", + new_tab: true, + span { class: "sr-only", "Dioxus on GitHub" } + crate::icons::Github2 {} + } + } + div { class: "hidden lg:flex items-center border-l border-gray-200 ml-4 pl-6 dark:border-gray-800", + label { + class: "sr-only", + id: "headlessui-listbox-label-2", + "Theme" + } + Link { + to: Route::Deploy {}, + class: "md:ml-0 md:py-2 md:px-3 bg-blue-500 ml-4 text-lg md:text-sm text-white rounded font-semibold", + "DEPLOY" + } + if LOGGED_IN() { + Link { to: Route::Homepage {}, + img { + src: "https://avatars.githubusercontent.com/u/10237910?s=40&v=4", + class: "ml-4 h-10 rounded-full w-auto" + } + } + } + } + } + } + } + } + } +} + +#[component] +fn SidebarSection(chapter: &'static SummaryItem) -> Element { + let link = chapter.maybe_link()?; + + let sections = link.nested_items.iter().map(|chapter| { + rsx! { + SidebarChapter { chapter } + } + }); + + let _ = rsx! { + SidebarChapter { chapter } + }; + + rsx! { + SidebarChapter { chapter } + }; + + rsx! { + div {} + }; + + rsx! { "hi" } + + rsx! { + div { class: "full-chapter pb-4 mb-6", + if let Some(url) = &link.location { + Link { + onclick: move |_| *SHOW_SIDEBAR.write() = false, + to: Route::Docs { child: *url }, + h3 { class: "font-semibold mb-4", "{link.name}" } + } + } + ul { class: "ml-1", {sections} } + } + } +} diff --git a/packages/autofmt/tests/samples/immediate_expr.rsx b/packages/autofmt/tests/samples/immediate_expr.rsx index a88522cb09..66a964a7f2 100644 --- a/packages/autofmt/tests/samples/immediate_expr.rsx +++ b/packages/autofmt/tests/samples/immediate_expr.rsx @@ -1,4 +1,5 @@ fn it_works() { - rsx!({()}) + rsx! { + {()} + } } - diff --git a/packages/autofmt/tests/samples/letsome.rsx b/packages/autofmt/tests/samples/letsome.rsx new file mode 100644 index 0000000000..d1524a5ca2 --- /dev/null +++ b/packages/autofmt/tests/samples/letsome.rsx @@ -0,0 +1,12 @@ +#[component] +fn SidebarSection() -> Element { + rsx! { + if let Some(url) = &link.location { + "hi {url}" + } + + if val.is_empty() { + "No content" + } + } +} diff --git a/packages/autofmt/tests/samples/messy_indent.rsx b/packages/autofmt/tests/samples/messy_indent.rsx index 9cb04001d7..9454ea9131 100644 --- a/packages/autofmt/tests/samples/messy_indent.rsx +++ b/packages/autofmt/tests/samples/messy_indent.rsx @@ -8,6 +8,10 @@ fn SaveClipboard() -> Element { }; rsx! { - div { "hello world", "hello world", "hello world" } + div { + "hello world" + "hello world" + "hello world" + } } } diff --git a/packages/autofmt/tests/samples/multirsx.rsx b/packages/autofmt/tests/samples/multirsx.rsx index 84340f5baa..6001332c04 100644 --- a/packages/autofmt/tests/samples/multirsx.rsx +++ b/packages/autofmt/tests/samples/multirsx.rsx @@ -4,12 +4,20 @@ rsx! { div {} // hi - div { "abcd", "ball", "s" } + div { + "abcd" + "ball" + "s" + } // // // - div { "abcd", "ball", "s" } + div { + "abcd" + "ball" + "s" + } // // diff --git a/packages/autofmt/tests/samples/raw_strings.rsx b/packages/autofmt/tests/samples/raw_strings.rsx index 8a4d0c38f7..ebbec57bfb 100644 --- a/packages/autofmt/tests/samples/raw_strings.rsx +++ b/packages/autofmt/tests/samples/raw_strings.rsx @@ -1,6 +1,11 @@ rsx! { // Raw text strings - button { r#"Click me"#, r##"Click me"##, r######"Click me"######, r#"dynamic {1}"# } + button { + r#"Click me"# + r##"Click me"## + r######"Click me"###### + r#"dynamic {1}"# + } // Raw attribute strings div { diff --git a/packages/autofmt/tests/samples/shorthand.rsx b/packages/autofmt/tests/samples/shorthand.rsx new file mode 100644 index 0000000000..b01113b400 --- /dev/null +++ b/packages/autofmt/tests/samples/shorthand.rsx @@ -0,0 +1,62 @@ +#[component] +fn SomePassthru(class: String, id: String, children: Element) -> Element { + rsx! { + div { + // Comments + class, + "hello world" + } + h1 { class, "hello world" } + + h1 { class, {children} } + + h1 { class, id, {children} } + + h1 { class, + "hello world" + {children} + } + + h1 { id, + "hello world" + {children} + } + + Other { class, children } + + Other { class, + "hello world" + {children} + } + + div { + // My comment here 1 + // My comment here 2 + // My comment here 3 + // My comment here 4 + class: "asdasd", + + // Comment here + onclick: move |_| { + let a = 10; + let b = 40; + let c = 50; + }, + + // my comment + + // This here + "hi" + } + + // Comment head + div { class: "asd", "Jon" } + + // Comment head + div { + // Collapse + class: "asd", + "Jon" + } + } +} diff --git a/packages/autofmt/tests/samples/simple.rsx b/packages/autofmt/tests/samples/simple.rsx index 621309de36..f1980f2257 100644 --- a/packages/autofmt/tests/samples/simple.rsx +++ b/packages/autofmt/tests/samples/simple.rsx @@ -1,6 +1,9 @@ rsx! { div { "hello world!" } - div { "hello world!", "goodbye world!" } + div { + "hello world!" + "goodbye world!" + } // Simple div div { "hello world!" } @@ -8,18 +11,32 @@ rsx! { // Compression with attributes div { key: "{a}", class: "ban", style: "color: red" } + // But not too many attributes (3 max) + div { + id: "{a}", + class: "ban", + style: "color: red", + value: "{b}" + } + // Nested one level - div { div { "nested" } } + div { + div { "nested" } + } // Nested two level div { - div { h1 { "highly nested" } } + div { + h1 { "highly nested" } + } } // Anti-Nested two level div { div { - div { h1 { "highly nested" } } + div { + h1 { "highly nested" } + } } } diff --git a/packages/autofmt/tests/samples/trailing_expr.rsx b/packages/autofmt/tests/samples/trailing_expr.rsx index 8f5054351b..57f0139f96 100644 --- a/packages/autofmt/tests/samples/trailing_expr.rsx +++ b/packages/autofmt/tests/samples/trailing_expr.rsx @@ -1,7 +1,10 @@ fn it_works() { rsx! { div { - span { "Description: ", {package.description.as_deref().unwrap_or("❌❌❌❌ missing")} } + span { + "Description: " + {package.description.as_deref().unwrap_or("❌❌❌❌ missing")} + } } } } diff --git a/packages/autofmt/tests/wrong.rs b/packages/autofmt/tests/wrong.rs index abecc2228d..e2a99bbdb3 100644 --- a/packages/autofmt/tests/wrong.rs +++ b/packages/autofmt/tests/wrong.rs @@ -29,3 +29,4 @@ twoway!("multiexpr-tab" => multiexpr_tab (IndentOptions::new(IndentType::Tabs, 4 twoway!("multiexpr-many" => multiexpr_many (IndentOptions::new(IndentType::Spaces, 4, false))); twoway!("simple-combo-expr" => simple_combo_expr (IndentOptions::new(IndentType::Spaces, 4, false))); twoway!("oneline-expand" => online_expand (IndentOptions::new(IndentType::Spaces, 4, false))); +twoway!("shortened" => shortened (IndentOptions::new(IndentType::Spaces, 4, false))); diff --git a/packages/autofmt/tests/wrong/multi-4sp.rsx b/packages/autofmt/tests/wrong/multi-4sp.rsx index 0f4a1a473c..cf19ed90e9 100644 --- a/packages/autofmt/tests/wrong/multi-4sp.rsx +++ b/packages/autofmt/tests/wrong/multi-4sp.rsx @@ -1,3 +1,5 @@ fn app() -> Element { - rsx! { div { "hello world" } } + rsx! { + div { "hello world" } + } } diff --git a/packages/autofmt/tests/wrong/multi-4sp.wrong.rsx b/packages/autofmt/tests/wrong/multi-4sp.wrong.rsx index 2c72031226..ca8800bb9d 100644 --- a/packages/autofmt/tests/wrong/multi-4sp.wrong.rsx +++ b/packages/autofmt/tests/wrong/multi-4sp.wrong.rsx @@ -1,5 +1,3 @@ fn app() -> Element { - rsx! { - div {"hello world" } - } + rsx! { div {"hello world" } } } diff --git a/packages/autofmt/tests/wrong/multi-tab.rsx b/packages/autofmt/tests/wrong/multi-tab.rsx index 86058a8b8b..e44d832e4c 100644 --- a/packages/autofmt/tests/wrong/multi-tab.rsx +++ b/packages/autofmt/tests/wrong/multi-tab.rsx @@ -1,3 +1,5 @@ fn app() -> Element { - rsx! { div { "hello world" } } + rsx! { + div { "hello world" } + } } diff --git a/packages/autofmt/tests/wrong/multi-tab.wrong.rsx b/packages/autofmt/tests/wrong/multi-tab.wrong.rsx index a5c6f5d68f..ca8800bb9d 100644 --- a/packages/autofmt/tests/wrong/multi-tab.wrong.rsx +++ b/packages/autofmt/tests/wrong/multi-tab.wrong.rsx @@ -1,5 +1,3 @@ fn app() -> Element { - rsx! { - div {"hello world" } - } + rsx! { div {"hello world" } } } diff --git a/packages/autofmt/tests/wrong/shortened.rsx b/packages/autofmt/tests/wrong/shortened.rsx new file mode 100644 index 0000000000..d0f1f8c4bd --- /dev/null +++ b/packages/autofmt/tests/wrong/shortened.rsx @@ -0,0 +1,5 @@ +rsx! { + Chapter { chapter } + + div { class } +} diff --git a/packages/autofmt/tests/wrong/shortened.wrong.rsx b/packages/autofmt/tests/wrong/shortened.wrong.rsx new file mode 100644 index 0000000000..f3ae4d4f23 --- /dev/null +++ b/packages/autofmt/tests/wrong/shortened.wrong.rsx @@ -0,0 +1,5 @@ +rsx! { + Chapter { chapter: chapter } + + div { class: class } +} diff --git a/packages/rsx/src/attribute.rs b/packages/rsx/src/attribute.rs index 4f558feac0..579207d103 100644 --- a/packages/rsx/src/attribute.rs +++ b/packages/rsx/src/attribute.rs @@ -208,6 +208,28 @@ pub struct ElementAttr { pub value: ElementAttrValue, } +impl ElementAttr { + pub fn can_be_shorthand(&self) -> bool { + // If it's a shorthand... + if matches!(self.value, ElementAttrValue::Shorthand(_)) { + return true; + } + + // If it's in the form of attr: attr, return true + if let ElementAttrValue::AttrExpr(expr) = &self.value { + if let Expr::Path(path) = expr { + if let ElementAttrName::BuiltIn(name) = &self.name { + if path.path.segments.len() == 1 && &path.path.segments[0].ident == name { + return true; + } + } + } + } + + false + } +} + #[derive(PartialEq, Eq, Clone, Debug, Hash)] pub enum ElementAttrValue { /// attribute, @@ -269,6 +291,10 @@ impl ToTokens for ElementAttrValue { } impl ElementAttrValue { + pub fn is_shorthand(&self) -> bool { + matches!(self, ElementAttrValue::Shorthand(_)) + } + fn to_str_expr(&self) -> Option { match self { ElementAttrValue::AttrLiteral(lit) => Some(quote!(#lit.to_string())), diff --git a/packages/rsx/src/component.rs b/packages/rsx/src/component.rs index 63fb13fc09..dd943729e3 100644 --- a/packages/rsx/src/component.rs +++ b/packages/rsx/src/component.rs @@ -296,3 +296,23 @@ fn normalize_path(name: &mut syn::Path) -> Option None, } } + +impl ComponentField { + pub fn can_be_shorthand(&self) -> bool { + // If it's a shorthand... + if matches!(self.content, ContentField::Shorthand(_)) { + return true; + } + + // If it's in the form of attr: attr, return true + if let ContentField::ManExpr(expr) = &self.content { + if let Expr::Path(path) = expr { + if path.path.segments.len() == 1 && &path.path.segments[0].ident == &self.name { + return true; + } + } + } + + false + } +} From 2c6f1e42677231030544f59d34976cfab5b8d09d Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Tue, 2 Apr 2024 16:40:40 -0700 Subject: [PATCH 2/4] Clippy --- packages/autofmt/src/element.rs | 4 ---- packages/rsx/src/attribute.rs | 10 ++++------ packages/rsx/src/component.rs | 8 +++----- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/packages/autofmt/src/element.rs b/packages/autofmt/src/element.rs index 39020bf130..ca007301c4 100644 --- a/packages/autofmt/src/element.rs +++ b/packages/autofmt/src/element.rs @@ -337,10 +337,6 @@ impl Writer<'_> { beginning.is_empty() } - pub fn is_empty_children(&self, children: &[BodyNode]) -> bool { - children.is_empty() - } - // check if the children are short enough to be on the same line // We don't have the notion of current line depth - each line tries to be < 80 total // returns the total line length if it's short diff --git a/packages/rsx/src/attribute.rs b/packages/rsx/src/attribute.rs index 579207d103..d8c4459b9a 100644 --- a/packages/rsx/src/attribute.rs +++ b/packages/rsx/src/attribute.rs @@ -216,12 +216,10 @@ impl ElementAttr { } // If it's in the form of attr: attr, return true - if let ElementAttrValue::AttrExpr(expr) = &self.value { - if let Expr::Path(path) = expr { - if let ElementAttrName::BuiltIn(name) = &self.name { - if path.path.segments.len() == 1 && &path.path.segments[0].ident == name { - return true; - } + if let ElementAttrValue::AttrExpr(Expr::Path(path)) = &self.value { + if let ElementAttrName::BuiltIn(name) = &self.name { + if path.path.segments.len() == 1 && &path.path.segments[0].ident == name { + return true; } } } diff --git a/packages/rsx/src/component.rs b/packages/rsx/src/component.rs index dd943729e3..130daf24d5 100644 --- a/packages/rsx/src/component.rs +++ b/packages/rsx/src/component.rs @@ -305,11 +305,9 @@ impl ComponentField { } // If it's in the form of attr: attr, return true - if let ContentField::ManExpr(expr) = &self.content { - if let Expr::Path(path) = expr { - if path.path.segments.len() == 1 && &path.path.segments[0].ident == &self.name { - return true; - } + if let ContentField::ManExpr(Expr::Path(path)) = &self.content { + if path.path.segments.len() == 1 && path.path.segments[0].ident == self.name { + return true; } } From 5de03ca6a5a93362202b5ef48ed6e01862c2a5a4 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Tue, 2 Apr 2024 16:48:41 -0700 Subject: [PATCH 3/4] Fix: tests in rosetta --- packages/rsx-rosetta/tests/raw.rs | 4 +++- packages/rsx-rosetta/tests/simple.rs | 4 +++- packages/rsx-rosetta/tests/web-component.rs | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/rsx-rosetta/tests/raw.rs b/packages/rsx-rosetta/tests/raw.rs index a3ed1eef88..5a5fd6171e 100644 --- a/packages/rsx-rosetta/tests/raw.rs +++ b/packages/rsx-rosetta/tests/raw.rs @@ -16,6 +16,8 @@ fn raw_attribute() { let out = dioxus_autofmt::write_block_out(body).unwrap(); let expected = r#" - div { div { "unrecognizedattribute": "asd", "hello world!" } }"#; + div { + div { "unrecognizedattribute": "asd", "hello world!" } + }"#; pretty_assertions::assert_eq!(&out, &expected); } diff --git a/packages/rsx-rosetta/tests/simple.rs b/packages/rsx-rosetta/tests/simple.rs index 3f3f8230a0..f52c189643 100644 --- a/packages/rsx-rosetta/tests/simple.rs +++ b/packages/rsx-rosetta/tests/simple.rs @@ -56,7 +56,9 @@ fn deeply_nested() { div { div { class: "asd", div { class: "asd", - div { class: "asd", div { class: "asd" } } + div { class: "asd", + div { class: "asd" } + } } } }"#; diff --git a/packages/rsx-rosetta/tests/web-component.rs b/packages/rsx-rosetta/tests/web-component.rs index c7309e1b78..7bf1a69df6 100644 --- a/packages/rsx-rosetta/tests/web-component.rs +++ b/packages/rsx-rosetta/tests/web-component.rs @@ -16,6 +16,8 @@ fn web_components_translate() { let out = dioxus_autofmt::write_block_out(body).unwrap(); let expected = r#" - div { my-component {} }"#; + div { + my-component {} + }"#; pretty_assertions::assert_eq!(&out, &expected); } From d8324bf3eead03ac81a8b1e362f185717c61651f Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Wed, 3 Apr 2024 15:27:11 -0700 Subject: [PATCH 4/4] Handle long exprs --- packages/autofmt/src/writer.rs | 39 ++++++++++++++++---- packages/autofmt/tests/samples.rs | 1 + packages/autofmt/tests/samples/fat_exprs.rsx | 31 ++++++++++++++++ 3 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 packages/autofmt/tests/samples/fat_exprs.rsx diff --git a/packages/autofmt/src/writer.rs b/packages/autofmt/src/writer.rs index 553c26d73c..8d3762e381 100644 --- a/packages/autofmt/src/writer.rs +++ b/packages/autofmt/src/writer.rs @@ -244,11 +244,12 @@ impl<'a> Writer<'a> { fn write_for_loop(&mut self, forloop: &ForLoop) -> std::fmt::Result { write!( self.out, - "for {} in {} {{", + "for {} in ", forloop.pat.clone().into_token_stream(), - unparse_expr(&forloop.expr) )?; + self.write_inline_expr(&forloop.expr)?; + if forloop.body.is_empty() { write!(self.out, "}}")?; return Ok(()); @@ -276,12 +277,9 @@ impl<'a> Writer<'a> { .. } = chain; - write!( - self.out, - "{} {} {{", - if_token.to_token_stream(), - unparse_expr(cond) - )?; + write!(self.out, "{} ", if_token.to_token_stream(),)?; + + self.write_inline_expr(cond)?; self.write_body_indented(then_branch)?; @@ -307,6 +305,31 @@ impl<'a> Writer<'a> { Ok(()) } + + /// An expression within a for or if block that might need to be spread out across several lines + fn write_inline_expr(&mut self, expr: &Expr) -> std::fmt::Result { + let unparsed = unparse_expr(expr); + let mut lines = unparsed.lines(); + let first_line = lines.next().unwrap(); + write!(self.out, "{first_line}")?; + + let mut was_multiline = false; + + for line in lines { + was_multiline = true; + self.out.tabbed_line()?; + write!(self.out, "{line}")?; + } + + if was_multiline { + self.out.tabbed_line()?; + write!(self.out, "{{")?; + } else { + write!(self.out, " {{")?; + } + + Ok(()) + } } pub(crate) trait SpanLength { diff --git a/packages/autofmt/tests/samples.rs b/packages/autofmt/tests/samples.rs index a9dcc066af..21dd65a15f 100644 --- a/packages/autofmt/tests/samples.rs +++ b/packages/autofmt/tests/samples.rs @@ -49,4 +49,5 @@ twoway![ shorthand, docsite, letsome, + fat_exprs, ]; diff --git a/packages/autofmt/tests/samples/fat_exprs.rsx b/packages/autofmt/tests/samples/fat_exprs.rsx new file mode 100644 index 0000000000..750998269b --- /dev/null +++ b/packages/autofmt/tests/samples/fat_exprs.rsx @@ -0,0 +1,31 @@ +//! Exprs that are too long to fit on one line + +fn it_works() { + rsx! { + div { + if thing + .some_long_method_that_is_too_long_to_fit_on_one_line() + .some_long_method_that_is_too_long_to_fit_on_one_line() + .some_long_method_that_is_too_long_to_fit_on_one_line({ + chain() + .some_long_method_that_is_too_long_to_fit_on_one_line() + .some_long_method_that_is_too_long_to_fit_on_one_line() + }) + { + "hi" + } + + for item in thing + .some_long_method_that_is_too_long_to_fit_on_one_line() + .some_long_method_that_is_too_long_to_fit_on_one_line() + .some_long_method_that_is_too_long_to_fit_on_one_line({ + chain() + .some_long_method_that_is_too_long_to_fit_on_one_line() + .some_long_method_that_is_too_long_to_fit_on_one_line() + }) + { + "hi" + } + } + } +}