fix: autofmt on single line rsx calls

This commit is contained in:
Jonathan Kelley committed 2022-07-07 02:06:50 -04:00
1 parent 2b9888627b
commit 3d47cb48fa
5 files changed
+23 -13

No files matched your search

+5 -1
View File
@@ -47,7 +47,7 @@ pub fn fmt_file(contents: &str) -> Vec<FormattedBlock> {
continue; continue;
} }
let indent_level = { let mut indent_level = {
// walk backwards from start until we find a new line // walk backwards from start until we find a new line
let mut lines = contents[..start].lines().rev(); let mut lines = contents[..start].lines().rev();
match lines.next() { match lines.next() {
@@ -71,6 +71,10 @@ pub fn fmt_file(contents: &str) -> Vec<FormattedBlock> {
if new.len() <= 80 && !new.contains('\n') { if new.len() <= 80 && !new.contains('\n') {
new = format!(" {new} "); new = format!(" {new} ");
// if the new string is not multiline, don't try to adjust the marker ending
// We want to trim off any indentation that there might be
indent_level = 0;
} }
let end_marker = end + bracket_end - indent_level * 4 - 1; let end_marker = end + bracket_end - indent_level * 4 - 1;
+2
View File
@@ -12,3 +12,5 @@ macro_rules! twoway {
} }
twoway!("comments" => comments); twoway!("comments" => comments);
twoway!("multi" => multi);
+3
View File
@@ -0,0 +1,3 @@
fn app(cx: Scope) -> Element {
cx.render(rsx! { div { "hello world" } })
}
@@ -0,0 +1,5 @@
fn app(cx: Scope) -> Element {
cx.render(rsx! {
div {"hello world" }
})
}
+8 -12
View File
@@ -11,14 +11,14 @@ fn main() {
fn app(cx: Scope) -> Element { fn app(cx: Scope) -> Element {
cx.render(rsx! { cx.render(rsx! {
Router { Router {
h1 { "Your app here" } h1 { "Your app here" }
ul { ul {
Link { to: "/", li { "home" }} Link { to: "/", li { "home" } }
Link { to: "/blog", li { "blog" }} Link { to: "/blog", li { "blog" } }
Link { to: "/blog/tim", li { "tims' blog" }} Link { to: "/blog/tim", li { "tims' blog" } }
Link { to: "/blog/bill", li { "bills' blog" }} Link { to: "/blog/bill", li { "bills' blog" } }
Link { to: "/apples", li { "go to apples" }} Link { to: "/apples", li { "go to apples" } }
} }
Route { to: "/", Home {} } Route { to: "/", Home {} }
Route { to: "/blog/", BlogList {} } Route { to: "/blog/", BlogList {} }
@@ -30,15 +30,11 @@ fn app(cx: Scope) -> Element {
} }
fn Home(cx: Scope) -> Element { fn Home(cx: Scope) -> Element {
cx.render(rsx! { cx.render(rsx! { h1 { "Home" } })
h1 { "Home" }
})
} }
fn BlogList(cx: Scope) -> Element { fn BlogList(cx: Scope) -> Element {
cx.render(rsx! { cx.render(rsx! { div { "Blog List" } })
div { "Blog List" }
})
} }
fn BlogPost(cx: Scope) -> Element { fn BlogPost(cx: Scope) -> Element {