2015-04-21 21:01:19 +12:00
|
|
|
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2017-01-16 16:37:58 +13:00
|
|
|
use std::cmp::{Ordering, min};
|
2015-09-11 00:52:16 +02:00
|
|
|
use std::borrow::Borrow;
|
2015-10-08 23:07:19 +02:00
|
|
|
use std::mem::swap;
|
2015-12-06 01:11:26 +01:00
|
|
|
use std::ops::Deref;
|
|
|
|
use std::iter::ExactSizeIterator;
|
2016-01-12 01:09:08 +01:00
|
|
|
use std::fmt::Write;
|
2015-09-04 18:09:05 +02:00
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
use {Indent, Shape, Spanned};
|
2016-05-25 20:41:26 +02:00
|
|
|
use codemap::SpanUtils;
|
2015-06-16 17:29:05 +02:00
|
|
|
use rewrite::{Rewrite, RewriteContext};
|
2015-10-02 13:50:24 +02:00
|
|
|
use lists::{write_list, itemize_list, ListFormatting, SeparatorTactic, ListTactic,
|
2016-03-14 20:51:06 +13:00
|
|
|
DefinitiveListTactic, definitive_tactic, ListItem, format_item_list};
|
2015-06-23 15:58:58 +02:00
|
|
|
use string::{StringFormat, rewrite_string};
|
2016-05-25 20:41:26 +02:00
|
|
|
use utils::{extra_offset, last_line_width, wrap_str, binary_search, first_line_width,
|
2016-11-21 08:37:35 +13:00
|
|
|
semicolon_for_stmt, trimmed_last_line_width, left_most_sub_expr, stmt_expr};
|
2015-07-13 21:51:56 +02:00
|
|
|
use visitor::FmtVisitor;
|
2017-01-11 14:34:42 +13:00
|
|
|
use config::{Config, StructLitStyle, MultilineStyle, ControlBraceStyle};
|
2016-01-10 15:12:15 +01:00
|
|
|
use comment::{FindUncommented, rewrite_comment, contains_comment, recover_comment_removed};
|
2017-01-19 10:47:07 +13:00
|
|
|
use types::{rewrite_path, PathContext};
|
2015-09-11 12:24:13 +02:00
|
|
|
use items::{span_lo_for_arg, span_hi_for_arg};
|
2015-09-11 00:52:16 +02:00
|
|
|
use chains::rewrite_chain;
|
2016-11-21 08:37:35 +13:00
|
|
|
use macros::{rewrite_macro, MacroPosition};
|
2015-04-21 21:01:19 +12:00
|
|
|
|
|
|
|
use syntax::{ast, ptr};
|
2015-09-01 20:42:07 +02:00
|
|
|
use syntax::codemap::{CodeMap, Span, BytePos, mk_sp};
|
2016-04-14 08:36:59 +12:00
|
|
|
use syntax::parse::classify;
|
2015-04-21 21:01:19 +12:00
|
|
|
|
2015-06-16 17:29:05 +02:00
|
|
|
impl Rewrite for ast::Expr {
|
2017-01-31 08:28:48 +13:00
|
|
|
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
|
|
|
|
format_expr(self, ExprType::SubExpression, context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(PartialEq)]
|
|
|
|
enum ExprType {
|
|
|
|
Statement,
|
|
|
|
SubExpression,
|
|
|
|
}
|
|
|
|
|
|
|
|
fn format_expr(expr: &ast::Expr,
|
|
|
|
expr_type: ExprType,
|
|
|
|
context: &RewriteContext,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
-> Option<String> {
|
|
|
|
let result = match expr.node {
|
2017-01-19 10:47:07 +13:00
|
|
|
ast::ExprKind::Array(ref expr_vec) => {
|
2016-05-29 17:58:38 +02:00
|
|
|
rewrite_array(expr_vec.iter().map(|e| &**e),
|
|
|
|
mk_sp(context.codemap.span_after(expr.span, "["), expr.span.hi),
|
|
|
|
context,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Lit(ref l) => {
|
|
|
|
match l.node {
|
|
|
|
ast::LitKind::Str(_, ast::StrStyle::Cooked) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_string_lit(context, l.span, shape)
|
2015-10-02 12:25:22 +02:00
|
|
|
}
|
2017-01-31 08:28:48 +13:00
|
|
|
_ => wrap_str(context.snippet(expr.span), context.config.max_width, shape),
|
2015-10-02 12:00:28 +02:00
|
|
|
}
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Call(ref callee, ref args) => {
|
|
|
|
let inner_span = mk_sp(callee.span.hi, expr.span.hi);
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_call(context, &**callee, args, inner_span, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
2017-01-31 08:28:48 +13:00
|
|
|
ast::ExprKind::Paren(ref subexpr) => rewrite_paren(context, subexpr, shape),
|
2016-05-29 17:58:38 +02:00
|
|
|
ast::ExprKind::Binary(ref op, ref lhs, ref rhs) => {
|
2017-01-11 12:06:23 +13:00
|
|
|
// FIXME: format comments between operands and operator
|
|
|
|
rewrite_pair(&**lhs,
|
|
|
|
&**rhs,
|
|
|
|
"",
|
|
|
|
&format!(" {} ", context.snippet(op.span)),
|
|
|
|
"",
|
|
|
|
context,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
2017-01-31 08:28:48 +13:00
|
|
|
ast::ExprKind::Unary(ref op, ref subexpr) => rewrite_unary_op(context, op, subexpr, shape),
|
2016-05-29 17:58:38 +02:00
|
|
|
ast::ExprKind::Struct(ref path, ref fields, ref base) => {
|
|
|
|
rewrite_struct_lit(context,
|
|
|
|
path,
|
|
|
|
fields,
|
|
|
|
base.as_ref().map(|e| &**e),
|
|
|
|
expr.span,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Tup(ref items) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_tuple(context, items.iter().map(|x| &**x), expr.span, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::While(ref cond, ref block, label) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
ControlFlow::new_while(None, cond, block, label, expr.span).rewrite(context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::WhileLet(ref pat, ref cond, ref block, label) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
ControlFlow::new_while(Some(pat), cond, block, label, expr.span).rewrite(context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::ForLoop(ref pat, ref cond, ref block, label) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
ControlFlow::new_for(pat, cond, block, label, expr.span).rewrite(context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Loop(ref block, label) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
ControlFlow::new_loop(block, label, expr.span).rewrite(context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
2017-01-31 08:28:48 +13:00
|
|
|
ast::ExprKind::Block(ref block) => block.rewrite(context, shape),
|
2016-05-29 17:58:38 +02:00
|
|
|
ast::ExprKind::If(ref cond, ref if_block, ref else_block) => {
|
2017-01-11 14:34:42 +13:00
|
|
|
ControlFlow::new_if(cond,
|
|
|
|
None,
|
|
|
|
if_block,
|
|
|
|
else_block.as_ref().map(|e| &**e),
|
|
|
|
expr_type == ExprType::SubExpression,
|
|
|
|
false,
|
|
|
|
expr.span)
|
2017-02-22 16:20:50 +13:00
|
|
|
.rewrite(context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::IfLet(ref pat, ref cond, ref if_block, ref else_block) => {
|
2017-01-11 14:34:42 +13:00
|
|
|
ControlFlow::new_if(cond,
|
|
|
|
Some(pat),
|
|
|
|
if_block,
|
|
|
|
else_block.as_ref().map(|e| &**e),
|
|
|
|
expr_type == ExprType::SubExpression,
|
|
|
|
false,
|
|
|
|
expr.span)
|
2017-02-22 16:20:50 +13:00
|
|
|
.rewrite(context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Match(ref cond, ref arms) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_match(context, cond, arms, shape, expr.span)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Path(ref qself, ref path) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_path(context, PathContext::Expr, qself.as_ref(), path, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Assign(ref lhs, ref rhs) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_assignment(context, lhs, rhs, None, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::AssignOp(ref op, ref lhs, ref rhs) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_assignment(context, lhs, rhs, Some(op), shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
2016-09-16 15:19:18 +12:00
|
|
|
ast::ExprKind::Continue(ref opt_ident) => {
|
2016-05-29 17:58:38 +02:00
|
|
|
let id_str = match *opt_ident {
|
|
|
|
Some(ident) => format!(" {}", ident.node),
|
|
|
|
None => String::new(),
|
|
|
|
};
|
|
|
|
wrap_str(format!("continue{}", id_str),
|
|
|
|
context.config.max_width,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
2016-12-23 11:13:00 -08:00
|
|
|
ast::ExprKind::Break(ref opt_ident, ref opt_expr) => {
|
2016-05-29 17:58:38 +02:00
|
|
|
let id_str = match *opt_ident {
|
|
|
|
Some(ident) => format!(" {}", ident.node),
|
|
|
|
None => String::new(),
|
|
|
|
};
|
2016-12-23 11:13:00 -08:00
|
|
|
|
|
|
|
if let Some(ref expr) = *opt_expr {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_unary_prefix(context, &format!("break{} ", id_str), &**expr, shape)
|
2016-12-23 11:13:00 -08:00
|
|
|
} else {
|
2017-01-31 08:28:48 +13:00
|
|
|
wrap_str(format!("break{}", id_str), context.config.max_width, shape)
|
2016-12-23 11:13:00 -08:00
|
|
|
}
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Closure(capture, ref fn_decl, ref body, _) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_closure(capture, fn_decl, body, expr.span, context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Try(..) |
|
|
|
|
ast::ExprKind::Field(..) |
|
|
|
|
ast::ExprKind::TupField(..) |
|
2017-01-31 08:28:48 +13:00
|
|
|
ast::ExprKind::MethodCall(..) => rewrite_chain(expr, context, shape),
|
2016-05-29 17:58:38 +02:00
|
|
|
ast::ExprKind::Mac(ref mac) => {
|
|
|
|
// Failure to rewrite a marco should not imply failure to
|
|
|
|
// rewrite the expression.
|
2017-02-22 16:20:50 +13:00
|
|
|
rewrite_macro(mac, None, context, shape, MacroPosition::Expression).or_else(|| {
|
|
|
|
wrap_str(context.snippet(expr.span), context.config.max_width, shape)
|
|
|
|
})
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
2017-01-31 08:28:48 +13:00
|
|
|
ast::ExprKind::Ret(None) => wrap_str("return".to_owned(), context.config.max_width, shape),
|
2016-05-29 17:58:38 +02:00
|
|
|
ast::ExprKind::Ret(Some(ref expr)) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_unary_prefix(context, "return ", &**expr, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
2017-01-31 08:28:48 +13:00
|
|
|
ast::ExprKind::Box(ref expr) => rewrite_unary_prefix(context, "box ", &**expr, shape),
|
2016-05-29 17:58:38 +02:00
|
|
|
ast::ExprKind::AddrOf(mutability, ref expr) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_expr_addrof(context, mutability, expr, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Cast(ref expr, ref ty) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_pair(&**expr, &**ty, "", " as ", "", context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Type(ref expr, ref ty) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_pair(&**expr, &**ty, "", ": ", "", context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Index(ref expr, ref index) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_index(&**expr, &**index, context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Repeat(ref expr, ref repeats) => {
|
2017-01-11 12:06:23 +13:00
|
|
|
let (lbr, rbr) = if context.config.spaces_within_square_brackets {
|
|
|
|
("[ ", " ]")
|
|
|
|
} else {
|
|
|
|
("[", "]")
|
|
|
|
};
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_pair(&**expr, &**repeats, lbr, "; ", rbr, context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
ast::ExprKind::Range(ref lhs, ref rhs, limits) => {
|
|
|
|
let delim = match limits {
|
|
|
|
ast::RangeLimits::HalfOpen => "..",
|
|
|
|
ast::RangeLimits::Closed => "...",
|
|
|
|
};
|
|
|
|
|
|
|
|
match (lhs.as_ref().map(|x| &**x), rhs.as_ref().map(|x| &**x)) {
|
|
|
|
(Some(ref lhs), Some(ref rhs)) => {
|
2016-09-17 01:44:51 +02:00
|
|
|
let sp_delim = if context.config.spaces_around_ranges {
|
|
|
|
format!(" {} ", delim)
|
|
|
|
} else {
|
|
|
|
delim.into()
|
|
|
|
};
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_pair(&**lhs, &**rhs, "", &sp_delim, "", context, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
(None, Some(ref rhs)) => {
|
2016-09-17 01:44:51 +02:00
|
|
|
let sp_delim = if context.config.spaces_around_ranges {
|
|
|
|
format!("{} ", delim)
|
|
|
|
} else {
|
|
|
|
delim.into()
|
|
|
|
};
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_unary_prefix(context, &sp_delim, &**rhs, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
(Some(ref lhs), None) => {
|
2016-09-17 01:44:51 +02:00
|
|
|
let sp_delim = if context.config.spaces_around_ranges {
|
|
|
|
format!(" {}", delim)
|
|
|
|
} else {
|
|
|
|
delim.into()
|
|
|
|
};
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_unary_suffix(context, &sp_delim, &**lhs, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
2017-01-31 08:28:48 +13:00
|
|
|
(None, None) => wrap_str(delim.into(), context.config.max_width, shape),
|
2015-09-23 22:51:37 -07:00
|
|
|
}
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
// We do not format these expressions yet, but they should still
|
|
|
|
// satisfy our width restrictions.
|
|
|
|
ast::ExprKind::InPlace(..) |
|
|
|
|
ast::ExprKind::InlineAsm(..) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
wrap_str(context.snippet(expr.span), context.config.max_width, shape)
|
2016-05-29 17:58:38 +02:00
|
|
|
}
|
|
|
|
};
|
2017-01-31 08:28:48 +13:00
|
|
|
result.and_then(|res| recover_comment_removed(res, expr.span, context, shape))
|
2015-06-16 17:29:05 +02:00
|
|
|
}
|
2015-04-21 21:01:19 +12:00
|
|
|
|
2015-10-17 14:19:55 +02:00
|
|
|
pub fn rewrite_pair<LHS, RHS>(lhs: &LHS,
|
|
|
|
rhs: &RHS,
|
|
|
|
prefix: &str,
|
|
|
|
infix: &str,
|
|
|
|
suffix: &str,
|
|
|
|
context: &RewriteContext,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-10-17 14:19:55 +02:00
|
|
|
-> Option<String>
|
2015-10-02 12:25:22 +02:00
|
|
|
where LHS: Rewrite,
|
|
|
|
RHS: Rewrite
|
|
|
|
{
|
2017-01-11 12:06:23 +13:00
|
|
|
// Get "full width" rhs and see if it fits on the current line. This
|
|
|
|
// usually works fairly well since it tends to place operands of
|
|
|
|
// operations with high precendence close together.
|
|
|
|
// Note that this is non-conservative, but its just to see if it's even
|
|
|
|
// worth trying to put everything on one line.
|
2017-02-21 14:43:43 +13:00
|
|
|
let rhs_shape = try_opt!(shape.sub_width(suffix.len()));
|
|
|
|
let rhs_result = rhs.rewrite(context, rhs_shape);
|
2015-10-08 23:07:19 +02:00
|
|
|
|
2017-01-11 12:06:23 +13:00
|
|
|
if let Some(rhs_result) = rhs_result {
|
|
|
|
// This is needed in case of line break not caused by a
|
|
|
|
// shortage of space, but by end-of-line comments, for example.
|
|
|
|
if !rhs_result.contains('\n') {
|
2017-02-21 14:43:43 +13:00
|
|
|
let lhs_shape = try_opt!(shape.sub_width(prefix.len() + infix.len()));
|
|
|
|
let lhs_result = lhs.rewrite(context, lhs_shape);
|
2017-01-11 12:06:23 +13:00
|
|
|
if let Some(lhs_result) = lhs_result {
|
|
|
|
let mut result = format!("{}{}{}", prefix, lhs_result, infix);
|
2015-10-08 23:07:19 +02:00
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
let remaining_width =
|
|
|
|
shape.width.checked_sub(last_line_width(&result)).unwrap_or(0);
|
2015-10-08 23:07:19 +02:00
|
|
|
|
2017-01-11 12:06:23 +13:00
|
|
|
if rhs_result.len() <= remaining_width {
|
|
|
|
result.push_str(&rhs_result);
|
|
|
|
result.push_str(suffix);
|
|
|
|
return Some(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try rewriting the rhs into the remaining space.
|
2017-02-21 14:43:43 +13:00
|
|
|
let rhs_shape = shape.shrink_left(last_line_width(&result) + suffix.len());
|
|
|
|
if let Some(rhs_shape) = rhs_shape {
|
|
|
|
if let Some(rhs_result) = rhs.rewrite(context, rhs_shape) {
|
|
|
|
// FIXME this should always hold.
|
|
|
|
if rhs_result.len() <= remaining_width {
|
|
|
|
result.push_str(&rhs_result);
|
|
|
|
result.push_str(suffix);
|
|
|
|
return Some(result);
|
|
|
|
}
|
2017-01-11 12:06:23 +13:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// We have to use multiple lines.
|
|
|
|
|
|
|
|
// Re-evaluate the rhs because we have more space now:
|
|
|
|
let infix = infix.trim_right();
|
2017-01-31 08:28:48 +13:00
|
|
|
let lhs_budget = try_opt!(context.config
|
2017-02-22 16:20:50 +13:00
|
|
|
.max_width
|
|
|
|
.checked_sub(shape.used_width() + prefix.len() +
|
|
|
|
infix.len()));
|
|
|
|
let rhs_shape = try_opt!(shape.sub_width(suffix.len() + prefix.len()))
|
|
|
|
.visual_indent(prefix.len());
|
2017-01-11 12:06:23 +13:00
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
let rhs_result = try_opt!(rhs.rewrite(context, rhs_shape));
|
|
|
|
let lhs_result = try_opt!(lhs.rewrite(context, Shape { width: lhs_budget, ..shape }));
|
2017-01-11 12:06:23 +13:00
|
|
|
Some(format!("{}{}{}\n{}{}{}",
|
|
|
|
prefix,
|
|
|
|
lhs_result,
|
|
|
|
infix,
|
2017-02-21 14:43:43 +13:00
|
|
|
rhs_shape.indent.to_string(context.config),
|
2017-01-11 12:06:23 +13:00
|
|
|
rhs_result,
|
|
|
|
suffix))
|
2015-10-02 11:31:40 +02:00
|
|
|
}
|
|
|
|
|
2015-09-14 22:53:30 +02:00
|
|
|
pub fn rewrite_array<'a, I>(expr_iter: I,
|
|
|
|
span: Span,
|
|
|
|
context: &RewriteContext,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-09-14 22:53:30 +02:00
|
|
|
-> Option<String>
|
|
|
|
where I: Iterator<Item = &'a ast::Expr>
|
2015-09-12 00:06:17 +02:00
|
|
|
{
|
2016-10-17 23:09:49 +03:00
|
|
|
let bracket_size = if context.config.spaces_within_square_brackets {
|
2017-01-17 12:01:10 +13:00
|
|
|
2 // "[ "
|
2016-10-17 23:09:49 +03:00
|
|
|
} else {
|
2017-01-17 12:01:10 +13:00
|
|
|
1 // "["
|
2016-10-17 23:09:49 +03:00
|
|
|
};
|
2017-02-21 14:43:43 +13:00
|
|
|
let nested_shape = try_opt!(shape.visual_indent(bracket_size).sub_width(bracket_size * 2));
|
2017-02-22 16:20:50 +13:00
|
|
|
let items = itemize_list(context.codemap,
|
|
|
|
expr_iter,
|
|
|
|
"]",
|
|
|
|
|item| item.span.lo,
|
|
|
|
|item| item.span.hi,
|
|
|
|
|item| item.rewrite(context, nested_shape),
|
|
|
|
span.lo,
|
|
|
|
span.hi)
|
2017-01-31 08:28:48 +13:00
|
|
|
.collect::<Vec<_>>();
|
2015-09-12 00:06:17 +02:00
|
|
|
|
2015-10-04 20:20:15 +02:00
|
|
|
let has_long_item = try_opt!(items.iter()
|
2017-02-22 16:20:50 +13:00
|
|
|
.map(|li| li.item.as_ref().map(|s| s.len() > 10))
|
|
|
|
.fold(Some(false),
|
|
|
|
|acc, x| acc.and_then(|y| x.map(|x| x || y))));
|
2015-10-06 22:13:14 +02:00
|
|
|
|
|
|
|
let tactic = if has_long_item || items.iter().any(ListItem::is_multiline) {
|
2017-02-21 14:43:43 +13:00
|
|
|
definitive_tactic(&items, ListTactic::HorizontalVertical, nested_shape.width)
|
2015-09-12 00:06:17 +02:00
|
|
|
} else {
|
2015-10-02 13:50:24 +02:00
|
|
|
DefinitiveListTactic::Mixed
|
2015-09-12 00:06:17 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
let fmt = ListFormatting {
|
|
|
|
tactic: tactic,
|
|
|
|
separator: ",",
|
|
|
|
trailing_separator: SeparatorTactic::Never,
|
2017-02-21 14:43:43 +13:00
|
|
|
shape: nested_shape,
|
2015-09-12 00:06:17 +02:00
|
|
|
ends_with_newline: false,
|
2015-09-05 22:39:28 -07:00
|
|
|
config: context.config,
|
2015-09-12 00:06:17 +02:00
|
|
|
};
|
|
|
|
let list_str = try_opt!(write_list(&items, &fmt));
|
|
|
|
|
2016-10-17 23:09:49 +03:00
|
|
|
Some(if context.config.spaces_within_square_brackets && list_str.len() > 0 {
|
2017-02-22 16:20:50 +13:00
|
|
|
format!("[ {} ]", list_str)
|
|
|
|
} else {
|
|
|
|
format!("[{}]", list_str)
|
|
|
|
})
|
2015-09-12 00:06:17 +02:00
|
|
|
}
|
|
|
|
|
2016-04-14 08:36:59 +12:00
|
|
|
// This functions is pretty messy because of the rules around closures and blocks:
|
2017-01-31 08:28:48 +13:00
|
|
|
// FIXME - the below is probably no longer true in full.
|
2016-04-14 08:36:59 +12:00
|
|
|
// * if there is a return type, then there must be braces,
|
2016-04-15 20:52:08 +12:00
|
|
|
// * given a closure with braces, whether that is parsed to give an inner block
|
|
|
|
// or not depends on if there is a return type and if there are statements
|
|
|
|
// in that block,
|
2016-04-14 08:36:59 +12:00
|
|
|
// * if the first expression in the body ends with a block (i.e., is a
|
|
|
|
// statement without needing a semi-colon), then adding or removing braces
|
|
|
|
// can change whether it is treated as an expression or statement.
|
2016-03-01 17:27:19 -05:00
|
|
|
fn rewrite_closure(capture: ast::CaptureBy,
|
2015-08-19 22:39:45 +02:00
|
|
|
fn_decl: &ast::FnDecl,
|
2016-11-21 08:37:35 +13:00
|
|
|
body: &ast::Expr,
|
2015-08-19 22:39:45 +02:00
|
|
|
span: Span,
|
|
|
|
context: &RewriteContext,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-08-19 22:39:45 +02:00
|
|
|
-> Option<String> {
|
2016-03-01 17:27:19 -05:00
|
|
|
let mover = if capture == ast::CaptureBy::Value {
|
2015-08-19 22:39:45 +02:00
|
|
|
"move "
|
|
|
|
} else {
|
|
|
|
""
|
|
|
|
};
|
|
|
|
// 4 = "|| {".len(), which is overconservative when the closure consists of
|
|
|
|
// a single expression.
|
2017-02-21 14:43:43 +13:00
|
|
|
let nested_shape = try_opt!(try_opt!(shape.shrink_left(mover.len())).sub_width(4));
|
2016-04-14 08:36:59 +12:00
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
// 1 = |
|
|
|
|
let argument_offset = nested_shape.indent + 1;
|
|
|
|
let arg_shape = try_opt!(nested_shape.shrink_left(1)).visual_indent(0);
|
|
|
|
let ret_str = try_opt!(fn_decl.output.rewrite(context, arg_shape));
|
2015-08-19 22:39:45 +02:00
|
|
|
|
2017-02-22 16:20:50 +13:00
|
|
|
let arg_items = itemize_list(context.codemap,
|
|
|
|
fn_decl.inputs.iter(),
|
|
|
|
"|",
|
|
|
|
|arg| span_lo_for_arg(arg),
|
|
|
|
|arg| span_hi_for_arg(arg),
|
|
|
|
|arg| arg.rewrite(context, arg_shape),
|
|
|
|
context.codemap.span_after(span, "|"),
|
|
|
|
body.span.lo);
|
2015-10-02 13:50:24 +02:00
|
|
|
let item_vec = arg_items.collect::<Vec<_>>();
|
2017-02-21 14:43:43 +13:00
|
|
|
// 1 = space between arguments and return type.
|
|
|
|
let horizontal_budget = nested_shape.width.checked_sub(ret_str.len() + 1).unwrap_or(0);
|
2015-10-06 22:13:14 +02:00
|
|
|
let tactic = definitive_tactic(&item_vec, ListTactic::HorizontalVertical, horizontal_budget);
|
2017-02-21 14:43:43 +13:00
|
|
|
let arg_shape = match tactic {
|
|
|
|
DefinitiveListTactic::Horizontal => try_opt!(arg_shape.sub_width(ret_str.len() + 1)),
|
|
|
|
_ => arg_shape,
|
2015-10-02 13:50:24 +02:00
|
|
|
};
|
2015-08-19 22:39:45 +02:00
|
|
|
|
2015-09-08 20:56:33 +02:00
|
|
|
let fmt = ListFormatting {
|
2015-10-02 13:50:24 +02:00
|
|
|
tactic: tactic,
|
2015-09-08 20:56:33 +02:00
|
|
|
separator: ",",
|
|
|
|
trailing_separator: SeparatorTactic::Never,
|
2017-02-21 14:43:43 +13:00
|
|
|
shape: arg_shape,
|
2015-09-08 20:56:33 +02:00
|
|
|
ends_with_newline: false,
|
2015-09-05 22:39:28 -07:00
|
|
|
config: context.config,
|
2015-09-08 20:56:33 +02:00
|
|
|
};
|
2015-10-02 13:50:24 +02:00
|
|
|
let list_str = try_opt!(write_list(&item_vec, &fmt));
|
2015-09-08 20:56:33 +02:00
|
|
|
let mut prefix = format!("{}|{}|", mover, list_str);
|
|
|
|
|
|
|
|
if !ret_str.is_empty() {
|
|
|
|
if prefix.contains('\n') {
|
|
|
|
prefix.push('\n');
|
2015-09-18 21:50:44 -07:00
|
|
|
prefix.push_str(&argument_offset.to_string(context.config));
|
2015-09-08 20:56:33 +02:00
|
|
|
} else {
|
|
|
|
prefix.push(' ');
|
|
|
|
}
|
|
|
|
prefix.push_str(&ret_str);
|
|
|
|
}
|
|
|
|
|
2016-04-14 08:36:59 +12:00
|
|
|
// 1 = space between `|...|` and body.
|
2017-02-21 14:43:43 +13:00
|
|
|
let extra_offset = extra_offset(&prefix, shape) + 1;
|
|
|
|
let body_shape = try_opt!(shape.sub_width(extra_offset)).add_offset(extra_offset);
|
2016-04-14 08:36:59 +12:00
|
|
|
|
2016-11-21 08:37:35 +13:00
|
|
|
if let ast::ExprKind::Block(ref block) = body.node {
|
2017-02-21 14:43:43 +13:00
|
|
|
// The body of the closure is an empty block.
|
2016-11-21 08:37:35 +13:00
|
|
|
if block.stmts.is_empty() && !block_contains_comment(block, context.codemap) {
|
|
|
|
return Some(format!("{} {{}}", prefix));
|
2016-04-15 20:52:08 +12:00
|
|
|
}
|
2016-04-14 08:36:59 +12:00
|
|
|
|
2016-11-21 08:37:35 +13:00
|
|
|
// Figure out if the block is necessary.
|
|
|
|
let needs_block = block.rules != ast::BlockCheckMode::Default || block.stmts.len() > 1 ||
|
|
|
|
block_contains_comment(block, context.codemap) ||
|
|
|
|
prefix.contains('\n');
|
|
|
|
|
|
|
|
if ret_str.is_empty() && !needs_block {
|
|
|
|
// lock.stmts.len() == 1
|
|
|
|
if let Some(ref expr) = stmt_expr(&block.stmts[0]) {
|
2017-02-22 16:20:50 +13:00
|
|
|
if let Some(rw) = rewrite_closure_expr(expr, &prefix, context, body_shape) {
|
2016-11-21 08:37:35 +13:00
|
|
|
return Some(rw);
|
2016-04-14 08:36:59 +12:00
|
|
|
}
|
|
|
|
}
|
2016-11-21 08:37:35 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
if !needs_block {
|
|
|
|
// We need braces, but we might still prefer a one-liner.
|
|
|
|
let stmt = &block.stmts[0];
|
|
|
|
// 4 = braces and spaces.
|
2017-02-22 16:20:50 +13:00
|
|
|
let mut rewrite = stmt.rewrite(context, try_opt!(body_shape.sub_width(4)));
|
2016-11-21 08:37:35 +13:00
|
|
|
|
|
|
|
// Checks if rewrite succeeded and fits on a single line.
|
|
|
|
rewrite = and_one_line(rewrite);
|
2016-04-14 08:36:59 +12:00
|
|
|
|
|
|
|
if let Some(rewrite) = rewrite {
|
2016-11-21 08:37:35 +13:00
|
|
|
return Some(format!("{} {{ {} }}", prefix, rewrite));
|
2016-04-14 08:36:59 +12:00
|
|
|
}
|
|
|
|
}
|
2016-11-21 08:37:35 +13:00
|
|
|
|
|
|
|
// Either we require a block, or tried without and failed.
|
2017-02-21 14:43:43 +13:00
|
|
|
return rewrite_closure_block(&block, prefix, context, body_shape);
|
2016-04-14 08:36:59 +12:00
|
|
|
}
|
|
|
|
|
2017-02-22 16:20:50 +13:00
|
|
|
if let Some(rw) = rewrite_closure_expr(body, &prefix, context, body_shape) {
|
2016-11-21 08:37:35 +13:00
|
|
|
return Some(rw);
|
|
|
|
}
|
2015-08-19 22:39:45 +02:00
|
|
|
|
2016-11-21 08:37:35 +13:00
|
|
|
// The closure originally had a non-block expression, but we can't fit on
|
|
|
|
// one line, so we'll insert a block.
|
|
|
|
let block = ast::Block {
|
|
|
|
stmts: vec![ast::Stmt {
|
|
|
|
id: ast::NodeId::new(0),
|
|
|
|
node: ast::StmtKind::Expr(ptr::P(body.clone())),
|
|
|
|
span: body.span,
|
|
|
|
}],
|
|
|
|
id: ast::NodeId::new(0),
|
|
|
|
rules: ast::BlockCheckMode::Default,
|
|
|
|
span: body.span,
|
|
|
|
};
|
2017-02-21 14:43:43 +13:00
|
|
|
return rewrite_closure_block(&block, prefix, context, body_shape.block());
|
2015-08-19 22:39:45 +02:00
|
|
|
|
2016-11-21 08:37:35 +13:00
|
|
|
fn rewrite_closure_expr(expr: &ast::Expr,
|
|
|
|
prefix: &str,
|
|
|
|
context: &RewriteContext,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2016-11-21 08:37:35 +13:00
|
|
|
-> Option<String> {
|
2017-01-31 08:28:48 +13:00
|
|
|
let mut rewrite = expr.rewrite(context, shape);
|
2016-11-21 08:37:35 +13:00
|
|
|
if classify::expr_requires_semi_to_be_stmt(left_most_sub_expr(expr)) {
|
|
|
|
rewrite = and_one_line(rewrite);
|
2015-08-19 22:39:45 +02:00
|
|
|
}
|
2016-11-21 08:37:35 +13:00
|
|
|
rewrite.map(|rw| format!("{} {}", prefix, rw))
|
2015-08-20 23:05:41 +02:00
|
|
|
}
|
|
|
|
|
2016-11-21 08:37:35 +13:00
|
|
|
fn rewrite_closure_block(block: &ast::Block,
|
|
|
|
prefix: String,
|
|
|
|
context: &RewriteContext,
|
2017-02-21 14:43:43 +13:00
|
|
|
shape: Shape)
|
2016-11-21 08:37:35 +13:00
|
|
|
-> Option<String> {
|
|
|
|
// Start with visual indent, then fall back to block indent if the
|
|
|
|
// closure is large.
|
2017-02-21 14:43:43 +13:00
|
|
|
let rewrite = try_opt!(block.rewrite(&context, shape));
|
2015-08-19 22:39:45 +02:00
|
|
|
|
2016-11-21 08:37:35 +13:00
|
|
|
let block_threshold = context.config.closure_block_indent_threshold;
|
|
|
|
if block_threshold < 0 || rewrite.matches('\n').count() <= block_threshold as usize {
|
|
|
|
return Some(format!("{} {}", prefix, rewrite));
|
|
|
|
}
|
|
|
|
|
|
|
|
// The body of the closure is big enough to be block indented, that
|
|
|
|
// means we must re-format.
|
2017-02-21 14:43:43 +13:00
|
|
|
let block_shape = shape.block();
|
|
|
|
let rewrite = try_opt!(block.rewrite(&context, block_shape));
|
2016-11-21 08:37:35 +13:00
|
|
|
Some(format!("{} {}", prefix, rewrite))
|
2016-04-22 11:29:01 +12:00
|
|
|
}
|
2015-08-19 22:39:45 +02:00
|
|
|
}
|
|
|
|
|
2016-04-14 08:36:59 +12:00
|
|
|
fn and_one_line(x: Option<String>) -> Option<String> {
|
2016-05-29 17:58:38 +02:00
|
|
|
x.and_then(|x| if x.contains('\n') { None } else { Some(x) })
|
2016-04-14 08:36:59 +12:00
|
|
|
}
|
|
|
|
|
2015-09-26 18:16:07 +02:00
|
|
|
fn nop_block_collapse(block_str: Option<String>, budget: usize) -> Option<String> {
|
2017-01-27 08:04:13 +13:00
|
|
|
debug!("nop_block_collapse {:?} {}", block_str, budget);
|
2016-11-21 08:37:35 +13:00
|
|
|
block_str.map(|block_str| if block_str.starts_with('{') && budget >= 2 &&
|
|
|
|
(block_str[1..].find(|c: char| !c.is_whitespace()).unwrap() ==
|
|
|
|
block_str.len() - 2) {
|
2017-02-22 16:20:50 +13:00
|
|
|
"{}".to_owned()
|
|
|
|
} else {
|
|
|
|
block_str.to_owned()
|
|
|
|
})
|
2015-09-24 10:22:06 +10:00
|
|
|
}
|
|
|
|
|
2015-07-13 21:51:56 +02:00
|
|
|
impl Rewrite for ast::Block {
|
2017-01-31 08:28:48 +13:00
|
|
|
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
|
|
|
|
// shape.width is used only for the single line case: either the empty block `{}`,
|
2016-06-09 00:43:08 +09:00
|
|
|
// or an unsafe expression `unsafe { e }`.
|
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
if self.stmts.is_empty() && !block_contains_comment(self, context.codemap) &&
|
|
|
|
shape.width >= 2 {
|
2017-01-16 16:37:58 +13:00
|
|
|
return Some("{}".to_owned());
|
|
|
|
}
|
|
|
|
|
|
|
|
// If a block contains only a single-line comment, then leave it on one line.
|
2015-07-17 23:10:15 +02:00
|
|
|
let user_str = context.snippet(self.span);
|
2017-01-16 16:37:58 +13:00
|
|
|
let user_str = user_str.trim();
|
|
|
|
if user_str.starts_with('{') && user_str.ends_with('}') {
|
|
|
|
let comment_str = user_str[1..user_str.len() - 1].trim();
|
|
|
|
if self.stmts.is_empty() && !comment_str.contains('\n') &&
|
2017-01-31 08:28:48 +13:00
|
|
|
!comment_str.starts_with("//") &&
|
|
|
|
comment_str.len() + 4 <= shape.width {
|
2017-01-16 16:37:58 +13:00
|
|
|
return Some(format!("{{ {} }}", comment_str));
|
|
|
|
}
|
2015-08-16 16:13:55 +12:00
|
|
|
}
|
|
|
|
|
2016-02-05 15:59:41 -05:00
|
|
|
let mut visitor = FmtVisitor::from_codemap(context.parse_session, context.config);
|
2017-02-21 14:43:43 +13:00
|
|
|
visitor.block_indent = shape.indent;
|
2015-07-13 21:51:56 +02:00
|
|
|
|
2015-08-01 14:22:31 +02:00
|
|
|
let prefix = match self.rules {
|
2016-03-01 17:27:19 -05:00
|
|
|
ast::BlockCheckMode::Unsafe(..) => {
|
2015-07-17 23:10:15 +02:00
|
|
|
let snippet = context.snippet(self.span);
|
2015-08-01 14:22:31 +02:00
|
|
|
let open_pos = try_opt!(snippet.find_uncommented("{"));
|
|
|
|
visitor.last_pos = self.span.lo + BytePos(open_pos as u32);
|
|
|
|
|
|
|
|
// Extract comment between unsafe and block start.
|
|
|
|
let trimmed = &snippet[6..open_pos].trim();
|
|
|
|
|
2015-09-05 18:26:28 +12:00
|
|
|
let prefix = if !trimmed.is_empty() {
|
2015-08-01 14:22:31 +02:00
|
|
|
// 9 = "unsafe {".len(), 7 = "unsafe ".len()
|
2017-01-31 08:28:48 +13:00
|
|
|
let budget = try_opt!(shape.width.checked_sub(9));
|
2015-09-05 22:39:28 -07:00
|
|
|
format!("unsafe {} ",
|
2015-09-25 12:53:25 +02:00
|
|
|
try_opt!(rewrite_comment(trimmed,
|
|
|
|
true,
|
2017-01-31 08:28:48 +13:00
|
|
|
Shape::legacy(budget, shape.indent + 7),
|
2015-09-25 12:53:25 +02:00
|
|
|
context.config)))
|
2015-08-01 14:22:31 +02:00
|
|
|
} else {
|
|
|
|
"unsafe ".to_owned()
|
2015-09-05 18:26:28 +12:00
|
|
|
};
|
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
if is_simple_block(self, context.codemap) && prefix.len() < shape.width {
|
2017-02-22 16:20:50 +13:00
|
|
|
let expr_str =
|
|
|
|
self.stmts[0].rewrite(context,
|
|
|
|
Shape::legacy(shape.width - prefix.len(),
|
|
|
|
shape.indent));
|
2016-09-16 15:19:18 +12:00
|
|
|
let expr_str = try_opt!(expr_str);
|
|
|
|
let result = format!("{}{{ {} }}", prefix, expr_str);
|
2017-01-31 08:28:48 +13:00
|
|
|
if result.len() <= shape.width && !result.contains('\n') {
|
2016-09-16 15:19:18 +12:00
|
|
|
return Some(result);
|
2015-09-05 18:26:28 +12:00
|
|
|
}
|
2015-08-01 14:22:31 +02:00
|
|
|
}
|
2015-09-05 18:26:28 +12:00
|
|
|
|
|
|
|
prefix
|
2015-08-01 14:22:31 +02:00
|
|
|
}
|
2016-03-01 17:27:19 -05:00
|
|
|
ast::BlockCheckMode::Default => {
|
2015-08-01 14:22:31 +02:00
|
|
|
visitor.last_pos = self.span.lo;
|
|
|
|
|
|
|
|
String::new()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2015-07-13 21:51:56 +02:00
|
|
|
visitor.visit_block(self);
|
|
|
|
|
2015-07-26 14:05:43 +02:00
|
|
|
Some(format!("{}{}", prefix, visitor.buffer))
|
2015-07-13 21:51:56 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-19 02:08:17 -06:00
|
|
|
impl Rewrite for ast::Stmt {
|
2017-01-31 08:28:48 +13:00
|
|
|
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
|
2016-01-10 15:12:15 +01:00
|
|
|
let result = match self.node {
|
2016-09-16 15:19:18 +12:00
|
|
|
ast::StmtKind::Local(ref local) => {
|
2017-01-31 08:28:48 +13:00
|
|
|
local.rewrite(context,
|
|
|
|
Shape::legacy(context.config.max_width, shape.indent))
|
2015-11-19 02:08:17 -06:00
|
|
|
}
|
2016-09-16 15:19:18 +12:00
|
|
|
ast::StmtKind::Expr(ref ex) |
|
|
|
|
ast::StmtKind::Semi(ref ex) => {
|
2016-05-29 17:58:38 +02:00
|
|
|
let suffix = if semicolon_for_stmt(self) { ";" } else { "" };
|
2015-11-19 02:08:17 -06:00
|
|
|
|
2016-05-29 17:58:38 +02:00
|
|
|
format_expr(ex,
|
2016-09-16 15:19:18 +12:00
|
|
|
match self.node {
|
|
|
|
ast::StmtKind::Expr(_) => ExprType::SubExpression,
|
|
|
|
ast::StmtKind::Semi(_) => ExprType::Statement,
|
|
|
|
_ => unreachable!(),
|
|
|
|
},
|
2016-05-29 17:58:38 +02:00
|
|
|
context,
|
2017-02-21 14:43:43 +13:00
|
|
|
try_opt!(shape.sub_width(suffix.len())))
|
2017-02-22 16:20:50 +13:00
|
|
|
.map(|s| s + suffix)
|
2015-11-19 02:08:17 -06:00
|
|
|
}
|
2016-09-16 15:19:18 +12:00
|
|
|
ast::StmtKind::Mac(..) |
|
|
|
|
ast::StmtKind::Item(..) => None,
|
2016-01-10 15:12:15 +01:00
|
|
|
};
|
2017-01-31 08:28:48 +13:00
|
|
|
result.and_then(|res| recover_comment_removed(res, self.span, context, shape))
|
2015-11-19 02:08:17 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-11 14:34:42 +13:00
|
|
|
// Abstraction over control flow expressions
|
2017-01-27 09:14:26 +13:00
|
|
|
#[derive(Debug)]
|
2017-01-11 14:34:42 +13:00
|
|
|
struct ControlFlow<'a> {
|
2015-07-20 23:29:25 +02:00
|
|
|
cond: Option<&'a ast::Expr>,
|
|
|
|
block: &'a ast::Block,
|
2017-01-11 14:34:42 +13:00
|
|
|
else_block: Option<&'a ast::Expr>,
|
2016-05-30 14:53:04 +02:00
|
|
|
label: Option<ast::SpannedIdent>,
|
2015-07-20 23:29:25 +02:00
|
|
|
pat: Option<&'a ast::Pat>,
|
|
|
|
keyword: &'a str,
|
|
|
|
matcher: &'a str,
|
|
|
|
connector: &'a str,
|
2017-01-11 14:34:42 +13:00
|
|
|
allow_single_line: bool,
|
|
|
|
// True if this is an `if` expression in an `else if` :-( hacky
|
|
|
|
nested_if: bool,
|
|
|
|
span: Span,
|
2015-07-20 23:29:25 +02:00
|
|
|
}
|
|
|
|
|
2017-01-11 14:34:42 +13:00
|
|
|
impl<'a> ControlFlow<'a> {
|
|
|
|
fn new_if(cond: &'a ast::Expr,
|
|
|
|
pat: Option<&'a ast::Pat>,
|
|
|
|
block: &'a ast::Block,
|
|
|
|
else_block: Option<&'a ast::Expr>,
|
|
|
|
allow_single_line: bool,
|
|
|
|
nested_if: bool,
|
|
|
|
span: Span)
|
|
|
|
-> ControlFlow<'a> {
|
|
|
|
ControlFlow {
|
|
|
|
cond: Some(cond),
|
|
|
|
block: block,
|
|
|
|
else_block: else_block,
|
|
|
|
label: None,
|
|
|
|
pat: pat,
|
|
|
|
keyword: "if",
|
|
|
|
matcher: match pat {
|
|
|
|
Some(..) => "let",
|
|
|
|
None => "",
|
|
|
|
},
|
|
|
|
connector: " =",
|
|
|
|
allow_single_line: allow_single_line,
|
|
|
|
nested_if: nested_if,
|
|
|
|
span: span,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn new_loop(block: &'a ast::Block,
|
|
|
|
label: Option<ast::SpannedIdent>,
|
|
|
|
span: Span)
|
|
|
|
-> ControlFlow<'a> {
|
|
|
|
ControlFlow {
|
2015-07-20 23:29:25 +02:00
|
|
|
cond: None,
|
|
|
|
block: block,
|
2017-01-11 14:34:42 +13:00
|
|
|
else_block: None,
|
2015-07-20 23:29:25 +02:00
|
|
|
label: label,
|
|
|
|
pat: None,
|
|
|
|
keyword: "loop",
|
|
|
|
matcher: "",
|
|
|
|
connector: "",
|
2017-01-11 14:34:42 +13:00
|
|
|
allow_single_line: false,
|
|
|
|
nested_if: false,
|
|
|
|
span: span,
|
2015-07-20 23:29:25 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn new_while(pat: Option<&'a ast::Pat>,
|
|
|
|
cond: &'a ast::Expr,
|
|
|
|
block: &'a ast::Block,
|
2017-01-11 14:34:42 +13:00
|
|
|
label: Option<ast::SpannedIdent>,
|
|
|
|
span: Span)
|
|
|
|
-> ControlFlow<'a> {
|
|
|
|
ControlFlow {
|
2015-07-20 23:29:25 +02:00
|
|
|
cond: Some(cond),
|
|
|
|
block: block,
|
2017-01-11 14:34:42 +13:00
|
|
|
else_block: None,
|
2015-07-20 23:29:25 +02:00
|
|
|
label: label,
|
|
|
|
pat: pat,
|
2017-01-11 14:34:42 +13:00
|
|
|
keyword: "while",
|
2015-07-20 23:29:25 +02:00
|
|
|
matcher: match pat {
|
2017-01-11 14:34:42 +13:00
|
|
|
Some(..) => "let",
|
2015-08-16 15:58:17 +12:00
|
|
|
None => "",
|
2015-07-20 23:29:25 +02:00
|
|
|
},
|
|
|
|
connector: " =",
|
2017-01-11 14:34:42 +13:00
|
|
|
allow_single_line: false,
|
|
|
|
nested_if: false,
|
|
|
|
span: span,
|
2015-07-20 23:29:25 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn new_for(pat: &'a ast::Pat,
|
|
|
|
cond: &'a ast::Expr,
|
|
|
|
block: &'a ast::Block,
|
2017-01-11 14:34:42 +13:00
|
|
|
label: Option<ast::SpannedIdent>,
|
|
|
|
span: Span)
|
|
|
|
-> ControlFlow<'a> {
|
|
|
|
ControlFlow {
|
2015-07-20 23:29:25 +02:00
|
|
|
cond: Some(cond),
|
|
|
|
block: block,
|
2017-01-11 14:34:42 +13:00
|
|
|
else_block: None,
|
2015-07-20 23:29:25 +02:00
|
|
|
label: label,
|
|
|
|
pat: Some(pat),
|
2017-01-11 14:34:42 +13:00
|
|
|
keyword: "for",
|
2015-07-20 23:29:25 +02:00
|
|
|
matcher: "",
|
|
|
|
connector: " in",
|
2017-01-11 14:34:42 +13:00
|
|
|
allow_single_line: false,
|
|
|
|
nested_if: false,
|
|
|
|
span: span,
|
2015-07-20 23:29:25 +02:00
|
|
|
}
|
|
|
|
}
|
2017-01-11 14:34:42 +13:00
|
|
|
|
|
|
|
fn rewrite_single_line(&self,
|
|
|
|
pat_expr_str: &str,
|
|
|
|
context: &RewriteContext,
|
|
|
|
width: usize)
|
|
|
|
-> Option<String> {
|
|
|
|
assert!(self.allow_single_line);
|
|
|
|
let else_block = try_opt!(self.else_block);
|
|
|
|
let fixed_cost = self.keyword.len() + " { } else { }".len();
|
|
|
|
|
|
|
|
if let ast::ExprKind::Block(ref else_node) = else_block.node {
|
|
|
|
if !is_simple_block(self.block, context.codemap) ||
|
|
|
|
!is_simple_block(else_node, context.codemap) ||
|
|
|
|
pat_expr_str.contains('\n') {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
let new_width = try_opt!(width.checked_sub(pat_expr_str.len() + fixed_cost));
|
|
|
|
let expr = &self.block.stmts[0];
|
2017-01-31 08:28:48 +13:00
|
|
|
let if_str = try_opt!(expr.rewrite(context, Shape::legacy(new_width, Indent::empty())));
|
2017-01-11 14:34:42 +13:00
|
|
|
|
|
|
|
let new_width = try_opt!(new_width.checked_sub(if_str.len()));
|
|
|
|
let else_expr = &else_node.stmts[0];
|
2017-02-22 16:20:50 +13:00
|
|
|
let else_str = try_opt!(else_expr.rewrite(context,
|
|
|
|
Shape::legacy(new_width, Indent::empty())));
|
2017-01-11 14:34:42 +13:00
|
|
|
|
|
|
|
if if_str.contains('\n') || else_str.contains('\n') {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
let result = format!("{} {} {{ {} }} else {{ {} }}",
|
|
|
|
self.keyword,
|
|
|
|
pat_expr_str,
|
|
|
|
if_str,
|
|
|
|
else_str);
|
|
|
|
|
|
|
|
if result.len() <= width {
|
|
|
|
return Some(result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
None
|
|
|
|
}
|
2015-07-20 23:29:25 +02:00
|
|
|
}
|
|
|
|
|
2017-01-11 14:34:42 +13:00
|
|
|
impl<'a> Rewrite for ControlFlow<'a> {
|
2017-01-31 08:28:48 +13:00
|
|
|
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
|
|
|
|
debug!("ControlFlow::rewrite {:?} {:?}", self, shape);
|
2017-02-21 14:43:43 +13:00
|
|
|
let constr_shape = if self.nested_if {
|
2017-01-11 14:34:42 +13:00
|
|
|
// We are part of an if-elseif-else chain. Our constraints are tightened.
|
|
|
|
// 7 = "} else " .len()
|
2017-02-21 14:43:43 +13:00
|
|
|
try_opt!(shape.shrink_left(7))
|
2017-01-11 14:34:42 +13:00
|
|
|
} else {
|
2017-02-21 14:43:43 +13:00
|
|
|
shape
|
2017-01-11 14:34:42 +13:00
|
|
|
};
|
|
|
|
|
2015-07-20 23:29:25 +02:00
|
|
|
let label_string = rewrite_label(self.label);
|
2017-01-11 14:34:42 +13:00
|
|
|
// 1 = space after keyword.
|
2017-02-21 14:43:43 +13:00
|
|
|
let add_offset = self.keyword.len() + label_string.len() + 1;
|
2015-07-20 23:29:25 +02:00
|
|
|
|
|
|
|
let pat_expr_string = match self.cond {
|
2015-11-20 21:05:10 +01:00
|
|
|
Some(cond) => {
|
2017-02-21 14:43:43 +13:00
|
|
|
let mut cond_shape = try_opt!(constr_shape.shrink_left(add_offset));
|
|
|
|
if context.config.control_brace_style != ControlBraceStyle::AlwaysNextLine {
|
|
|
|
// 2 = " {".len()
|
|
|
|
cond_shape = try_opt!(cond_shape.sub_width(2));
|
|
|
|
}
|
|
|
|
|
2015-11-20 21:05:10 +01:00
|
|
|
try_opt!(rewrite_pat_expr(context,
|
|
|
|
self.pat,
|
|
|
|
cond,
|
|
|
|
self.matcher,
|
|
|
|
self.connector,
|
2017-02-21 14:43:43 +13:00
|
|
|
cond_shape))
|
2015-11-20 21:05:10 +01:00
|
|
|
}
|
2015-08-16 15:58:17 +12:00
|
|
|
None => String::new(),
|
2015-07-20 23:29:25 +02:00
|
|
|
};
|
|
|
|
|
2017-01-11 14:34:42 +13:00
|
|
|
// Try to format if-else on single line.
|
|
|
|
if self.allow_single_line && context.config.single_line_if_else_max_width > 0 {
|
2017-01-31 08:28:48 +13:00
|
|
|
let trial = self.rewrite_single_line(&pat_expr_string, context, shape.width);
|
2016-06-09 00:43:08 +09:00
|
|
|
|
2017-01-11 14:34:42 +13:00
|
|
|
if trial.is_some() &&
|
|
|
|
trial.as_ref().unwrap().len() <= context.config.single_line_if_else_max_width {
|
|
|
|
return trial;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
let used_width = if pat_expr_string.contains('\n') {
|
|
|
|
last_line_width(&pat_expr_string)
|
|
|
|
} else {
|
|
|
|
// 2 = spaces after keyword and condition.
|
|
|
|
label_string.len() + self.keyword.len() + pat_expr_string.len() + 2
|
|
|
|
};
|
2017-02-22 10:54:51 +13:00
|
|
|
|
|
|
|
let block_width = shape.width.checked_sub(used_width).unwrap_or(0);
|
2017-01-16 16:37:58 +13:00
|
|
|
// This is used only for the empty block case: `{}`. So, we use 1 if we know
|
|
|
|
// we should avoid the single line case.
|
|
|
|
let block_width = if self.else_block.is_some() || self.nested_if {
|
|
|
|
min(1, block_width)
|
|
|
|
} else {
|
|
|
|
block_width
|
|
|
|
};
|
2017-01-11 14:34:42 +13:00
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
// TODO this .block() - not what we want if we are actually visually indented
|
|
|
|
let block_shape = Shape { width: block_width, ..shape };
|
|
|
|
let block_str = try_opt!(self.block.rewrite(context, block_shape));
|
2017-01-11 14:34:42 +13:00
|
|
|
|
|
|
|
let cond_span = if let Some(cond) = self.cond {
|
|
|
|
cond.span
|
|
|
|
} else {
|
|
|
|
mk_sp(self.block.span.lo, self.block.span.lo)
|
|
|
|
};
|
|
|
|
|
|
|
|
// for event in event
|
|
|
|
let between_kwd_cond =
|
|
|
|
mk_sp(context.codemap.span_after(self.span, self.keyword.trim()),
|
|
|
|
self.pat.map_or(cond_span.lo, |p| if self.matcher.is_empty() {
|
2017-02-22 16:20:50 +13:00
|
|
|
p.span.lo
|
|
|
|
} else {
|
|
|
|
context.codemap.span_before(self.span, self.matcher.trim())
|
|
|
|
}));
|
2017-01-11 14:34:42 +13:00
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
let between_kwd_cond_comment = extract_comment(between_kwd_cond, context, shape);
|
2017-01-11 14:34:42 +13:00
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
let after_cond_comment =
|
|
|
|
extract_comment(mk_sp(cond_span.hi, self.block.span.lo), context, shape);
|
2017-01-11 14:34:42 +13:00
|
|
|
|
2017-02-22 16:20:50 +13:00
|
|
|
let alt_block_sep = String::from("\n") +
|
|
|
|
&shape.indent.block_only().to_string(context.config);
|
2017-01-11 14:34:42 +13:00
|
|
|
let block_sep = if self.cond.is_none() && between_kwd_cond_comment.is_some() {
|
|
|
|
""
|
|
|
|
} else if context.config.control_brace_style ==
|
2017-01-31 23:35:57 +01:00
|
|
|
ControlBraceStyle::AlwaysNextLine {
|
2017-01-11 14:34:42 +13:00
|
|
|
alt_block_sep.as_str()
|
|
|
|
} else {
|
|
|
|
" "
|
|
|
|
};
|
|
|
|
|
2017-02-22 16:20:50 +13:00
|
|
|
let mut result =
|
|
|
|
format!("{}{}{}{}{}{}",
|
|
|
|
label_string,
|
|
|
|
self.keyword,
|
|
|
|
between_kwd_cond_comment.as_ref()
|
|
|
|
.map_or(if pat_expr_string.is_empty() { "" } else { " " }, |s| &**s),
|
|
|
|
pat_expr_string,
|
|
|
|
after_cond_comment.as_ref().map_or(block_sep, |s| &**s),
|
|
|
|
block_str);
|
2017-01-11 14:34:42 +13:00
|
|
|
|
|
|
|
if let Some(else_block) = self.else_block {
|
2017-01-31 23:35:57 +01:00
|
|
|
// Since this is an else block, we should not indent for the assignment preceding
|
2017-02-21 14:43:43 +13:00
|
|
|
// the original if, so set shape.offset to 0.
|
|
|
|
let shape = Shape { offset: 0, ..shape };
|
2017-01-11 14:34:42 +13:00
|
|
|
let mut last_in_chain = false;
|
|
|
|
let rewrite = match else_block.node {
|
|
|
|
// If the else expression is another if-else expression, prevent it
|
|
|
|
// from being formatted on a single line.
|
2017-01-31 08:28:48 +13:00
|
|
|
// Note how we're passing the original shape, as the
|
2017-01-11 14:34:42 +13:00
|
|
|
// cost of "else" should not cascade.
|
|
|
|
ast::ExprKind::IfLet(ref pat, ref cond, ref if_block, ref next_else_block) => {
|
|
|
|
ControlFlow::new_if(cond,
|
|
|
|
Some(pat),
|
|
|
|
if_block,
|
|
|
|
next_else_block.as_ref().map(|e| &**e),
|
|
|
|
false,
|
|
|
|
true,
|
|
|
|
mk_sp(else_block.span.lo, self.span.hi))
|
2017-02-22 16:20:50 +13:00
|
|
|
.rewrite(context, shape.visual_indent(0))
|
2017-01-11 14:34:42 +13:00
|
|
|
}
|
|
|
|
ast::ExprKind::If(ref cond, ref if_block, ref next_else_block) => {
|
|
|
|
ControlFlow::new_if(cond,
|
|
|
|
None,
|
|
|
|
if_block,
|
|
|
|
next_else_block.as_ref().map(|e| &**e),
|
|
|
|
false,
|
|
|
|
true,
|
|
|
|
mk_sp(else_block.span.lo, self.span.hi))
|
2017-02-22 16:20:50 +13:00
|
|
|
.rewrite(context, shape.visual_indent(0))
|
2017-01-11 14:34:42 +13:00
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
last_in_chain = true;
|
2017-01-16 16:37:58 +13:00
|
|
|
// When rewriting a block, the width is only used for single line
|
|
|
|
// blocks, passing 1 lets us avoid that.
|
2017-02-21 14:43:43 +13:00
|
|
|
let else_shape = Shape { width: min(1, shape.width), ..shape };
|
|
|
|
else_block.rewrite(context, else_shape)
|
2017-01-11 14:34:42 +13:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let between_kwd_else_block =
|
|
|
|
mk_sp(self.block.span.hi,
|
|
|
|
context.codemap
|
|
|
|
.span_before(mk_sp(self.block.span.hi, else_block.span.lo), "else"));
|
|
|
|
let between_kwd_else_block_comment =
|
2017-01-31 08:28:48 +13:00
|
|
|
extract_comment(between_kwd_else_block, context, shape);
|
2017-01-11 14:34:42 +13:00
|
|
|
|
2017-02-22 16:20:50 +13:00
|
|
|
let after_else =
|
|
|
|
mk_sp(context.codemap
|
|
|
|
.span_after(mk_sp(self.block.span.hi, else_block.span.lo), "else"),
|
|
|
|
else_block.span.lo);
|
2017-01-31 08:28:48 +13:00
|
|
|
let after_else_comment = extract_comment(after_else, context, shape);
|
2017-01-11 14:34:42 +13:00
|
|
|
|
|
|
|
let between_sep = match context.config.control_brace_style {
|
|
|
|
ControlBraceStyle::AlwaysNextLine |
|
|
|
|
ControlBraceStyle::ClosingNextLine => &*alt_block_sep,
|
|
|
|
ControlBraceStyle::AlwaysSameLine => " ",
|
|
|
|
};
|
|
|
|
let after_sep = match context.config.control_brace_style {
|
|
|
|
ControlBraceStyle::AlwaysNextLine if last_in_chain => &*alt_block_sep,
|
|
|
|
_ => " ",
|
|
|
|
};
|
|
|
|
try_opt!(write!(&mut result,
|
|
|
|
"{}else{}",
|
|
|
|
between_kwd_else_block_comment.as_ref()
|
|
|
|
.map_or(between_sep, |s| &**s),
|
|
|
|
after_else_comment.as_ref().map_or(after_sep, |s| &**s))
|
2017-02-22 16:20:50 +13:00
|
|
|
.ok());
|
2017-01-11 14:34:42 +13:00
|
|
|
result.push_str(&try_opt!(rewrite));
|
|
|
|
}
|
|
|
|
|
|
|
|
Some(result)
|
2015-07-20 23:29:25 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-30 14:53:04 +02:00
|
|
|
fn rewrite_label(label: Option<ast::SpannedIdent>) -> String {
|
2015-07-16 16:29:28 +02:00
|
|
|
match label {
|
2016-05-30 14:53:04 +02:00
|
|
|
Some(ident) => format!("{}: ", ident.node),
|
2015-08-16 15:58:17 +12:00
|
|
|
None => "".to_owned(),
|
2015-07-16 16:29:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
fn extract_comment(span: Span, context: &RewriteContext, shape: Shape) -> Option<String> {
|
2016-01-12 01:09:08 +01:00
|
|
|
let comment_str = context.snippet(span);
|
|
|
|
if contains_comment(&comment_str) {
|
2017-01-31 08:28:48 +13:00
|
|
|
let comment = try_opt!(rewrite_comment(comment_str.trim(), false, shape, context.config));
|
2016-01-12 01:09:08 +01:00
|
|
|
Some(format!("\n{indent}{}\n{indent}",
|
|
|
|
comment,
|
2017-01-31 08:28:48 +13:00
|
|
|
indent = shape.indent.to_string(context.config)))
|
2016-01-12 01:09:08 +01:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-19 20:11:32 -06:00
|
|
|
fn block_contains_comment(block: &ast::Block, codemap: &CodeMap) -> bool {
|
2015-08-25 21:46:58 +02:00
|
|
|
let snippet = codemap.span_to_snippet(block.span).unwrap();
|
2015-11-19 20:11:32 -06:00
|
|
|
contains_comment(&snippet)
|
|
|
|
}
|
2015-08-25 21:46:58 +02:00
|
|
|
|
2015-11-19 20:11:32 -06:00
|
|
|
// Checks that a block contains no statements, an expression and no comments.
|
2015-11-20 21:05:10 +01:00
|
|
|
// FIXME: incorrectly returns false when comment is contained completely within
|
|
|
|
// the expression.
|
2015-11-19 20:11:32 -06:00
|
|
|
pub fn is_simple_block(block: &ast::Block, codemap: &CodeMap) -> bool {
|
2017-01-16 16:37:58 +13:00
|
|
|
(block.stmts.len() == 1 && stmt_is_expr(&block.stmts[0]) &&
|
|
|
|
!block_contains_comment(block, codemap))
|
2015-08-25 21:46:58 +02:00
|
|
|
}
|
|
|
|
|
2015-11-19 01:53:25 -06:00
|
|
|
/// Checks whether a block contains at most one statement or expression, and no comments.
|
|
|
|
pub fn is_simple_block_stmt(block: &ast::Block, codemap: &CodeMap) -> bool {
|
2016-09-16 15:19:18 +12:00
|
|
|
block.stmts.len() <= 1 && !block_contains_comment(block, codemap)
|
2015-11-19 01:53:25 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Checks whether a block contains no statements, expressions, or comments.
|
|
|
|
pub fn is_empty_block(block: &ast::Block, codemap: &CodeMap) -> bool {
|
2016-09-16 15:19:18 +12:00
|
|
|
block.stmts.is_empty() && !block_contains_comment(block, codemap)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn stmt_is_expr(stmt: &ast::Stmt) -> bool {
|
|
|
|
match stmt.node {
|
|
|
|
ast::StmtKind::Expr(..) => true,
|
|
|
|
_ => false,
|
|
|
|
}
|
2015-11-19 01:53:25 -06:00
|
|
|
}
|
|
|
|
|
2015-11-14 21:57:31 +01:00
|
|
|
fn is_unsafe_block(block: &ast::Block) -> bool {
|
2016-03-01 17:27:19 -05:00
|
|
|
if let ast::BlockCheckMode::Unsafe(..) = block.rules {
|
2015-11-14 21:57:31 +01:00
|
|
|
true
|
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-24 10:22:06 +10:00
|
|
|
// inter-match-arm-comment-rules:
|
|
|
|
// - all comments following a match arm before the start of the next arm
|
|
|
|
// are about the second arm
|
|
|
|
fn rewrite_match_arm_comment(context: &RewriteContext,
|
|
|
|
missed_str: &str,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape,
|
2015-09-24 10:22:06 +10:00
|
|
|
arm_indent_str: &str)
|
2015-09-25 12:53:25 +02:00
|
|
|
-> Option<String> {
|
2015-09-24 10:22:06 +10:00
|
|
|
// The leading "," is not part of the arm-comment
|
|
|
|
let missed_str = match missed_str.find_uncommented(",") {
|
2015-10-02 11:48:52 +02:00
|
|
|
Some(n) => &missed_str[n + 1..],
|
2015-09-24 10:22:06 +10:00
|
|
|
None => &missed_str[..],
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut result = String::new();
|
|
|
|
// any text not preceeded by a newline is pushed unmodified to the block
|
|
|
|
let first_brk = missed_str.find(|c: char| c == '\n').unwrap_or(0);
|
|
|
|
result.push_str(&missed_str[..first_brk]);
|
|
|
|
let missed_str = &missed_str[first_brk..]; // If missed_str had one newline, it starts with it
|
|
|
|
|
|
|
|
let first = missed_str.find(|c: char| !c.is_whitespace()).unwrap_or(missed_str.len());
|
|
|
|
if missed_str[..first].chars().filter(|c| c == &'\n').count() >= 2 {
|
|
|
|
// Excessive vertical whitespace before comment should be preserved
|
|
|
|
// TODO handle vertical whitespace better
|
|
|
|
result.push('\n');
|
|
|
|
}
|
|
|
|
let missed_str = missed_str[first..].trim();
|
|
|
|
if !missed_str.is_empty() {
|
2017-01-31 08:28:48 +13:00
|
|
|
let comment = try_opt!(rewrite_comment(&missed_str, false, shape, context.config));
|
2015-09-24 10:22:06 +10:00
|
|
|
result.push('\n');
|
|
|
|
result.push_str(arm_indent_str);
|
2015-09-25 12:53:25 +02:00
|
|
|
result.push_str(&comment);
|
2015-09-24 10:22:06 +10:00
|
|
|
}
|
2015-09-25 12:53:25 +02:00
|
|
|
|
|
|
|
Some(result)
|
2015-09-24 10:22:06 +10:00
|
|
|
}
|
|
|
|
|
2015-08-14 20:00:22 +12:00
|
|
|
fn rewrite_match(context: &RewriteContext,
|
|
|
|
cond: &ast::Expr,
|
|
|
|
arms: &[ast::Arm],
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape,
|
2015-09-21 17:40:59 +05:30
|
|
|
span: Span)
|
2015-08-14 20:00:22 +12:00
|
|
|
-> Option<String> {
|
2015-08-21 13:31:09 +02:00
|
|
|
if arms.is_empty() {
|
2015-08-17 09:41:45 +12:00
|
|
|
return None;
|
|
|
|
}
|
2015-08-14 20:00:22 +12:00
|
|
|
|
|
|
|
// `match `cond` {`
|
2017-01-31 08:28:48 +13:00
|
|
|
let cond_budget = try_opt!(shape.width.checked_sub(8));
|
|
|
|
let cond_str = try_opt!(cond.rewrite(context, Shape::legacy(cond_budget, shape.indent + 6)));
|
2017-02-21 14:43:43 +13:00
|
|
|
let alt_block_sep = String::from("\n") + &shape.indent.block_only().to_string(context.config);
|
2016-04-17 11:01:16 -06:00
|
|
|
let block_sep = match context.config.control_brace_style {
|
|
|
|
ControlBraceStyle::AlwaysSameLine => " ",
|
2017-01-11 14:34:42 +13:00
|
|
|
_ => alt_block_sep.as_str(),
|
2016-04-17 11:01:16 -06:00
|
|
|
};
|
|
|
|
let mut result = format!("match {}{}{{", cond_str, block_sep);
|
2015-08-14 20:00:22 +12:00
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
let arm_shape = shape.block_indent(context.config.tab_spaces);
|
|
|
|
let arm_indent_str = arm_shape.indent.to_string(context.config);
|
2015-08-14 20:00:22 +12:00
|
|
|
|
2016-03-07 13:41:32 -05:00
|
|
|
let open_brace_pos = context.codemap
|
2016-04-22 19:03:36 +12:00
|
|
|
.span_after(mk_sp(cond.span.hi, arm_start_pos(&arms[0])), "{");
|
2015-08-17 09:41:45 +12:00
|
|
|
|
|
|
|
for (i, arm) in arms.iter().enumerate() {
|
|
|
|
// Make sure we get the stuff between arms.
|
|
|
|
let missed_str = if i == 0 {
|
2015-09-24 10:22:06 +10:00
|
|
|
context.snippet(mk_sp(open_brace_pos, arm_start_pos(arm)))
|
2015-08-17 09:41:45 +12:00
|
|
|
} else {
|
2015-10-02 11:48:52 +02:00
|
|
|
context.snippet(mk_sp(arm_end_pos(&arms[i - 1]), arm_start_pos(arm)))
|
2015-08-17 09:41:45 +12:00
|
|
|
};
|
2017-02-22 16:20:50 +13:00
|
|
|
let comment =
|
|
|
|
try_opt!(rewrite_match_arm_comment(context, &missed_str, arm_shape, &arm_indent_str));
|
2015-09-25 12:53:25 +02:00
|
|
|
result.push_str(&comment);
|
2015-08-14 20:00:22 +12:00
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&arm_indent_str);
|
2015-08-17 09:41:45 +12:00
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
let arm_str = arm.rewrite(&context,
|
2017-02-22 16:20:50 +13:00
|
|
|
Shape {
|
|
|
|
width: context.config.max_width - arm_shape.indent.width(),
|
|
|
|
..arm_shape
|
|
|
|
});
|
2015-08-17 09:41:45 +12:00
|
|
|
if let Some(ref arm_str) = arm_str {
|
|
|
|
result.push_str(arm_str);
|
|
|
|
} else {
|
|
|
|
// We couldn't format the arm, just reproduce the source.
|
2015-07-17 23:10:15 +02:00
|
|
|
let snippet = context.snippet(mk_sp(arm_start_pos(arm), arm_end_pos(arm)));
|
2015-08-17 09:41:45 +12:00
|
|
|
result.push_str(&snippet);
|
2017-03-02 14:25:57 +13:00
|
|
|
result.push_str(arm_comma(context.config, &arm.body));
|
2015-08-17 09:41:45 +12:00
|
|
|
}
|
2015-08-14 20:00:22 +12:00
|
|
|
}
|
2015-09-27 22:11:17 +02:00
|
|
|
// BytePos(1) = closing match brace.
|
2015-10-06 22:13:14 +02:00
|
|
|
let last_span = mk_sp(arm_end_pos(&arms[arms.len() - 1]), span.hi - BytePos(1));
|
2015-09-27 22:11:17 +02:00
|
|
|
let last_comment = context.snippet(last_span);
|
2017-02-22 16:20:50 +13:00
|
|
|
let comment =
|
|
|
|
try_opt!(rewrite_match_arm_comment(context, &last_comment, arm_shape, &arm_indent_str));
|
2015-09-25 12:53:25 +02:00
|
|
|
result.push_str(&comment);
|
2015-08-14 20:00:22 +12:00
|
|
|
result.push('\n');
|
2017-02-21 14:43:43 +13:00
|
|
|
result.push_str(&shape.indent.to_string(context.config));
|
2015-08-14 20:00:22 +12:00
|
|
|
result.push('}');
|
|
|
|
Some(result)
|
|
|
|
}
|
|
|
|
|
2015-08-17 09:41:45 +12:00
|
|
|
fn arm_start_pos(arm: &ast::Arm) -> BytePos {
|
|
|
|
let &ast::Arm { ref attrs, ref pats, .. } = arm;
|
2015-08-21 13:31:09 +02:00
|
|
|
if !attrs.is_empty() {
|
2015-10-13 02:22:35 -04:00
|
|
|
return attrs[0].span.lo;
|
2015-08-17 09:41:45 +12:00
|
|
|
}
|
|
|
|
|
|
|
|
pats[0].span.lo
|
|
|
|
}
|
|
|
|
|
|
|
|
fn arm_end_pos(arm: &ast::Arm) -> BytePos {
|
|
|
|
arm.body.span.hi
|
|
|
|
}
|
|
|
|
|
2017-03-02 14:25:57 +13:00
|
|
|
fn arm_comma(config: &Config, body: &ast::Expr) -> &'static str {
|
2015-12-01 20:10:57 +13:00
|
|
|
if config.match_block_trailing_comma {
|
2015-11-30 21:51:20 +13:00
|
|
|
","
|
2016-03-01 17:27:19 -05:00
|
|
|
} else if let ast::ExprKind::Block(ref block) = body.node {
|
|
|
|
if let ast::BlockCheckMode::Default = block.rules {
|
2015-10-21 14:35:45 -07:00
|
|
|
""
|
|
|
|
} else {
|
|
|
|
","
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
","
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-14 20:00:22 +12:00
|
|
|
// Match arms.
|
|
|
|
impl Rewrite for ast::Arm {
|
2017-01-31 08:28:48 +13:00
|
|
|
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
|
|
|
|
debug!("Arm::rewrite {:?} {:?}", self, shape);
|
2015-08-14 20:00:22 +12:00
|
|
|
let &ast::Arm { ref attrs, ref pats, ref guard, ref body } = self;
|
|
|
|
|
2015-08-17 09:41:45 +12:00
|
|
|
// FIXME this is all a bit grotty, would be nice to abstract out the
|
|
|
|
// treatment of attributes.
|
2015-08-21 13:31:09 +02:00
|
|
|
let attr_str = if !attrs.is_empty() {
|
2015-08-17 09:41:45 +12:00
|
|
|
// We only use this visitor for the attributes, should we use it for
|
|
|
|
// more?
|
2016-02-05 15:59:41 -05:00
|
|
|
let mut attr_visitor = FmtVisitor::from_codemap(context.parse_session, context.config);
|
2017-02-21 14:43:43 +13:00
|
|
|
attr_visitor.block_indent = shape.indent.block_only();
|
2015-08-17 09:41:45 +12:00
|
|
|
attr_visitor.last_pos = attrs[0].span.lo;
|
|
|
|
if attr_visitor.visit_attrs(attrs) {
|
|
|
|
// Attributes included a skip instruction.
|
2016-01-08 17:03:41 +09:00
|
|
|
return None;
|
2015-08-17 09:41:45 +12:00
|
|
|
}
|
|
|
|
attr_visitor.format_missing(pats[0].span.lo);
|
|
|
|
attr_visitor.buffer.to_string()
|
|
|
|
} else {
|
|
|
|
String::new()
|
|
|
|
};
|
2015-08-14 20:00:22 +12:00
|
|
|
|
|
|
|
// Patterns
|
2015-08-31 19:30:00 +02:00
|
|
|
// 5 = ` => {`
|
2017-02-21 14:43:43 +13:00
|
|
|
let pat_shape = try_opt!(shape.sub_width(5));
|
|
|
|
|
2015-09-14 22:53:30 +02:00
|
|
|
let pat_strs = try_opt!(pats.iter()
|
2017-02-22 16:20:50 +13:00
|
|
|
.map(|p| p.rewrite(context, pat_shape))
|
|
|
|
.collect::<Option<Vec<_>>>());
|
2015-08-16 15:58:17 +12:00
|
|
|
|
2016-08-23 23:14:45 +09:00
|
|
|
let all_simple = pat_strs.iter().all(|p| pat_is_simple(p));
|
2016-04-11 21:20:03 +12:00
|
|
|
let items: Vec<_> = pat_strs.into_iter().map(ListItem::from_str).collect();
|
2016-04-09 18:40:00 +12:00
|
|
|
let fmt = ListFormatting {
|
|
|
|
tactic: if all_simple {
|
|
|
|
DefinitiveListTactic::Mixed
|
|
|
|
} else {
|
|
|
|
DefinitiveListTactic::Vertical
|
|
|
|
},
|
|
|
|
separator: " |",
|
|
|
|
trailing_separator: SeparatorTactic::Never,
|
2017-02-21 14:43:43 +13:00
|
|
|
shape: pat_shape,
|
2016-04-09 18:40:00 +12:00
|
|
|
ends_with_newline: false,
|
|
|
|
config: context.config,
|
|
|
|
};
|
|
|
|
let pats_str = try_opt!(write_list(items, &fmt));
|
2015-08-14 20:00:22 +12:00
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
let guard_shape = if pats_str.contains('\n') {
|
|
|
|
Shape { width: context.config.max_width - shape.indent.width(), ..shape }
|
2015-08-14 20:00:22 +12:00
|
|
|
} else {
|
2017-02-21 14:43:43 +13:00
|
|
|
shape
|
2015-08-14 20:00:22 +12:00
|
|
|
};
|
|
|
|
|
2016-04-09 18:40:00 +12:00
|
|
|
let guard_str = try_opt!(rewrite_guard(context,
|
|
|
|
guard,
|
2017-02-21 14:43:43 +13:00
|
|
|
guard_shape,
|
2016-04-12 10:30:57 +12:00
|
|
|
trimmed_last_line_width(&pats_str)));
|
2015-08-14 20:00:22 +12:00
|
|
|
|
|
|
|
let pats_str = format!("{}{}", pats_str, guard_str);
|
2015-09-05 22:39:28 -07:00
|
|
|
|
2016-09-16 15:19:18 +12:00
|
|
|
let body = match body.node {
|
|
|
|
ast::ExprKind::Block(ref block) if !is_unsafe_block(block) &&
|
|
|
|
is_simple_block(block, context.codemap) &&
|
|
|
|
context.config.wrap_match_arms => {
|
|
|
|
if let ast::StmtKind::Expr(ref expr) = block.stmts[0].node {
|
|
|
|
expr
|
|
|
|
} else {
|
|
|
|
&**body
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => &**body,
|
2015-11-14 21:57:31 +01:00
|
|
|
};
|
2015-08-14 20:00:22 +12:00
|
|
|
|
2017-03-02 14:25:57 +13:00
|
|
|
let comma = arm_comma(&context.config, body);
|
2017-02-22 16:20:50 +13:00
|
|
|
let alt_block_sep = String::from("\n") +
|
|
|
|
&shape.indent.block_only().to_string(context.config);
|
2015-11-20 21:05:10 +01:00
|
|
|
|
2017-02-24 07:52:46 +13:00
|
|
|
let pat_width = extra_offset(&pats_str, shape);
|
2015-08-14 20:00:22 +12:00
|
|
|
// Let's try and get the arm body on the same line as the condition.
|
|
|
|
// 4 = ` => `.len()
|
2017-02-24 07:52:46 +13:00
|
|
|
if shape.width > pat_width + comma.len() + 4 {
|
2017-02-22 16:20:50 +13:00
|
|
|
let arm_shape =
|
2017-02-24 07:52:46 +13:00
|
|
|
shape.shrink_left(pat_width + 4).unwrap().sub_width(comma.len()).unwrap().block();
|
2017-02-22 16:20:50 +13:00
|
|
|
let rewrite = nop_block_collapse(body.rewrite(context, arm_shape), arm_shape.width);
|
2016-03-01 17:27:19 -05:00
|
|
|
let is_block = if let ast::ExprKind::Block(..) = body.node {
|
2015-12-02 16:44:40 +13:00
|
|
|
true
|
|
|
|
} else {
|
|
|
|
false
|
2015-12-01 20:10:57 +13:00
|
|
|
};
|
2015-09-26 18:16:07 +02:00
|
|
|
|
|
|
|
match rewrite {
|
2015-11-20 21:50:25 +01:00
|
|
|
Some(ref body_str) if !body_str.contains('\n') || !context.config.wrap_match_arms ||
|
2015-12-02 16:44:40 +13:00
|
|
|
is_block => {
|
2017-01-27 08:04:13 +13:00
|
|
|
let block_sep = match context.config.control_brace_style {
|
|
|
|
ControlBraceStyle::AlwaysNextLine if is_block => alt_block_sep.as_str(),
|
|
|
|
_ => " ",
|
|
|
|
};
|
|
|
|
|
2016-04-17 11:01:16 -06:00
|
|
|
return Some(format!("{}{} =>{}{}{}",
|
2015-08-17 09:41:45 +12:00
|
|
|
attr_str.trim_left(),
|
|
|
|
pats_str,
|
2016-04-17 11:01:16 -06:00
|
|
|
block_sep,
|
2015-08-17 09:41:45 +12:00
|
|
|
body_str,
|
2015-11-20 21:05:10 +01:00
|
|
|
comma));
|
|
|
|
}
|
2015-11-14 21:57:31 +01:00
|
|
|
_ => {}
|
2015-08-14 20:00:22 +12:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-20 21:50:25 +01:00
|
|
|
// FIXME: we're doing a second rewrite of the expr; This may not be
|
2015-11-14 21:57:31 +01:00
|
|
|
// necessary.
|
2017-02-22 16:20:50 +13:00
|
|
|
let body_shape = try_opt!(shape.sub_width(context.config.tab_spaces))
|
|
|
|
.block_indent(context.config.tab_spaces);
|
2017-02-21 14:43:43 +13:00
|
|
|
let next_line_body = try_opt!(nop_block_collapse(body.rewrite(context, body_shape),
|
|
|
|
body_shape.width));
|
2017-01-31 08:28:48 +13:00
|
|
|
let indent_str = shape.indent.block_indent(context.config).to_string(context.config);
|
2015-11-20 21:50:25 +01:00
|
|
|
let (body_prefix, body_suffix) = if context.config.wrap_match_arms {
|
2015-12-01 20:10:57 +13:00
|
|
|
if context.config.match_block_trailing_comma {
|
2016-11-28 08:47:38 +08:00
|
|
|
("{", "},")
|
2015-12-01 20:10:57 +13:00
|
|
|
} else {
|
2016-11-28 08:47:38 +08:00
|
|
|
("{", "}")
|
2015-12-01 20:10:57 +13:00
|
|
|
}
|
2015-11-20 21:50:25 +01:00
|
|
|
} else {
|
2017-02-28 15:46:10 -05:00
|
|
|
("", ",")
|
2015-11-20 21:50:25 +01:00
|
|
|
};
|
2015-11-14 21:57:31 +01:00
|
|
|
|
2017-02-28 15:46:10 -05:00
|
|
|
|
2016-04-17 11:01:16 -06:00
|
|
|
let block_sep = match context.config.control_brace_style {
|
2016-11-28 08:47:38 +08:00
|
|
|
ControlBraceStyle::AlwaysNextLine => alt_block_sep + body_prefix + "\n",
|
2017-03-02 15:03:32 +13:00
|
|
|
_ if body_prefix.is_empty() => "\n".to_owned(),
|
|
|
|
_ => " ".to_owned() + body_prefix + "\n",
|
2016-04-17 11:01:16 -06:00
|
|
|
};
|
2017-02-28 15:46:10 -05:00
|
|
|
|
|
|
|
if context.config.wrap_match_arms {
|
|
|
|
Some(format!("{}{} =>{}{}{}\n{}{}",
|
|
|
|
attr_str.trim_left(),
|
|
|
|
pats_str,
|
|
|
|
block_sep,
|
|
|
|
indent_str,
|
|
|
|
next_line_body,
|
|
|
|
shape.indent.to_string(context.config),
|
|
|
|
body_suffix))
|
|
|
|
} else {
|
|
|
|
Some(format!("{}{} =>{}{}{}{}",
|
|
|
|
attr_str.trim_left(),
|
|
|
|
pats_str,
|
|
|
|
block_sep,
|
|
|
|
indent_str,
|
|
|
|
next_line_body,
|
|
|
|
body_suffix))
|
|
|
|
}
|
2015-08-14 20:00:22 +12:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-12 10:30:57 +12:00
|
|
|
// A pattern is simple if it is very short or it is short-ish and just a path.
|
|
|
|
// E.g. `Foo::Bar` is simple, but `Foo(..)` is not.
|
2016-04-09 18:40:00 +12:00
|
|
|
fn pat_is_simple(pat_str: &str) -> bool {
|
|
|
|
pat_str.len() <= 16 ||
|
|
|
|
(pat_str.len() <= 24 && pat_str.chars().all(|c| c.is_alphabetic() || c == ':'))
|
|
|
|
}
|
|
|
|
|
2015-08-14 20:00:22 +12:00
|
|
|
// The `if ...` guard on a match arm.
|
|
|
|
fn rewrite_guard(context: &RewriteContext,
|
|
|
|
guard: &Option<ptr::P<ast::Expr>>,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape,
|
2015-08-14 20:00:22 +12:00
|
|
|
// The amount of space used up on this line for the pattern in
|
2015-08-19 15:15:54 +12:00
|
|
|
// the arm (excludes offset).
|
2015-08-14 20:00:22 +12:00
|
|
|
pattern_width: usize)
|
|
|
|
-> Option<String> {
|
2015-11-25 15:39:15 +09:00
|
|
|
if let Some(ref guard) = *guard {
|
2015-08-19 15:15:54 +12:00
|
|
|
// First try to fit the guard string on the same line as the pattern.
|
2015-08-14 20:00:22 +12:00
|
|
|
// 4 = ` if `, 5 = ` => {`
|
|
|
|
let overhead = pattern_width + 4 + 5;
|
2017-01-31 08:28:48 +13:00
|
|
|
if overhead < shape.width {
|
2017-02-24 07:52:46 +13:00
|
|
|
let cond_shape = shape.shrink_left(pattern_width + 4).unwrap().sub_width(5).unwrap();
|
|
|
|
let cond_str = guard.rewrite(context, cond_shape);
|
2015-08-14 20:00:22 +12:00
|
|
|
if let Some(cond_str) = cond_str {
|
|
|
|
return Some(format!(" if {}", cond_str));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Not enough space to put the guard after the pattern, try a newline.
|
2017-01-31 08:28:48 +13:00
|
|
|
let overhead = shape.indent.block_indent(context.config).width() + 4 + 5;
|
|
|
|
if overhead < shape.width {
|
2015-08-14 20:00:22 +12:00
|
|
|
let cond_str = guard.rewrite(context,
|
2017-01-31 08:28:48 +13:00
|
|
|
Shape::legacy(shape.width - overhead,
|
|
|
|
// 3 == `if `
|
|
|
|
shape.indent.block_indent(context.config) +
|
|
|
|
3));
|
2015-08-14 20:00:22 +12:00
|
|
|
if let Some(cond_str) = cond_str {
|
|
|
|
return Some(format!("\n{}if {}",
|
2017-01-31 08:28:48 +13:00
|
|
|
shape.indent
|
|
|
|
.block_indent(context.config)
|
|
|
|
.to_string(context.config),
|
2015-08-14 20:00:22 +12:00
|
|
|
cond_str));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
None
|
|
|
|
} else {
|
|
|
|
Some(String::new())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-07-19 23:39:48 +02:00
|
|
|
fn rewrite_pat_expr(context: &RewriteContext,
|
|
|
|
pat: Option<&ast::Pat>,
|
|
|
|
expr: &ast::Expr,
|
|
|
|
matcher: &str,
|
2015-08-21 13:31:09 +02:00
|
|
|
// Connecting piece between pattern and expression,
|
|
|
|
// *without* trailing space.
|
2015-07-19 23:39:48 +02:00
|
|
|
connector: &str,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-07-19 23:39:48 +02:00
|
|
|
-> Option<String> {
|
2017-02-22 10:54:51 +13:00
|
|
|
debug!("rewrite_pat_expr {:?} {:?}", shape, pat);
|
2015-07-19 23:39:48 +02:00
|
|
|
let mut result = match pat {
|
2015-07-19 22:25:44 +02:00
|
|
|
Some(pat) => {
|
2017-01-11 14:34:42 +13:00
|
|
|
let matcher = if matcher.is_empty() {
|
|
|
|
matcher.to_owned()
|
|
|
|
} else {
|
|
|
|
format!("{} ", matcher)
|
|
|
|
};
|
2017-02-22 16:20:50 +13:00
|
|
|
let pat_shape = try_opt!(try_opt!(shape.shrink_left(matcher.len()))
|
|
|
|
.sub_width(connector.len()));
|
2017-02-21 14:43:43 +13:00
|
|
|
let pat_string = try_opt!(pat.rewrite(context, pat_shape));
|
2015-07-19 23:39:48 +02:00
|
|
|
format!("{}{}{}", matcher, pat_string, connector)
|
2015-07-19 22:25:44 +02:00
|
|
|
}
|
2015-08-16 15:58:17 +12:00
|
|
|
None => String::new(),
|
2015-07-19 22:25:44 +02:00
|
|
|
};
|
|
|
|
|
2015-07-20 23:29:25 +02:00
|
|
|
// Consider only the last line of the pat string.
|
2017-02-21 14:43:43 +13:00
|
|
|
let extra_offset = extra_offset(&result, shape);
|
2015-07-19 22:25:44 +02:00
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
// The expression may (partially) fit on the current line.
|
2017-01-31 08:28:48 +13:00
|
|
|
if shape.width > extra_offset + 1 {
|
2016-05-29 17:58:38 +02:00
|
|
|
let spacer = if pat.is_some() { " " } else { "" };
|
2015-07-20 23:29:25 +02:00
|
|
|
|
2017-02-22 16:20:50 +13:00
|
|
|
let expr_shape = try_opt!(shape.sub_width(extra_offset + spacer.len()))
|
|
|
|
.add_offset(extra_offset + spacer.len());
|
2017-02-21 14:43:43 +13:00
|
|
|
let expr_rewrite = expr.rewrite(context, expr_shape);
|
2015-07-20 23:29:25 +02:00
|
|
|
|
|
|
|
if let Some(expr_string) = expr_rewrite {
|
2017-01-31 08:28:48 +13:00
|
|
|
let pat_simple = pat.and_then(|p| {
|
2017-02-23 08:52:52 +13:00
|
|
|
p.rewrite(context,
|
|
|
|
Shape::legacy(context.config.max_width,
|
|
|
|
Indent::empty()))
|
|
|
|
})
|
2017-01-31 08:28:48 +13:00
|
|
|
.map(|s| pat_is_simple(&s));
|
2016-09-09 23:20:16 +09:00
|
|
|
|
|
|
|
if pat.is_none() || pat_simple.unwrap_or(false) || !expr_string.contains('\n') {
|
|
|
|
result.push_str(spacer);
|
|
|
|
result.push_str(&expr_string);
|
|
|
|
return Some(result);
|
|
|
|
}
|
2015-07-20 23:29:25 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
let nested_indent = shape.indent.block_only().block_indent(context.config);
|
2016-09-09 23:20:16 +09:00
|
|
|
|
2015-07-20 23:29:25 +02:00
|
|
|
// The expression won't fit on the current line, jump to next.
|
|
|
|
result.push('\n');
|
2017-02-21 14:43:43 +13:00
|
|
|
result.push_str(&nested_indent.to_string(context.config));
|
2015-07-20 23:29:25 +02:00
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
let expr_rewrite = expr.rewrite(&context,
|
2017-01-31 08:28:48 +13:00
|
|
|
Shape::legacy(try_opt!(context.config
|
|
|
|
.max_width
|
2017-02-21 14:43:43 +13:00
|
|
|
.checked_sub(nested_indent.width())),
|
|
|
|
nested_indent));
|
2016-08-23 23:14:45 +09:00
|
|
|
result.push_str(&try_opt!(expr_rewrite));
|
2015-07-19 22:25:44 +02:00
|
|
|
|
|
|
|
Some(result)
|
2015-07-19 23:42:54 +02:00
|
|
|
}
|
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
fn rewrite_string_lit(context: &RewriteContext, span: Span, shape: Shape) -> Option<String> {
|
2016-01-28 19:14:08 +13:00
|
|
|
let string_lit = context.snippet(span);
|
|
|
|
|
|
|
|
if !context.config.format_strings && !context.config.force_format_strings {
|
2017-01-27 08:04:13 +13:00
|
|
|
return Some(string_lit);
|
2016-01-28 19:14:08 +13:00
|
|
|
}
|
|
|
|
|
|
|
|
if !context.config.force_format_strings &&
|
2017-01-31 08:28:48 +13:00
|
|
|
!string_requires_rewrite(context, span, &string_lit, shape) {
|
2017-01-27 08:04:13 +13:00
|
|
|
return Some(string_lit);
|
2015-09-01 08:14:52 -04:00
|
|
|
}
|
2015-09-01 20:42:07 +02:00
|
|
|
|
2015-07-16 13:31:20 +12:00
|
|
|
let fmt = StringFormat {
|
|
|
|
opener: "\"",
|
|
|
|
closer: "\"",
|
|
|
|
line_start: " ",
|
|
|
|
line_end: "\\",
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: shape,
|
2015-07-16 13:31:20 +12:00
|
|
|
trim_end: false,
|
2015-09-05 22:39:28 -07:00
|
|
|
config: context.config,
|
2015-07-16 13:31:20 +12:00
|
|
|
};
|
2015-04-21 21:01:19 +12:00
|
|
|
|
2016-01-28 19:14:08 +13:00
|
|
|
// Remove the quote characters.
|
|
|
|
let str_lit = &string_lit[1..string_lit.len() - 1];
|
2015-09-03 23:38:12 -04:00
|
|
|
|
2017-01-27 08:04:13 +13:00
|
|
|
rewrite_string(str_lit, &fmt)
|
2015-06-16 17:29:05 +02:00
|
|
|
}
|
|
|
|
|
2016-01-28 19:14:08 +13:00
|
|
|
fn string_requires_rewrite(context: &RewriteContext,
|
|
|
|
span: Span,
|
|
|
|
string: &str,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2016-01-28 19:14:08 +13:00
|
|
|
-> bool {
|
2017-01-31 08:28:48 +13:00
|
|
|
if context.codemap.lookup_char_pos(span.lo).col.0 != shape.indent.width() {
|
2016-01-28 19:14:08 +13:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i, line) in string.lines().enumerate() {
|
|
|
|
if i == 0 {
|
2017-01-31 08:28:48 +13:00
|
|
|
if line.len() > shape.width {
|
2016-01-28 19:14:08 +13:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
} else {
|
2017-01-31 08:28:48 +13:00
|
|
|
if line.len() > shape.width + shape.indent.width() {
|
2016-01-28 19:14:08 +13:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
false
|
|
|
|
}
|
|
|
|
|
2015-09-11 00:52:16 +02:00
|
|
|
pub fn rewrite_call<R>(context: &RewriteContext,
|
2015-09-11 00:53:21 +02:00
|
|
|
callee: &R,
|
|
|
|
args: &[ptr::P<ast::Expr>],
|
|
|
|
span: Span,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-09-11 00:53:21 +02:00
|
|
|
-> Option<String>
|
2015-09-11 00:52:16 +02:00
|
|
|
where R: Rewrite
|
|
|
|
{
|
2017-01-31 08:28:48 +13:00
|
|
|
let closure =
|
|
|
|
|callee_max_width| rewrite_call_inner(context, callee, callee_max_width, args, span, shape);
|
2015-09-11 00:53:21 +02:00
|
|
|
|
2015-08-14 14:09:19 +02:00
|
|
|
// 2 is for parens
|
2017-01-31 08:28:48 +13:00
|
|
|
let max_width = try_opt!(shape.width.checked_sub(2));
|
2015-09-11 00:53:21 +02:00
|
|
|
binary_search(1, max_width, closure)
|
2015-09-04 18:09:05 +02:00
|
|
|
}
|
|
|
|
|
2015-09-11 00:52:16 +02:00
|
|
|
fn rewrite_call_inner<R>(context: &RewriteContext,
|
|
|
|
callee: &R,
|
|
|
|
max_callee_width: usize,
|
|
|
|
args: &[ptr::P<ast::Expr>],
|
|
|
|
span: Span,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-09-11 00:52:16 +02:00
|
|
|
-> Result<String, Ordering>
|
|
|
|
where R: Rewrite
|
|
|
|
{
|
|
|
|
let callee = callee.borrow();
|
2015-09-07 21:34:37 +02:00
|
|
|
// FIXME using byte lens instead of char lens (and probably all over the
|
|
|
|
// place too)
|
2017-02-21 14:43:43 +13:00
|
|
|
let callee_str = match callee.rewrite(context, Shape { width: max_callee_width, ..shape }) {
|
2015-09-04 18:09:05 +02:00
|
|
|
Some(string) => {
|
|
|
|
if !string.contains('\n') && string.len() > max_callee_width {
|
|
|
|
panic!("{:?} {}", string, max_callee_width);
|
|
|
|
} else {
|
|
|
|
string
|
|
|
|
}
|
|
|
|
}
|
2015-09-07 21:34:37 +02:00
|
|
|
None => return Err(Ordering::Greater),
|
2015-09-04 18:09:05 +02:00
|
|
|
};
|
2015-06-23 15:58:58 +02:00
|
|
|
|
2016-03-07 13:41:32 -05:00
|
|
|
let span_lo = context.codemap.span_after(span, "(");
|
2015-09-11 00:52:57 +02:00
|
|
|
let span = mk_sp(span_lo, span.hi);
|
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
let used_width = extra_offset(&callee_str, shape);
|
2015-06-16 17:29:05 +02:00
|
|
|
// 2 is for parens.
|
2017-02-21 14:43:43 +13:00
|
|
|
let remaining_width = match shape.width.checked_sub(used_width + 2) {
|
|
|
|
Some(s) => s,
|
2015-09-04 18:09:05 +02:00
|
|
|
None => return Err(Ordering::Greater),
|
|
|
|
};
|
2017-02-21 14:43:43 +13:00
|
|
|
// 1 = (
|
|
|
|
let nested_shape = shape.visual_indent(used_width + 1);
|
2015-10-08 23:07:19 +02:00
|
|
|
let arg_count = args.len();
|
2015-04-21 21:01:19 +12:00
|
|
|
|
2017-02-22 16:20:50 +13:00
|
|
|
let items = itemize_list(context.codemap,
|
|
|
|
args.iter(),
|
|
|
|
")",
|
|
|
|
|item| item.span.lo,
|
|
|
|
|item| item.span.hi,
|
|
|
|
|item| {
|
2017-02-23 08:52:52 +13:00
|
|
|
item.rewrite(context,
|
|
|
|
Shape { width: remaining_width, ..nested_shape })
|
|
|
|
},
|
2017-02-22 16:20:50 +13:00
|
|
|
span.lo,
|
|
|
|
span.hi);
|
2015-10-08 23:07:19 +02:00
|
|
|
let mut item_vec: Vec<_> = items.collect();
|
|
|
|
|
|
|
|
// Try letting the last argument overflow to the next line with block
|
|
|
|
// indentation. If its first line fits on one line with the other arguments,
|
|
|
|
// we format the function arguments horizontally.
|
|
|
|
let overflow_last = match args.last().map(|x| &x.node) {
|
2016-03-01 17:27:19 -05:00
|
|
|
Some(&ast::ExprKind::Closure(..)) |
|
|
|
|
Some(&ast::ExprKind::Block(..)) if arg_count > 1 => true,
|
2015-10-08 23:07:19 +02:00
|
|
|
_ => false,
|
2017-02-21 16:43:22 +13:00
|
|
|
};
|
2015-10-08 23:07:19 +02:00
|
|
|
|
|
|
|
let mut orig_last = None;
|
|
|
|
let mut placeholder = None;
|
|
|
|
|
|
|
|
// Replace the last item with its first line to see if it fits with
|
|
|
|
// first arguments.
|
|
|
|
if overflow_last {
|
2017-02-21 14:43:43 +13:00
|
|
|
let nested_shape = Shape {
|
|
|
|
width: remaining_width,
|
|
|
|
indent: nested_shape.indent.block_only(),
|
|
|
|
..nested_shape
|
|
|
|
};
|
|
|
|
let rewrite = args.last().unwrap().rewrite(context, nested_shape);
|
2015-10-08 23:07:19 +02:00
|
|
|
|
|
|
|
if let Some(rewrite) = rewrite {
|
|
|
|
let rewrite_first_line = Some(rewrite[..first_line_width(&rewrite)].to_owned());
|
|
|
|
placeholder = Some(rewrite);
|
|
|
|
|
|
|
|
swap(&mut item_vec[arg_count - 1].item, &mut orig_last);
|
|
|
|
item_vec[arg_count - 1].item = rewrite_first_line;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let tactic = definitive_tactic(&item_vec,
|
|
|
|
ListTactic::LimitedHorizontalVertical(context.config
|
2017-02-22 16:20:50 +13:00
|
|
|
.fn_call_width),
|
2015-10-08 23:07:19 +02:00
|
|
|
remaining_width);
|
|
|
|
|
|
|
|
// Replace the stub with the full overflowing last argument if the rewrite
|
|
|
|
// succeeded and its first line fits with the other arguments.
|
|
|
|
match (overflow_last, tactic, placeholder) {
|
2016-03-14 20:51:06 +13:00
|
|
|
(true, DefinitiveListTactic::Horizontal, placeholder @ Some(..)) => {
|
2015-10-08 23:07:19 +02:00
|
|
|
item_vec[arg_count - 1].item = placeholder;
|
|
|
|
}
|
|
|
|
(true, _, _) => {
|
|
|
|
item_vec[arg_count - 1].item = orig_last;
|
|
|
|
}
|
|
|
|
(false, _, _) => {}
|
|
|
|
}
|
|
|
|
|
|
|
|
let fmt = ListFormatting {
|
|
|
|
tactic: tactic,
|
|
|
|
separator: ",",
|
|
|
|
trailing_separator: SeparatorTactic::Never,
|
2017-02-21 14:43:43 +13:00
|
|
|
shape: nested_shape,
|
2015-10-08 23:07:19 +02:00
|
|
|
ends_with_newline: false,
|
|
|
|
config: context.config,
|
|
|
|
};
|
|
|
|
|
|
|
|
let list_str = match write_list(&item_vec, &fmt) {
|
2015-09-04 18:09:05 +02:00
|
|
|
Some(str) => str,
|
2015-09-07 21:34:37 +02:00
|
|
|
None => return Err(Ordering::Less),
|
2015-09-04 18:09:05 +02:00
|
|
|
};
|
2015-04-21 21:01:19 +12:00
|
|
|
|
2016-10-13 04:34:08 +03:00
|
|
|
Ok(if context.config.spaces_within_parens && list_str.len() > 0 {
|
2017-02-22 16:20:50 +13:00
|
|
|
format!("{}( {} )", callee_str, list_str)
|
|
|
|
} else {
|
|
|
|
format!("{}({})", callee_str, list_str)
|
|
|
|
})
|
2015-06-16 17:29:05 +02:00
|
|
|
}
|
2015-04-21 21:01:19 +12:00
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
fn rewrite_paren(context: &RewriteContext, subexpr: &ast::Expr, shape: Shape) -> Option<String> {
|
|
|
|
debug!("rewrite_paren, shape: {:?}", shape);
|
2015-06-16 17:29:05 +02:00
|
|
|
// 1 is for opening paren, 2 is for opening+closing, we want to keep the closing
|
2015-08-19 15:15:54 +12:00
|
|
|
// paren on the same line as the subexpr.
|
2017-02-21 14:43:43 +13:00
|
|
|
let sub_shape = try_opt!(shape.sub_width(2)).visual_indent(1);
|
|
|
|
let subexpr_str = subexpr.rewrite(context, sub_shape);
|
2015-06-16 17:29:05 +02:00
|
|
|
debug!("rewrite_paren, subexpr_str: `{:?}`", subexpr_str);
|
2016-10-13 04:34:08 +03:00
|
|
|
|
|
|
|
subexpr_str.map(|s| if context.config.spaces_within_parens && s.len() > 0 {
|
2017-02-22 16:20:50 +13:00
|
|
|
format!("( {} )", s)
|
|
|
|
} else {
|
|
|
|
format!("({})", s)
|
|
|
|
})
|
2015-06-16 17:29:05 +02:00
|
|
|
}
|
2015-05-24 19:57:13 +02:00
|
|
|
|
2017-01-11 12:06:23 +13:00
|
|
|
fn rewrite_index(expr: &ast::Expr,
|
|
|
|
index: &ast::Expr,
|
|
|
|
context: &RewriteContext,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2017-01-11 12:06:23 +13:00
|
|
|
-> Option<String> {
|
2017-01-31 08:28:48 +13:00
|
|
|
let expr_str = try_opt!(expr.rewrite(context, shape));
|
2017-01-11 12:06:23 +13:00
|
|
|
|
|
|
|
let (lbr, rbr) = if context.config.spaces_within_square_brackets {
|
|
|
|
("[ ", " ]")
|
|
|
|
} else {
|
|
|
|
("[", "]")
|
|
|
|
};
|
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
let budget = shape.width.checked_sub(expr_str.len() + lbr.len() + rbr.len()).unwrap_or(0);
|
|
|
|
let index_str = index.rewrite(context, Shape::legacy(budget, shape.indent));
|
2017-01-11 12:06:23 +13:00
|
|
|
if let Some(index_str) = index_str {
|
|
|
|
return Some(format!("{}{}{}{}", expr_str, lbr, index_str, rbr));
|
|
|
|
}
|
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
let indent = shape.indent.block_indent(&context.config);
|
2017-01-11 12:06:23 +13:00
|
|
|
let indent = indent.to_string(&context.config);
|
2017-01-31 08:28:48 +13:00
|
|
|
// FIXME this is not right, since we don't take into account that shape.width
|
2017-01-11 12:06:23 +13:00
|
|
|
// might be reduced from max_width by something on the right.
|
2017-02-22 16:20:50 +13:00
|
|
|
let budget = try_opt!(context.config.max_width.checked_sub(indent.len() + lbr.len() +
|
|
|
|
rbr.len()));
|
2017-01-31 08:28:48 +13:00
|
|
|
let index_str = try_opt!(index.rewrite(context, Shape::legacy(budget, shape.indent)));
|
2017-01-11 12:06:23 +13:00
|
|
|
Some(format!("{}\n{}{}{}{}", expr_str, indent, lbr, index_str, rbr))
|
|
|
|
}
|
|
|
|
|
2015-06-24 01:11:29 +02:00
|
|
|
fn rewrite_struct_lit<'a>(context: &RewriteContext,
|
|
|
|
path: &ast::Path,
|
|
|
|
fields: &'a [ast::Field],
|
|
|
|
base: Option<&'a ast::Expr>,
|
|
|
|
span: Span,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-07-03 11:13:28 +02:00
|
|
|
-> Option<String> {
|
2017-01-31 08:28:48 +13:00
|
|
|
debug!("rewrite_struct_lit: shape {:?}", shape);
|
2015-05-25 19:11:53 +12:00
|
|
|
|
2015-06-24 01:11:29 +02:00
|
|
|
enum StructLitField<'a> {
|
|
|
|
Regular(&'a ast::Field),
|
2015-07-03 11:13:28 +02:00
|
|
|
Base(&'a ast::Expr),
|
2015-06-24 01:11:29 +02:00
|
|
|
}
|
|
|
|
|
2015-08-14 14:09:19 +02:00
|
|
|
// 2 = " {".len()
|
2017-02-21 14:43:43 +13:00
|
|
|
let path_shape = try_opt!(shape.sub_width(2));
|
2017-02-22 16:20:50 +13:00
|
|
|
let path_str = try_opt!(rewrite_path(context, PathContext::Expr, None, path, path_shape));
|
2015-08-14 14:09:19 +02:00
|
|
|
|
2015-07-20 23:29:25 +02:00
|
|
|
// Foo { a: Foo } - indent is +3, width is -5.
|
2017-02-21 14:43:43 +13:00
|
|
|
let h_shape = shape.sub_width(path_str.len() + 5);
|
|
|
|
let v_shape = match context.config.struct_lit_style {
|
2017-02-22 16:20:50 +13:00
|
|
|
StructLitStyle::Visual => {
|
|
|
|
try_opt!(try_opt!(shape.shrink_left(path_str.len() + 3)).sub_width(2))
|
|
|
|
}
|
2015-09-02 09:41:08 +12:00
|
|
|
StructLitStyle::Block => {
|
2017-02-21 14:43:43 +13:00
|
|
|
let shape = shape.block_indent(context.config.tab_spaces);
|
2017-02-22 16:20:50 +13:00
|
|
|
Shape {
|
|
|
|
width: try_opt!(context.config.max_width.checked_sub(shape.indent.width())),
|
|
|
|
..shape
|
|
|
|
}
|
2015-07-16 10:44:43 +12:00
|
|
|
}
|
|
|
|
};
|
2015-05-25 19:11:53 +12:00
|
|
|
|
2015-09-11 00:52:16 +02:00
|
|
|
let field_iter = fields.into_iter()
|
2016-04-22 19:03:36 +12:00
|
|
|
.map(StructLitField::Regular)
|
|
|
|
.chain(base.into_iter().map(StructLitField::Base));
|
2015-06-24 01:11:29 +02:00
|
|
|
|
|
|
|
let items = itemize_list(context.codemap,
|
|
|
|
field_iter,
|
|
|
|
"}",
|
2016-11-21 08:37:35 +13:00
|
|
|
|item| match *item {
|
|
|
|
StructLitField::Regular(field) => field.span.lo,
|
|
|
|
StructLitField::Base(expr) => {
|
2017-02-22 16:20:50 +13:00
|
|
|
let last_field_hi = fields.last()
|
|
|
|
.map_or(span.lo, |field| field.span.hi);
|
|
|
|
let snippet = context.snippet(mk_sp(last_field_hi, expr.span.lo));
|
|
|
|
let pos = snippet.find_uncommented("..").unwrap();
|
|
|
|
last_field_hi + BytePos(pos as u32)
|
|
|
|
}
|
2015-06-24 01:11:29 +02:00
|
|
|
},
|
2016-11-21 08:37:35 +13:00
|
|
|
|item| match *item {
|
|
|
|
StructLitField::Regular(field) => field.span.hi,
|
|
|
|
StructLitField::Base(expr) => expr.span.hi,
|
|
|
|
},
|
2015-06-24 01:11:29 +02:00
|
|
|
|item| {
|
2016-04-22 19:03:36 +12:00
|
|
|
match *item {
|
2016-08-23 23:14:45 +09:00
|
|
|
StructLitField::Regular(field) => {
|
2017-02-21 14:43:43 +13:00
|
|
|
// The 1 taken from the v_budget is for the comma.
|
2017-02-22 16:20:50 +13:00
|
|
|
rewrite_field(context, field, try_opt!(v_shape.sub_width(1)))
|
2016-04-22 19:03:36 +12:00
|
|
|
}
|
2016-08-23 23:14:45 +09:00
|
|
|
StructLitField::Base(expr) => {
|
2016-04-22 19:03:36 +12:00
|
|
|
// 2 = ..
|
2017-02-22 16:20:50 +13:00
|
|
|
expr.rewrite(context, try_opt!(v_shape.shrink_left(2)))
|
2016-04-22 19:03:36 +12:00
|
|
|
.map(|s| format!("..{}", s))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
2016-03-07 13:41:32 -05:00
|
|
|
context.codemap.span_after(span, "{"),
|
2015-06-24 01:11:29 +02:00
|
|
|
span.hi);
|
2015-10-02 13:50:24 +02:00
|
|
|
let item_vec = items.collect::<Vec<_>>();
|
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
let tactic = if let Some(h_shape) = h_shape {
|
2015-10-02 13:50:24 +02:00
|
|
|
let mut prelim_tactic = match (context.config.struct_lit_style, fields.len()) {
|
|
|
|
(StructLitStyle::Visual, 1) => ListTactic::HorizontalVertical,
|
|
|
|
_ => context.config.struct_lit_multiline_style.to_list_tactic(),
|
|
|
|
};
|
|
|
|
|
|
|
|
if prelim_tactic == ListTactic::HorizontalVertical && fields.len() > 1 {
|
|
|
|
prelim_tactic = ListTactic::LimitedHorizontalVertical(context.config.struct_lit_width);
|
2015-10-14 22:28:17 +02:00
|
|
|
}
|
2015-06-24 01:11:29 +02:00
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
definitive_tactic(&item_vec, prelim_tactic, h_shape.width)
|
|
|
|
} else {
|
|
|
|
DefinitiveListTactic::Vertical
|
2015-09-20 18:44:49 +02:00
|
|
|
};
|
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
let nested_shape = match tactic {
|
|
|
|
DefinitiveListTactic::Horizontal => h_shape.unwrap(),
|
|
|
|
_ => v_shape,
|
2015-10-02 13:50:24 +02:00
|
|
|
};
|
2015-09-26 18:25:41 +12:00
|
|
|
|
2015-11-22 17:41:54 +01:00
|
|
|
let ends_with_newline = context.config.struct_lit_style != StructLitStyle::Visual &&
|
|
|
|
tactic == DefinitiveListTactic::Vertical;
|
|
|
|
|
2015-07-16 13:31:20 +12:00
|
|
|
let fmt = ListFormatting {
|
2015-09-20 18:44:49 +02:00
|
|
|
tactic: tactic,
|
2015-07-16 13:31:20 +12:00
|
|
|
separator: ",",
|
|
|
|
trailing_separator: if base.is_some() {
|
2015-06-16 17:29:05 +02:00
|
|
|
SeparatorTactic::Never
|
|
|
|
} else {
|
2017-02-24 10:31:23 +13:00
|
|
|
context.config.trailing_comma
|
2015-06-16 17:29:05 +02:00
|
|
|
},
|
2017-02-21 14:43:43 +13:00
|
|
|
shape: nested_shape,
|
2015-11-22 17:41:54 +01:00
|
|
|
ends_with_newline: ends_with_newline,
|
2015-09-05 22:39:28 -07:00
|
|
|
config: context.config,
|
2015-07-16 13:31:20 +12:00
|
|
|
};
|
2015-10-02 13:50:24 +02:00
|
|
|
let fields_str = try_opt!(write_list(&item_vec, &fmt));
|
2015-05-25 19:11:53 +12:00
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
// Empty struct.
|
2016-04-12 07:05:54 +12:00
|
|
|
if fields_str.is_empty() {
|
|
|
|
return Some(format!("{} {{}}", path_str));
|
|
|
|
}
|
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
// One liner or visual indent.
|
|
|
|
if context.config.struct_lit_style == StructLitStyle::Visual ||
|
|
|
|
(context.config.struct_lit_multiline_style != MultilineStyle::ForceMulti &&
|
|
|
|
!fields_str.contains('\n') &&
|
|
|
|
fields_str.len() <= h_shape.map(|s| s.width).unwrap_or(0)) {
|
|
|
|
return Some(format!("{} {{ {} }}", path_str, fields_str));
|
2015-07-16 10:44:43 +12:00
|
|
|
}
|
|
|
|
|
2017-02-21 14:43:43 +13:00
|
|
|
// Multiple lines.
|
|
|
|
let inner_indent = v_shape.indent.to_string(context.config);
|
|
|
|
let outer_indent = shape.indent.to_string(context.config);
|
|
|
|
Some(format!("{} {{\n{}{}\n{}}}",
|
|
|
|
path_str,
|
|
|
|
inner_indent,
|
|
|
|
fields_str,
|
|
|
|
outer_indent))
|
2015-09-02 09:41:08 +12:00
|
|
|
// FIXME if context.config.struct_lit_style == Visual, but we run out
|
2015-07-16 10:44:43 +12:00
|
|
|
// of space, we should fall back to BlockIndent.
|
2015-06-16 17:29:05 +02:00
|
|
|
}
|
2015-05-25 19:11:53 +12:00
|
|
|
|
2016-08-04 00:17:47 -04:00
|
|
|
pub fn type_annotation_separator(config: &Config) -> &str {
|
2016-09-17 01:44:51 +02:00
|
|
|
match (config.space_before_type_annotation, config.space_after_type_annotation_colon) {
|
|
|
|
(true, true) => " : ",
|
|
|
|
(true, false) => " :",
|
|
|
|
(false, true) => ": ",
|
|
|
|
(false, false) => ":",
|
2016-08-04 00:17:47 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
fn rewrite_field(context: &RewriteContext, field: &ast::Field, shape: Shape) -> Option<String> {
|
2015-07-31 13:06:28 +02:00
|
|
|
let name = &field.ident.node.to_string();
|
2017-02-13 03:16:11 +09:00
|
|
|
if field.is_shorthand {
|
|
|
|
Some(name.to_string())
|
|
|
|
} else {
|
|
|
|
let separator = type_annotation_separator(context.config);
|
|
|
|
let overhead = name.len() + separator.len();
|
2017-02-21 14:43:43 +13:00
|
|
|
let mut expr_shape = try_opt!(shape.sub_width(overhead));
|
|
|
|
expr_shape.offset += overhead;
|
|
|
|
let expr = field.expr.rewrite(context, expr_shape);
|
2017-02-13 03:16:11 +09:00
|
|
|
|
|
|
|
match expr {
|
|
|
|
Some(e) => Some(format!("{}{}{}", name, separator, e)),
|
|
|
|
None => {
|
|
|
|
let expr_offset = shape.indent.block_indent(context.config);
|
|
|
|
let expr = field.expr
|
|
|
|
.rewrite(context,
|
|
|
|
Shape::legacy(try_opt!(context.config
|
2017-02-22 16:20:50 +13:00
|
|
|
.max_width
|
|
|
|
.checked_sub(expr_offset.width())),
|
2017-02-13 03:16:11 +09:00
|
|
|
expr_offset));
|
|
|
|
expr.map(|s| format!("{}:\n{}{}", name, expr_offset.to_string(&context.config), s))
|
|
|
|
}
|
2016-01-14 20:26:15 +13:00
|
|
|
}
|
|
|
|
}
|
2015-06-16 17:29:05 +02:00
|
|
|
}
|
2015-05-25 19:11:53 +12:00
|
|
|
|
2015-12-06 01:11:26 +01:00
|
|
|
pub fn rewrite_tuple<'a, I>(context: &RewriteContext,
|
|
|
|
mut items: I,
|
2015-10-17 15:56:53 +02:00
|
|
|
span: Span,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-10-17 15:56:53 +02:00
|
|
|
-> Option<String>
|
2015-12-06 01:11:26 +01:00
|
|
|
where I: ExactSizeIterator,
|
|
|
|
<I as Iterator>::Item: Deref,
|
|
|
|
<I::Item as Deref>::Target: Rewrite + Spanned + 'a
|
2015-10-17 15:56:53 +02:00
|
|
|
{
|
2017-02-21 14:43:43 +13:00
|
|
|
debug!("rewrite_tuple {:?}", shape);
|
2015-07-15 00:38:54 +02:00
|
|
|
// In case of length 1, need a trailing comma
|
|
|
|
if items.len() == 1 {
|
|
|
|
// 3 = "(" + ",)"
|
2017-02-21 14:43:43 +13:00
|
|
|
let nested_shape = try_opt!(shape.sub_width(3)).visual_indent(1);
|
2016-09-10 14:02:05 +09:00
|
|
|
return items.next()
|
2017-02-22 16:20:50 +13:00
|
|
|
.unwrap()
|
|
|
|
.rewrite(context, nested_shape)
|
|
|
|
.map(|s| if context.config.spaces_within_parens {
|
|
|
|
format!("( {}, )", s)
|
|
|
|
} else {
|
|
|
|
format!("({},)", s)
|
|
|
|
});
|
2015-07-15 00:38:54 +02:00
|
|
|
}
|
2015-06-23 15:58:58 +02:00
|
|
|
|
2016-03-07 13:41:32 -05:00
|
|
|
let list_lo = context.codemap.span_after(span, "(");
|
2017-02-21 14:43:43 +13:00
|
|
|
let nested_shape = try_opt!(shape.sub_width(2)).visual_indent(1);
|
2015-06-23 15:58:58 +02:00
|
|
|
let items = itemize_list(context.codemap,
|
2015-12-06 01:11:26 +01:00
|
|
|
items,
|
2015-06-23 15:58:58 +02:00
|
|
|
")",
|
2015-10-17 15:56:53 +02:00
|
|
|
|item| item.span().lo,
|
|
|
|
|item| item.span().hi,
|
2017-02-21 14:43:43 +13:00
|
|
|
|item| item.rewrite(context, nested_shape),
|
2015-12-06 01:11:26 +01:00
|
|
|
list_lo,
|
2015-06-23 15:58:58 +02:00
|
|
|
span.hi - BytePos(1));
|
2017-02-21 14:43:43 +13:00
|
|
|
let list_str = try_opt!(format_item_list(items, nested_shape, context.config));
|
2015-06-23 15:58:58 +02:00
|
|
|
|
2016-10-13 04:34:08 +03:00
|
|
|
if context.config.spaces_within_parens && list_str.len() > 0 {
|
|
|
|
Some(format!("( {} )", list_str))
|
|
|
|
} else {
|
|
|
|
Some(format!("({})", list_str))
|
|
|
|
}
|
2015-06-23 15:58:58 +02:00
|
|
|
}
|
2015-07-02 22:40:20 +02:00
|
|
|
|
2015-10-17 14:19:55 +02:00
|
|
|
pub fn rewrite_unary_prefix<R: Rewrite>(context: &RewriteContext,
|
|
|
|
prefix: &str,
|
|
|
|
rewrite: &R,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-10-17 14:19:55 +02:00
|
|
|
-> Option<String> {
|
2017-02-21 14:43:43 +13:00
|
|
|
let shape = try_opt!(shape.shrink_left(prefix.len())).visual_indent(0);
|
|
|
|
rewrite.rewrite(context, shape).map(|r| format!("{}{}", prefix, r))
|
2015-09-23 22:51:37 -07:00
|
|
|
}
|
|
|
|
|
2016-05-09 20:07:59 +02:00
|
|
|
// FIXME: this is probably not correct for multi-line Rewrites. we should
|
|
|
|
// subtract suffix.len() from the last line budget, not the first!
|
|
|
|
pub fn rewrite_unary_suffix<R: Rewrite>(context: &RewriteContext,
|
|
|
|
suffix: &str,
|
|
|
|
rewrite: &R,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2016-05-09 20:07:59 +02:00
|
|
|
-> Option<String> {
|
2017-02-21 14:43:43 +13:00
|
|
|
rewrite.rewrite(context, try_opt!(shape.sub_width(suffix.len())))
|
2016-05-12 21:50:43 +02:00
|
|
|
.map(|mut r| {
|
2017-02-23 08:52:52 +13:00
|
|
|
r.push_str(suffix);
|
|
|
|
r
|
|
|
|
})
|
2016-05-09 20:07:59 +02:00
|
|
|
}
|
|
|
|
|
2015-07-02 22:40:20 +02:00
|
|
|
fn rewrite_unary_op(context: &RewriteContext,
|
|
|
|
op: &ast::UnOp,
|
|
|
|
expr: &ast::Expr,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-07-02 22:40:20 +02:00
|
|
|
-> Option<String> {
|
|
|
|
// For some reason, an UnOp is not spanned like BinOp!
|
|
|
|
let operator_str = match *op {
|
2016-03-01 17:27:19 -05:00
|
|
|
ast::UnOp::Deref => "*",
|
|
|
|
ast::UnOp::Not => "!",
|
|
|
|
ast::UnOp::Neg => "-",
|
2015-07-02 22:40:20 +02:00
|
|
|
};
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_unary_prefix(context, operator_str, expr, shape)
|
2015-07-02 22:40:20 +02:00
|
|
|
}
|
2015-08-21 13:31:09 +02:00
|
|
|
|
|
|
|
fn rewrite_assignment(context: &RewriteContext,
|
|
|
|
lhs: &ast::Expr,
|
|
|
|
rhs: &ast::Expr,
|
|
|
|
op: Option<&ast::BinOp>,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-08-21 13:31:09 +02:00
|
|
|
-> Option<String> {
|
|
|
|
let operator_str = match op {
|
2015-07-17 23:10:15 +02:00
|
|
|
Some(op) => context.snippet(op.span),
|
2015-08-21 13:31:09 +02:00
|
|
|
None => "=".to_owned(),
|
|
|
|
};
|
|
|
|
|
|
|
|
// 1 = space between lhs and operator.
|
2017-02-21 14:43:43 +13:00
|
|
|
let lhs_shape = try_opt!(shape.sub_width(operator_str.len() + 1));
|
2015-09-24 11:01:01 +12:00
|
|
|
let lhs_str = format!("{} {}",
|
2017-02-21 14:43:43 +13:00
|
|
|
try_opt!(lhs.rewrite(context, lhs_shape)),
|
2015-09-24 11:01:01 +12:00
|
|
|
operator_str);
|
2015-08-21 13:31:09 +02:00
|
|
|
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_assign_rhs(context, lhs_str, rhs, shape)
|
2015-08-21 13:31:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// The left hand side must contain everything up to, and including, the
|
|
|
|
// assignment operator.
|
|
|
|
pub fn rewrite_assign_rhs<S: Into<String>>(context: &RewriteContext,
|
|
|
|
lhs: S,
|
|
|
|
ex: &ast::Expr,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-08-21 13:31:09 +02:00
|
|
|
-> Option<String> {
|
|
|
|
let mut result = lhs.into();
|
2015-10-24 12:19:58 +02:00
|
|
|
let last_line_width = last_line_width(&result) -
|
|
|
|
if result.contains('\n') {
|
2017-02-22 16:20:50 +13:00
|
|
|
shape.indent.width()
|
|
|
|
} else {
|
|
|
|
0
|
|
|
|
};
|
2015-08-21 13:31:09 +02:00
|
|
|
// 1 = space between operator and rhs.
|
2017-01-31 08:28:48 +13:00
|
|
|
let max_width = try_opt!(shape.width.checked_sub(last_line_width + 1));
|
|
|
|
let rhs = ex.rewrite(context,
|
2017-02-21 14:43:43 +13:00
|
|
|
Shape::offset(max_width,
|
|
|
|
shape.indent.block_only(),
|
|
|
|
shape.indent.alignment + last_line_width + 1));
|
2015-08-21 13:31:09 +02:00
|
|
|
|
2016-05-09 20:11:25 +02:00
|
|
|
fn count_line_breaks(src: &str) -> usize {
|
|
|
|
src.chars().filter(|&x| x == '\n').count()
|
|
|
|
}
|
|
|
|
|
2015-08-21 13:31:09 +02:00
|
|
|
match rhs {
|
2016-05-09 20:11:25 +02:00
|
|
|
Some(ref new_str) if count_line_breaks(new_str) < 2 => {
|
2015-08-21 13:31:09 +02:00
|
|
|
result.push(' ');
|
2016-05-09 20:11:25 +02:00
|
|
|
result.push_str(new_str);
|
2015-08-21 13:31:09 +02:00
|
|
|
}
|
2016-05-09 20:11:25 +02:00
|
|
|
_ => {
|
|
|
|
// Expression did not fit on the same line as the identifier or is
|
|
|
|
// at least three lines big. Try splitting the line and see
|
|
|
|
// if that works better.
|
2017-01-31 08:28:48 +13:00
|
|
|
let new_offset = shape.indent.block_indent(context.config);
|
|
|
|
let max_width = try_opt!((shape.width + shape.indent.width())
|
2017-02-22 16:20:50 +13:00
|
|
|
.checked_sub(new_offset.width()));
|
2017-02-21 14:43:43 +13:00
|
|
|
let new_rhs = ex.rewrite(context, Shape::legacy(max_width, new_offset));
|
2016-05-09 20:11:25 +02:00
|
|
|
|
|
|
|
// FIXME: DRY!
|
|
|
|
match (rhs, new_rhs) {
|
|
|
|
(Some(ref orig_rhs), Some(ref replacement_rhs))
|
2016-05-12 21:50:43 +02:00
|
|
|
if count_line_breaks(orig_rhs) >
|
|
|
|
count_line_breaks(replacement_rhs) + 1 => {
|
2016-05-09 20:11:25 +02:00
|
|
|
result.push_str(&format!("\n{}", new_offset.to_string(context.config)));
|
|
|
|
result.push_str(replacement_rhs);
|
|
|
|
}
|
|
|
|
(None, Some(ref final_rhs)) => {
|
|
|
|
result.push_str(&format!("\n{}", new_offset.to_string(context.config)));
|
|
|
|
result.push_str(final_rhs);
|
|
|
|
}
|
|
|
|
(None, None) => return None,
|
|
|
|
(Some(ref orig_rhs), _) => {
|
|
|
|
result.push(' ');
|
|
|
|
result.push_str(orig_rhs);
|
|
|
|
}
|
|
|
|
}
|
2015-08-21 13:31:09 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Some(result)
|
|
|
|
}
|
2015-09-24 01:13:57 -07:00
|
|
|
|
|
|
|
fn rewrite_expr_addrof(context: &RewriteContext,
|
|
|
|
mutability: ast::Mutability,
|
|
|
|
expr: &ast::Expr,
|
2017-01-31 08:28:48 +13:00
|
|
|
shape: Shape)
|
2015-09-24 01:13:57 -07:00
|
|
|
-> Option<String> {
|
|
|
|
let operator_str = match mutability {
|
2016-03-01 17:27:19 -05:00
|
|
|
ast::Mutability::Immutable => "&",
|
|
|
|
ast::Mutability::Mutable => "&mut ",
|
2015-09-24 01:13:57 -07:00
|
|
|
};
|
2017-01-31 08:28:48 +13:00
|
|
|
rewrite_unary_prefix(context, operator_str, expr, shape)
|
2015-09-24 01:13:57 -07:00
|
|
|
}
|