squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Fix a bug with alignment in one-line match arms

Browse source
This commit is contained in:
Nick Cameron 2015-09-02 14:45:56 +12:00
parent a5f8b37eeb
commit ce4d5aa39c
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/expr.rs
View file

@ -578,8 +578,7 @@ fn rewrite_match(context: &RewriteContext,
result.push_str(&arm_indent_str);
let arm_str = arm.rewrite(&nested_context,
context.config.max_width -
arm_indent,
context.config.max_width - arm_indent,
arm_indent);
if let Some(ref arm_str) = arm_str {
result.push_str(arm_str);
@ -694,7 +693,6 @@ impl Rewrite for ast::Arm {
} else {
","
};
let nested_indent = context.block_indent + context.config.tab_spaces;
// Let's try and get the arm body on the same line as the condition.
// 4 = ` => `.len()
@ -702,7 +700,7 @@ impl Rewrite for ast::Arm {
let budget = context.config.max_width - line_start - comma.len() - 4;
if let Some(ref body_str) = body.rewrite(context,
budget,
nested_indent) {
line_start + 4) {
if first_line_width(body_str) <= budget {
return Some(format!("{}{} => {}{}",
attr_str.trim_left(),
@ -720,7 +718,9 @@ impl Rewrite for ast::Arm {
}
let body_budget = try_opt!(width.checked_sub(context.config.tab_spaces));
let body_str = try_opt!(body.rewrite(context, body_budget, nested_indent));
let body_str = try_opt!(body.rewrite(context,
body_budget,
context.block_indent));
Some(format!("{}{} =>\n{}{},",
attr_str.trim_left(),
pats_str,

15
tests/target/match.rs
View file

@ -62,3 +62,18 @@ fn main() {
None => sub_span,
};
}
// Test that one-line bodies align.
fn main() {
match r {
Variableeeeeeeeeeeeeeeeee => ("variable",
vec!("id","name","qualname","value","type","scopeid"),
true,
true),
Enummmmmmmmmmmmmmmmmmmmm => ("enum", vec!("id","qualname","scopeid","value"), true, true),
Variantttttttttttttttttttttttt => ("variant",
vec!("id","name","qualname","type","value","scopeid"),
true,
true),
}
}