-
-
Notifications
You must be signed in to change notification settings - Fork 475
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(format/html): impl formatting for directive and element tags
- Loading branch information
Showing
7 changed files
with
115 additions
and
18 deletions.
There are no files selected for viewing
23 changes: 20 additions & 3 deletions
23
crates/biome_html_formatter/src/html/auxiliary/closing_element.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,27 @@ | ||
use crate::prelude::*; | ||
use biome_html_syntax::HtmlClosingElement; | ||
use biome_rowan::AstNode; | ||
use biome_formatter::write; | ||
use biome_html_syntax::{HtmlClosingElement, HtmlClosingElementFields}; | ||
#[derive(Debug, Clone, Default)] | ||
pub(crate) struct FormatHtmlClosingElement; | ||
impl FormatNodeRule<HtmlClosingElement> for FormatHtmlClosingElement { | ||
fn fmt_fields(&self, node: &HtmlClosingElement, f: &mut HtmlFormatter) -> FormatResult<()> { | ||
format_verbatim_node(node.syntax()).fmt(f) | ||
let HtmlClosingElementFields { | ||
l_angle_token, | ||
name, | ||
slash_token, | ||
r_angle_token, | ||
} = node.as_fields(); | ||
|
||
write!( | ||
f, | ||
[ | ||
l_angle_token.format(), | ||
slash_token.format(), | ||
name.format(), | ||
r_angle_token.format(), | ||
] | ||
)?; | ||
|
||
Ok(()) | ||
} | ||
} |
40 changes: 37 additions & 3 deletions
40
crates/biome_html_formatter/src/html/auxiliary/directive.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,44 @@ | ||
use crate::prelude::*; | ||
use biome_html_syntax::HtmlDirective; | ||
use biome_rowan::AstNode; | ||
use biome_formatter::write; | ||
use biome_html_syntax::{HtmlDirective, HtmlDirectiveFields}; | ||
#[derive(Debug, Clone, Default)] | ||
pub(crate) struct FormatHtmlDirective; | ||
impl FormatNodeRule<HtmlDirective> for FormatHtmlDirective { | ||
fn fmt_fields(&self, node: &HtmlDirective, f: &mut HtmlFormatter) -> FormatResult<()> { | ||
format_verbatim_node(node.syntax()).fmt(f) | ||
// format_verbatim_node(node.syntax()).fmt(f) | ||
let HtmlDirectiveFields { | ||
l_angle_token, | ||
excl_token, | ||
doctype_token, | ||
html_token, | ||
quirk_token, | ||
public_id_token, | ||
system_id_token, | ||
r_angle_token, | ||
} = node.as_fields(); | ||
|
||
write!( | ||
f, | ||
[ | ||
l_angle_token.format(), | ||
excl_token.format(), | ||
doctype_token.format(), | ||
] | ||
)?; | ||
if let Some(html) = html_token { | ||
write!(f, [space()])?; | ||
html.format().fmt(f)?; | ||
} | ||
if let Some(quirk) = quirk_token { | ||
quirk.format().fmt(f)?; | ||
} | ||
if let Some(public_id) = public_id_token { | ||
public_id.format().fmt(f)?; | ||
} | ||
if let Some(system_id) = system_id_token { | ||
system_id.format().fmt(f)?; | ||
} | ||
write!(f, [r_angle_token.format(), hard_line_break()])?; | ||
Ok(()) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,25 @@ | ||
use crate::prelude::*; | ||
use biome_html_syntax::HtmlElement; | ||
use biome_rowan::AstNode; | ||
use biome_formatter::write; | ||
use biome_html_syntax::{HtmlElement, HtmlElementFields}; | ||
#[derive(Debug, Clone, Default)] | ||
pub(crate) struct FormatHtmlElement; | ||
impl FormatNodeRule<HtmlElement> for FormatHtmlElement { | ||
fn fmt_fields(&self, node: &HtmlElement, f: &mut HtmlFormatter) -> FormatResult<()> { | ||
format_verbatim_node(node.syntax()).fmt(f) | ||
let HtmlElementFields { | ||
opening_element, | ||
children, | ||
closing_element, | ||
} = node.as_fields(); | ||
|
||
write!( | ||
f, | ||
[ | ||
opening_element.format(), | ||
children.format(), | ||
closing_element.format(), | ||
] | ||
)?; | ||
|
||
Ok(()) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
use crate::prelude::*; | ||
use biome_html_syntax::HtmlName; | ||
use biome_rowan::AstNode; | ||
use biome_formatter::write; | ||
use biome_html_syntax::{HtmlName, HtmlNameFields}; | ||
#[derive(Debug, Clone, Default)] | ||
pub(crate) struct FormatHtmlName; | ||
impl FormatNodeRule<HtmlName> for FormatHtmlName { | ||
fn fmt_fields(&self, node: &HtmlName, f: &mut HtmlFormatter) -> FormatResult<()> { | ||
format_verbatim_node(node.syntax()).fmt(f) | ||
let HtmlNameFields { value_token } = node.as_fields(); | ||
|
||
write![f, [value_token.format()]] | ||
} | ||
} |
23 changes: 20 additions & 3 deletions
23
crates/biome_html_formatter/src/html/auxiliary/opening_element.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,27 @@ | ||
use crate::prelude::*; | ||
use biome_html_syntax::HtmlOpeningElement; | ||
use biome_rowan::AstNode; | ||
use biome_formatter::write; | ||
use biome_html_syntax::{HtmlOpeningElement, HtmlOpeningElementFields}; | ||
#[derive(Debug, Clone, Default)] | ||
pub(crate) struct FormatHtmlOpeningElement; | ||
impl FormatNodeRule<HtmlOpeningElement> for FormatHtmlOpeningElement { | ||
fn fmt_fields(&self, node: &HtmlOpeningElement, f: &mut HtmlFormatter) -> FormatResult<()> { | ||
format_verbatim_node(node.syntax()).fmt(f) | ||
let HtmlOpeningElementFields { | ||
l_angle_token, | ||
name, | ||
attributes, | ||
r_angle_token, | ||
} = node.as_fields(); | ||
|
||
write!( | ||
f, | ||
[ | ||
l_angle_token.format(), | ||
name.format(), | ||
attributes.format(), | ||
r_angle_token.format(), | ||
] | ||
)?; | ||
|
||
Ok(()) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,22 @@ | ||
use crate::prelude::*; | ||
use biome_html_syntax::HtmlRoot; | ||
use biome_rowan::AstNode; | ||
#[derive(Debug, Clone, Default)] | ||
pub(crate) struct FormatHtmlRoot; | ||
impl FormatNodeRule<HtmlRoot> for FormatHtmlRoot { | ||
fn fmt_fields(&self, node: &HtmlRoot, f: &mut HtmlFormatter) -> FormatResult<()> { | ||
format_verbatim_node(node.syntax()).fmt(f) | ||
if let Some(bom) = node.bom_token() { | ||
bom.format().fmt(f)?; | ||
} | ||
if let Some(directive) = node.directive() { | ||
directive.format().fmt(f)?; | ||
} | ||
if let Some(html) = node.html() { | ||
html.format().fmt(f)?; | ||
} | ||
if let Ok(eof) = node.eof_token() { | ||
eof.format().fmt(f)?; | ||
} | ||
|
||
Ok(()) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters