the same line with the pattern of arms";
match_block_trailing_comma: bool, false,
"Put a trailing comma after a block based match arm (non-block arms are not affected)";
+ match_arm_forces_newline: bool, false,
+ "Force match arm bodies to be in a new lines";
indent_match_arms: bool, true, "Indent match arms instead of keeping them at the same \
indentation level as the match keyword";
match_pattern_separator_break_point: SeparatorPlace, SeparatorPlace::Back,
is_last: bool,
) -> Option<String> {
let (extend, body) = flatten_arm_body(context, body);
-
- let comma = arm_comma(context.config, body, is_last);
- let alt_block_sep = String::from("\n") + &shape.indent.block_only().to_string(context.config);
- let alt_block_sep = alt_block_sep.as_str();
let (is_block, is_empty_block) = if let ast::ExprKind::Block(ref block) = body.node {
(true, is_empty_block(block, context.codemap))
} else {
(false, false)
};
+ let extend = if context.config.match_arm_forces_newline() {
+ is_block
+ } else {
+ extend
+ };
+
+ let comma = arm_comma(context.config, body, is_last);
+ let alt_block_sep = String::from("\n") + &shape.indent.block_only().to_string(context.config);
+ let alt_block_sep = alt_block_sep.as_str();
let combine_orig_body = |body_str: &str| {
let block_sep = match context.config.control_brace_style() {
let forbid_same_line = has_guard && pats_str.contains('\n') && !is_empty_block;
let next_line_indent = if is_block {
- shape.indent
+ if is_empty_block {
+ shape.indent.block_indent(context.config)
+ } else {
+ shape.indent
+ }
} else {
shape.indent.block_indent(context.config)
};
match rewrite {
Some(ref body_str)
- if !forbid_same_line
+ if !forbid_same_line && !context.config.match_arm_forces_newline()
&& (is_block
|| (!body_str.contains('\n') && body_str.len() <= body_shape.width)) =>
{