nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-29 03:27:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use block indent when visual indent failed inside closure block

Browse Source
This commit is contained in:
topecongiro 2017-05-03 11:21:31 +09:00
parent 59d66c3ae8
commit 3f703fd33d
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/expr.rs
View File

@ -570,6 +570,19 @@ fn rewrite_closure(capture: ast::CaptureBy,
rewrite.map(|rw| format!("{} {}", prefix, rw)) rewrite.map(|rw| format!("{} {}", prefix, rw))
} }
fn no_weird_visual_indent(block_str: &str, context: &RewriteContext) -> bool {
let mut prev_indent_width = 0;
for line in block_str.lines() {
let cur_indent_width = line.find(|c: char| !c.is_whitespace()).unwrap_or(0);
if prev_indent_width > cur_indent_width + context.config.tab_spaces &&
line.find('}').unwrap_or(0) != cur_indent_width {
return false;
}
prev_indent_width = cur_indent_width;
}
true
}
fn rewrite_closure_block(block: &ast::Block, fn rewrite_closure_block(block: &ast::Block,
prefix: String, prefix: String,
context: &RewriteContext, context: &RewriteContext,
@ -577,22 +590,27 @@ fn rewrite_closure(capture: ast::CaptureBy,
-> Option<String> { -> Option<String> {
// Start with visual indent, then fall back to block indent if the // Start with visual indent, then fall back to block indent if the
// closure is large. // closure is large.
let rewrite = try_opt!(block.rewrite(&context, shape)); if let Some(block_str) = block.rewrite(&context, shape) {
let block_threshold = context.config.closure_block_indent_threshold; let block_threshold = context.config.closure_block_indent_threshold;
if block_threshold < 0 || rewrite.matches('\n').count() <= block_threshold as usize { if (block_threshold < 0 ||
if let Some(rewrite) = wrap_str(rewrite, context.config.max_width, shape) { block_str.matches('\n').count() <= block_threshold as usize) &&
return Some(format!("{} {}", prefix, rewrite)); no_weird_visual_indent(&block_str, context) {
if let Some(block_str) = block_str.rewrite(context, shape) {
return Some(format!("{} {}", prefix, block_str));
}
} }
} }
// The body of the closure is big enough to be block indented, that // The body of the closure is big enough to be block indented, that
// means we must re-format. // means we must re-format.
let block_shape = shape.block(); let block_shape = Shape {
let rewrite = try_opt!(block.rewrite(&context, block_shape)); width: context.config.max_width - shape.block().indent.width(),
..shape.block()
};
let block_str = try_opt!(block.rewrite(&context, block_shape));
Some(format!("{} {}", Some(format!("{} {}",
prefix, prefix,
try_opt!(wrap_str(rewrite, block_shape.width, block_shape)))) try_opt!(block_str.rewrite(context, block_shape))))
} }
} }