Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Partially revert #309 for class shorthand #310

Merged
merged 1 commit into from
Nov 6, 2021
+17 −17
Merged

Partially revert #309 for class shorthand #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/content/elements-attributes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ and mix and match them with other attributes:
```rust
# let _ = maud::
html! {
input #cannon .big .scary .bright-red type="button" value="Launch Party Cannon";
input #cannon .big.scary.bright-red type="button" value="Launch Party Cannon";
}
# ;
```
Expand Down Expand Up @@ -185,7 +185,7 @@ which otherwise wouldn't parse:
```rust
# let _ = maud::
html! {
div ."col-sm-2" { "Bootstrap column!" }
div."col-sm-2" { "Bootstrap column!" }
}
# ;
```
Expand Down
4 changes: 2 additions & 2 deletions docs/content/splices-toggles.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ let severity = "critical";
# let _ = maud::
html! {
aside #(name) {
p .{ "color-" (severity) } { "This is the worst! Possible! Thing!" }
p.{ "color-" (severity) } { "This is the worst! Possible! Thing!" }
}
}
# ;
Expand Down Expand Up @@ -146,7 +146,7 @@ And classes:
let cuteness = 95;
# let _ = maud::
html! {
p .cute[cuteness > 50] { "Squee!" }
p.cute[cuteness > 50] { "Squee!" }
}
# ;
```
22 changes: 11 additions & 11 deletions maud/tests/basic_syntax.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,16 +189,16 @@ fn hyphens_in_attribute_names() {

#[test]
fn class_shorthand() {
let result = html! { p { "Hi, " span .name { "Lyra" } "!" } };
let result = html! { p { "Hi, " span.name { "Lyra" } "!" } };
assert_eq!(
result.into_string(),
r#"<p>Hi, <span class="name">Lyra</span>!</p>"#
);
}

#[test]
fn class_shorthand_without_space() {
let result = html! { p { "Hi, " span.name { "Lyra" } "!" } };
fn class_shorthand_with_space() {
let result = html! { p { "Hi, " span .name { "Lyra" } "!" } };
assert_eq!(
result.into_string(),
r#"<p>Hi, <span class="name">Lyra</span>!</p>"#
Expand All @@ -207,7 +207,7 @@ fn class_shorthand_without_space() {

#[test]
fn classes_shorthand() {
let result = html! { p { "Hi, " span .name .here { "Lyra" } "!" } };
let result = html! { p { "Hi, " span.name.here { "Lyra" } "!" } };
assert_eq!(
result.into_string(),
r#"<p>Hi, <span class="name here">Lyra</span>!</p>"#
Expand All @@ -216,7 +216,7 @@ fn classes_shorthand() {

#[test]
fn hyphens_in_class_names() {
let result = html! { p .rocks-these .are--my--rocks { "yes" } };
let result = html! { p.rocks-these.are--my--rocks { "yes" } };
assert_eq!(
result.into_string(),
r#"<p class="rocks-these are--my--rocks">yes</p>"#
Expand All @@ -225,7 +225,7 @@ fn hyphens_in_class_names() {

#[test]
fn class_string() {
let result = html! { h1 ."pinkie-123" { "Pinkie Pie" } };
let result = html! { h1."pinkie-123" { "Pinkie Pie" } };
assert_eq!(
result.into_string(),
r#"<h1 class="pinkie-123">Pinkie Pie</h1>"#
Expand All @@ -235,7 +235,7 @@ fn class_string() {
#[test]
fn toggle_classes() {
fn test(is_cupcake: bool, is_muffin: bool) -> Markup {
html!(p .cupcake[is_cupcake] .muffin[is_muffin] { "Testing!" })
html!(p.cupcake[is_cupcake].muffin[is_muffin] { "Testing!" })
}
assert_eq!(
test(true, true).into_string(),
Expand All @@ -260,22 +260,22 @@ fn toggle_classes_braces() {
struct Maud {
rocks: bool,
}
let result = html! { p .rocks[Maud { rocks: true }.rocks] { "Awesome!" } };
let result = html! { p.rocks[Maud { rocks: true }.rocks] { "Awesome!" } };
assert_eq!(result.into_string(), r#"<p class="rocks">Awesome!</p>"#);
}

#[test]
fn toggle_classes_string() {
let is_cupcake = true;
let is_muffin = false;
let result = html! { p ."cupcake"[is_cupcake] ."is_muffin"[is_muffin] { "Testing!" } };
let result = html! { p."cupcake"[is_cupcake]."is_muffin"[is_muffin] { "Testing!" } };
assert_eq!(result.into_string(), r#"<p class="cupcake">Testing!</p>"#);
}

#[test]
fn mixed_classes() {
fn test(is_muffin: bool) -> Markup {
html!(p .cupcake .muffin[is_muffin] .lamington { "Testing!" })
html!(p.cupcake.muffin[is_muffin].lamington { "Testing!" })
}
assert_eq!(
test(true).into_string(),
Expand Down Expand Up @@ -307,7 +307,7 @@ fn id_string() {

#[test]
fn classes_attrs_ids_mixed_up() {
let result = html! { p { "Hi, " span .name .here lang="en" #thing { "Lyra" } "!" } };
let result = html! { p { "Hi, " span.name.here lang="en" #thing { "Lyra" } "!" } };
assert_eq!(
result.into_string(),
r#"<p>Hi, <span class="name here" id="thing" lang="en">Lyra</span>!</p>"#
Expand Down
4 changes: 2 additions & 2 deletions maud/tests/splices.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ fn attributes() {
#[test]
fn class_shorthand() {
let pinkie_class = "pinkie";
let result = html! { p .(pinkie_class) { "Fun!" } };
let result = html! { p.(pinkie_class) { "Fun!" } };
assert_eq!(result.into_string(), r#"<p class="pinkie">Fun!</p>"#);
}

#[test]
fn class_shorthand_block() {
let class_prefix = "pinkie-";
let result = html! { p .{ (class_prefix) "123" } { "Fun!" } };
let result = html! { p.{ (class_prefix) "123" } { "Fun!" } };
assert_eq!(result.into_string(), r#"<p class="pinkie-123">Fun!</p>"#);
}

Expand Down