Skip to content

Adds formatting for if_else control flow blocks #2564

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

Merged
merged 6 commits into from
Aug 18, 2022
Merged

Adds formatting for if_else control flow blocks #2564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f74989b
add formatting for if_else blocks
eureka-cpu Aug 17, 2022
2e52c2d
fmt
eureka-cpu Aug 17, 2022
f5cbec8
merge conf
eureka-cpu Aug 17, 2022
44a5508
if else tests pass
eureka-cpu Aug 17, 2022
cea143f
complete intermediate_whitespace test
eureka-cpu Aug 17, 2022
c2de6a8
Merge branch 'master' into eureka-cpu/conditional-expr
eureka-cpu Aug 18, 2022
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
30 changes: 21 additions & 9 deletions sway-fmt-v2/src/utils/expr/conditional.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,13 @@ impl Format for IfExpr {
Self::open_curly_brace(formatted_code, formatter)?;
self.then_block.get().format(formatted_code, formatter)?;
Self::close_curly_brace(formatted_code, formatter)?;
if let Some(else_opt) = &self.else_opt {
write!(formatted_code, "{} ", else_opt.0.span().as_str())?;
match &else_opt.1 {
ControlFlow::Continue(if_expr) => if_expr.format(formatted_code, formatter)?,
if let Some((else_token, control_flow)) = &self.else_opt {
write!(formatted_code, " {}", else_token.span().as_str())?;
match &control_flow {
ControlFlow::Continue(if_expr) => {
write!(formatted_code, " ")?;
if_expr.format(formatted_code, formatter)?
}
ControlFlow::Break(code_block_contents) => {
Self::open_curly_brace(formatted_code, formatter)?;
code_block_contents
Expand All @@ -41,16 +44,25 @@ impl Format for IfExpr {
impl CurlyBrace for IfExpr {
fn open_curly_brace(
line: &mut FormattedCode,
_formatter: &mut Formatter,
formatter: &mut Formatter,
) -> Result<(), FormatterError> {
write!(line, "{}", Delimiter::Brace.as_open_char())?;
formatter.shape.block_indent(&formatter.config);
write!(line, " {}", Delimiter::Brace.as_open_char())?;

Ok(())
}
fn close_curly_brace(
line: &mut FormattedCode,
_formatter: &mut Formatter,
formatter: &mut Formatter,
) -> Result<(), FormatterError> {
write!(line, "{}", Delimiter::Brace.as_close_char())?;
formatter.shape.block_unindent(&formatter.config);
write!(
line,
"{}{}",
formatter.shape.indent.to_string(&formatter.config)?,
Delimiter::Brace.as_close_char()
)?;

Ok(())
}
}
Expand All @@ -71,7 +83,7 @@ impl Format for IfCondition {
eq_token,
rhs,
} => {
write!(formatted_code, "{} ", let_token.span().as_str())?;
write!(formatted_code, " {} ", let_token.span().as_str())?;
lhs.format(formatted_code, formatter)?;
write!(formatted_code, " {} ", eq_token.span().as_str())?;
rhs.format(formatted_code, formatter)?;
Expand Down
5 changes: 5 additions & 0 deletions sway-fmt-v2/src/utils/expr/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ fmt_test!( multiline_match_stmt "match foo {\n Foo::foo => {}\n Foo::bar
intermediate_whitespace "match foo {\n Foo::foo => {}\n Foo::bar => {}\n}"
);

fmt_test!( if_else_block "if foo {\n foo();\n} else if bar {\n bar();\n} else {\n baz();\n}",
intermediate_whitespace " if foo { \n foo( ) ; \n } else if bar { \n bar( ) ; \n } else { \n baz(\n) ; \n }\n\n"
);

fmt_test!( match_branch_kind
"match foo {
Foo::foo => {
Expand All @@ -130,4 +134,5 @@ fmt_test!( match_branch_kind
intermediate_whitespace "match foo

\n{\n\n Foo::foo => {\n foo() ; \n bar( ); \n } \n Foo::\nbar => {\n baz();\n quux();\n }\n\n\n}"

);