Merge pull request #1455 from topecongiro/unary-op
Add heuristic choosing block or visual indent for unary op based on span
This commit is contained in:
commit
9abe8636a2
5 changed files with 52 additions and 31 deletions
35
src/expr.rs
35
src/expr.rs
|
@ -157,7 +157,11 @@ fn format_expr(expr: &ast::Expr,
|
||||||
};
|
};
|
||||||
|
|
||||||
if let Some(ref expr) = *opt_expr {
|
if let Some(ref expr) = *opt_expr {
|
||||||
rewrite_unary_prefix(context, &format!("break{} ", id_str), &**expr, shape)
|
rewrite_unary_prefix(context,
|
||||||
|
&format!("break{} ", id_str),
|
||||||
|
&**expr,
|
||||||
|
shape,
|
||||||
|
expr.span)
|
||||||
} else {
|
} else {
|
||||||
wrap_str(format!("break{}", id_str), context.config.max_width, shape)
|
wrap_str(format!("break{}", id_str), context.config.max_width, shape)
|
||||||
}
|
}
|
||||||
|
@ -178,9 +182,11 @@ fn format_expr(expr: &ast::Expr,
|
||||||
}
|
}
|
||||||
ast::ExprKind::Ret(None) => wrap_str("return".to_owned(), context.config.max_width, shape),
|
ast::ExprKind::Ret(None) => wrap_str("return".to_owned(), context.config.max_width, shape),
|
||||||
ast::ExprKind::Ret(Some(ref expr)) => {
|
ast::ExprKind::Ret(Some(ref expr)) => {
|
||||||
rewrite_unary_prefix(context, "return ", &**expr, shape)
|
rewrite_unary_prefix(context, "return ", &**expr, shape, expr.span)
|
||||||
|
}
|
||||||
|
ast::ExprKind::Box(ref expr) => {
|
||||||
|
rewrite_unary_prefix(context, "box ", &**expr, shape, expr.span)
|
||||||
}
|
}
|
||||||
ast::ExprKind::Box(ref expr) => rewrite_unary_prefix(context, "box ", &**expr, shape),
|
|
||||||
ast::ExprKind::AddrOf(mutability, ref expr) => {
|
ast::ExprKind::AddrOf(mutability, ref expr) => {
|
||||||
rewrite_expr_addrof(context, mutability, expr, shape)
|
rewrite_expr_addrof(context, mutability, expr, shape)
|
||||||
}
|
}
|
||||||
|
@ -222,7 +228,7 @@ fn format_expr(expr: &ast::Expr,
|
||||||
} else {
|
} else {
|
||||||
delim.into()
|
delim.into()
|
||||||
};
|
};
|
||||||
rewrite_unary_prefix(context, &sp_delim, &**rhs, shape)
|
rewrite_unary_prefix(context, &sp_delim, &**rhs, shape, expr.span)
|
||||||
}
|
}
|
||||||
(Some(ref lhs), None) => {
|
(Some(ref lhs), None) => {
|
||||||
let sp_delim = if context.config.spaces_around_ranges {
|
let sp_delim = if context.config.spaces_around_ranges {
|
||||||
|
@ -1997,9 +2003,22 @@ pub fn rewrite_tuple<'a, I>(context: &RewriteContext,
|
||||||
pub fn rewrite_unary_prefix<R: Rewrite>(context: &RewriteContext,
|
pub fn rewrite_unary_prefix<R: Rewrite>(context: &RewriteContext,
|
||||||
prefix: &str,
|
prefix: &str,
|
||||||
rewrite: &R,
|
rewrite: &R,
|
||||||
shape: Shape)
|
mut shape: Shape,
|
||||||
|
span: Span)
|
||||||
-> Option<String> {
|
-> Option<String> {
|
||||||
let shape = try_opt!(shape.shrink_left(prefix.len())).visual_indent(0);
|
// Heuristic: if unary is `&` and `rewrite` contains `{`,
|
||||||
|
// it is likely that block indent is preferred to visual indent.
|
||||||
|
if prefix == "&" {
|
||||||
|
let snippet = String::from(context.snippet(span).trim_left_matches('&'));
|
||||||
|
let first_line = try_opt!(snippet.lines().nth(0));
|
||||||
|
if first_line.contains("{") {
|
||||||
|
shape = try_opt!(shape.sub_width(prefix.len())).block_indent(0);
|
||||||
|
} else {
|
||||||
|
shape = try_opt!(shape.shrink_left(prefix.len())).visual_indent(0);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
shape = try_opt!(shape.shrink_left(prefix.len())).visual_indent(0);
|
||||||
|
}
|
||||||
rewrite
|
rewrite
|
||||||
.rewrite(context, shape)
|
.rewrite(context, shape)
|
||||||
.map(|r| format!("{}{}", prefix, r))
|
.map(|r| format!("{}{}", prefix, r))
|
||||||
|
@ -2031,7 +2050,7 @@ fn rewrite_unary_op(context: &RewriteContext,
|
||||||
ast::UnOp::Not => "!",
|
ast::UnOp::Not => "!",
|
||||||
ast::UnOp::Neg => "-",
|
ast::UnOp::Neg => "-",
|
||||||
};
|
};
|
||||||
rewrite_unary_prefix(context, operator_str, expr, shape)
|
rewrite_unary_prefix(context, operator_str, expr, shape, expr.span)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn rewrite_assignment(context: &RewriteContext,
|
fn rewrite_assignment(context: &RewriteContext,
|
||||||
|
@ -2126,5 +2145,5 @@ fn rewrite_expr_addrof(context: &RewriteContext,
|
||||||
ast::Mutability::Immutable => "&",
|
ast::Mutability::Immutable => "&",
|
||||||
ast::Mutability::Mutable => "&mut ",
|
ast::Mutability::Mutable => "&mut ",
|
||||||
};
|
};
|
||||||
rewrite_unary_prefix(context, operator_str, expr, shape)
|
rewrite_unary_prefix(context, operator_str, expr, shape, expr.span)
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,9 @@ use syntax::codemap::{self, BytePos, Span};
|
||||||
impl Rewrite for Pat {
|
impl Rewrite for Pat {
|
||||||
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
|
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
|
||||||
match self.node {
|
match self.node {
|
||||||
PatKind::Box(ref pat) => rewrite_unary_prefix(context, "box ", &**pat, shape),
|
PatKind::Box(ref pat) => {
|
||||||
|
rewrite_unary_prefix(context, "box ", &**pat, shape, self.span)
|
||||||
|
}
|
||||||
PatKind::Ident(binding_mode, ident, ref sub_pat) => {
|
PatKind::Ident(binding_mode, ident, ref sub_pat) => {
|
||||||
let (prefix, mutability) = match binding_mode {
|
let (prefix, mutability) = match binding_mode {
|
||||||
BindingMode::ByRef(mutability) => ("ref ", mutability),
|
BindingMode::ByRef(mutability) => ("ref ", mutability),
|
||||||
|
@ -71,7 +73,7 @@ impl Rewrite for Pat {
|
||||||
}
|
}
|
||||||
PatKind::Ref(ref pat, mutability) => {
|
PatKind::Ref(ref pat, mutability) => {
|
||||||
let prefix = format!("&{}", format_mutability(mutability));
|
let prefix = format!("&{}", format_mutability(mutability));
|
||||||
rewrite_unary_prefix(context, &prefix, &**pat, shape)
|
rewrite_unary_prefix(context, &prefix, &**pat, shape, self.span)
|
||||||
}
|
}
|
||||||
PatKind::Tuple(ref items, dotdot_pos) => {
|
PatKind::Tuple(ref items, dotdot_pos) => {
|
||||||
rewrite_tuple_pat(items, dotdot_pos, None, self.span, context, shape)
|
rewrite_tuple_pat(items, dotdot_pos, None, self.span, context, shape)
|
||||||
|
|
|
@ -580,7 +580,7 @@ impl Rewrite for ast::Ty {
|
||||||
Mutability::Immutable => "*const ",
|
Mutability::Immutable => "*const ",
|
||||||
};
|
};
|
||||||
|
|
||||||
rewrite_unary_prefix(context, prefix, &*mt.ty, shape)
|
rewrite_unary_prefix(context, prefix, &*mt.ty, shape, self.span)
|
||||||
}
|
}
|
||||||
ast::TyKind::Rptr(ref lifetime, ref mt) => {
|
ast::TyKind::Rptr(ref lifetime, ref mt) => {
|
||||||
let mut_str = format_mutability(mt.mutbl);
|
let mut_str = format_mutability(mt.mutbl);
|
||||||
|
|
Loading…
Reference in a new issue