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

fix: autofmt on single line rsx calls

Browse source
This commit is contained in:
Jonathan Kelley 2022-07-07 02:06:50 -04:00
parent 2b9888627b
commit 3d47cb48fa
5 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/autofmt/src/lib.rs
View file

@ -47,7 +47,7 @@ pub fn fmt_file(contents: &str) -> Vec<FormattedBlock> {
continue;
}
let indent_level = {
let mut indent_level = {
// walk backwards from start until we find a new line
let mut lines = contents[..start].lines().rev();
match lines.next() {
@ -71,6 +71,10 @@ pub fn fmt_file(contents: &str) -> Vec<FormattedBlock> {
if new.len() <= 80 && !new.contains('\n') {
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;

2
packages/autofmt/tests/wrong.rs
View file

@ -12,3 +12,5 @@ macro_rules! twoway {
}
twoway!("comments" => comments);
twoway!("multi" => multi);

3
packages/autofmt/tests/wrong/multi.rsx Normal file
View file

@ -0,0 +1,3 @@
fn app(cx: Scope) -> Element {
cx.render(rsx! { div { "hello world" } })
}

5
packages/autofmt/tests/wrong/multi.wrong.rsx Normal file
View file

@ -0,0 +1,5 @@
fn app(cx: Scope) -> Element {
cx.render(rsx! {
div {"hello world" }
})
}

20
packages/router/examples/simple.rs
View file

@ -11,14 +11,14 @@ fn main() {
fn app(cx: Scope) -> Element {
cx.render(rsx! {
Router {
Router {
h1 { "Your app here" }
ul {
Link { to: "/", li { "home" }}
Link { to: "/blog", li { "blog" }}
Link { to: "/blog/tim", li { "tims' blog" }}
Link { to: "/blog/bill", li { "bills' blog" }}
Link { to: "/apples", li { "go to apples" }}
Link { to: "/", li { "home" } }
Link { to: "/blog", li { "blog" } }
Link { to: "/blog/tim", li { "tims' blog" } }
Link { to: "/blog/bill", li { "bills' blog" } }
Link { to: "/apples", li { "go to apples" } }
}
Route { to: "/", Home {} }
Route { to: "/blog/", BlogList {} }
@ -30,15 +30,11 @@ fn app(cx: Scope) -> Element {
}
fn Home(cx: Scope) -> Element {
cx.render(rsx! {
h1 { "Home" }
})
cx.render(rsx! { h1 { "Home" } })
}
fn BlogList(cx: Scope) -> Element {
cx.render(rsx! {
div { "Blog List" }
})
cx.render(rsx! { div { "Blog List" } })
}
fn BlogPost(cx: Scope) -> Element {