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

Format

Browse source
This commit is contained in:
Seiichi Uchida 2018-08-05 15:04:48 +09:00
parent 9e113b5bab
commit 49945a14f7
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/chains.rs
View file

@ -187,9 +187,12 @@ impl Rewrite for ChainItem {
ChainItemKind::TupleField(ident, nested) => {
format!("{}.{}", if nested { " " } else { "" }, ident.name)
}
ChainItemKind::Comment => {
rewrite_comment(context.snippet(self.span).trim(), false, shape, context.config)?
}
ChainItemKind::Comment => rewrite_comment(
context.snippet(self.span).trim(),
false,
shape,
context.config,
)?,
};
Some(format!("{}{}", rewrite, "?".repeat(self.tries)))
}
@ -471,8 +474,7 @@ impl<'a> ChainFormatterShared<'a> {
min(shape.width, context.config.width_heuristics().chain_width)
}.saturating_sub(almost_total);
let all_in_one_line =
!self.children.iter().any(ChainItem::is_comment)
let all_in_one_line = !self.children.iter().any(ChainItem::is_comment)
&& self.rewrites.iter().all(|s| !s.contains('\n'))
&& one_line_budget > 0;
let last_shape = if all_in_one_line {