X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmacros.rs;h=49f4a03ee1db8a7afecdf7f05e8eb8186b6817df;hb=cbd568083d87a90dfe5ab0e90f404454946c9f20;hp=439fd446e5c8daca6980b6be361ac57bdd3a9e74;hpb=9a5a86164f25f937683d5b830ae1c8dd0b51df0d;p=rust.git diff --git a/src/macros.rs b/src/macros.rs index 439fd446e5c..49f4a03ee1d 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -22,17 +22,16 @@ use std::collections::HashMap; use config::lists::*; -use syntax::codemap::{BytePos, Span}; use syntax::parse::new_parser_from_tts; use syntax::parse::parser::Parser; use syntax::parse::token::{BinOpToken, DelimToken, Token}; use syntax::print::pprust; +use syntax::source_map::{BytePos, Span}; use syntax::symbol; use syntax::tokenstream::{Cursor, ThinTokenStream, TokenStream, TokenTree}; -use syntax::util::ThinVec; +use syntax::ThinVec; use syntax::{ast, ptr}; -use codemap::SpanUtils; use comment::{ contains_comment, remove_trailing_white_spaces, CharClasses, FindUncommented, FullCodeCharKind, LineClasses, @@ -42,8 +41,10 @@ use overflow; use rewrite::{Rewrite, RewriteContext}; use shape::{Indent, Shape}; +use source_map::SpanUtils; use spanned::Spanned; use utils::{format_visibility, mk_sp, rewrite_ident, wrap_str}; +use visitor::FmtVisitor; const FORCED_BRACKET_MACROS: &[&str] = &["vec!"]; @@ -63,13 +64,22 @@ pub enum MacroArg { Item(ptr::P), } +impl MacroArg { + fn is_item(&self) -> bool { + match self { + MacroArg::Item(..) => true, + _ => false, + } + } +} + impl Rewrite for ast::Item { fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option { let mut visitor = ::visitor::FmtVisitor::from_context(context); visitor.block_indent = shape.indent; visitor.last_pos = self.span().lo(); visitor.visit_item(self); - Some(visitor.buffer) + Some(visitor.buffer.to_owned()) } } @@ -259,6 +269,7 @@ pub fn rewrite_macro_inner( } return return_original_snippet_with_failure_marked(context, mac.span); } + _ if arg_vec.last().map_or(false, MacroArg::is_item) => continue, _ => return return_original_snippet_with_failure_marked(context, mac.span), } @@ -271,6 +282,18 @@ pub fn rewrite_macro_inner( } } + if !arg_vec.is_empty() && arg_vec.iter().all(MacroArg::is_item) { + return rewrite_macro_with_items( + context, + &arg_vec, + ¯o_name, + shape, + style, + position, + mac.span, + ); + } + match style { DelimToken::Paren => { // Format macro invocation as function call, preserve the trailing @@ -278,7 +301,7 @@ pub fn rewrite_macro_inner( overflow::rewrite_with_parens( context, ¯o_name, - &arg_vec.iter().map(|e| &*e).collect::>(), + arg_vec.iter(), shape, mac.span, context.config.width_heuristics().fn_call_width, @@ -287,7 +310,8 @@ pub fn rewrite_macro_inner( } else { Some(SeparatorTactic::Never) }, - ).map(|rw| match position { + ) + .map(|rw| match position { MacroPosition::Item => format!("{};", rw), _ => rw, }) @@ -333,11 +357,9 @@ pub fn rewrite_macro_inner( force_trailing_comma = Some(SeparatorTactic::Vertical); }; } - // Convert `MacroArg` into `ast::Expr`, as `rewrite_array` only accepts the latter. - let arg_vec = &arg_vec.iter().map(|e| &*e).collect::>(); let rewrite = rewrite_array( macro_name, - arg_vec, + arg_vec.iter(), mac.span, context, shape, @@ -406,11 +428,20 @@ pub fn rewrite_macro_def( ";", |branch| branch.span.lo(), |branch| branch.span.hi(), - |branch| branch.rewrite(context, arm_shape, multi_branch_style), + |branch| match branch.rewrite(context, arm_shape, multi_branch_style) { + Some(v) => Some(v), + // if the rewrite returned None because a macro could not be rewritten, then return the + // original body + None if *context.macro_rewrite_failure.borrow() == true => { + Some(context.snippet(branch.body).trim().to_string()) + } + None => None, + }, context.snippet_provider.span_after(span, "{"), span.hi(), false, - ).collect::>(); + ) + .collect::>(); let fmt = ListFormatting::new(arm_shape, context.config) .separator(if def.legacy { ";" } else { "" }) @@ -524,12 +555,12 @@ enum MacroArgKind { fn delim_token_to_str( context: &RewriteContext, - delim_token: &DelimToken, + delim_token: DelimToken, shape: Shape, use_multiple_lines: bool, inner_is_empty: bool, ) -> (String, String) { - let (lhs, rhs) = match *delim_token { + let (lhs, rhs) = match delim_token { DelimToken::Paren => ("(", ")"), DelimToken::Bracket => ("[", "]"), DelimToken::Brace => { @@ -612,7 +643,7 @@ fn rewrite( MacroArgKind::MetaVariable(ty, ref name) => { Some(format!("${}:{}", name, ty.name.as_str())) } - MacroArgKind::Repeat(ref delim_tok, ref args, ref another, ref tok) => { + MacroArgKind::Repeat(delim_tok, ref args, ref another, ref tok) => { let (lhs, inner, rhs) = rewrite_delimited_inner(delim_tok, args)?; let another = another .as_ref() @@ -622,7 +653,7 @@ fn rewrite( Some(format!("${}{}{}{}{}", lhs, inner, rhs, another, repeat_tok)) } - MacroArgKind::Delimited(ref delim_tok, ref args) => { + MacroArgKind::Delimited(delim_tok, ref args) => { rewrite_delimited_inner(delim_tok, args) .map(|(lhs, inner, rhs)| format!("{}{}{}", lhs, inner, rhs)) } @@ -755,8 +786,8 @@ fn add_repeat( let mut hi = span.hi(); // Parse '*', '+' or '?. - for ref tok in iter { - self.set_last_tok(tok); + for tok in iter { + self.set_last_tok(&tok); if first { first = false; lo = tok.span().lo(); @@ -855,7 +886,7 @@ pub fn parse(mut self, tokens: ThinTokenStream) -> Option> { self.add_meta_variable(&mut iter)?; } TokenTree::Token(sp, ref t) => self.update_buffer(sp.lo(), t), - TokenTree::Delimited(sp, delimited) => { + TokenTree::Delimited(delimited_span, delimited) => { if !self.buf.is_empty() { if next_space(&self.last_tok) == SpaceState::Always { self.add_separator(); @@ -866,14 +897,15 @@ pub fn parse(mut self, tokens: ThinTokenStream) -> Option> { // Parse the stuff inside delimiters. let mut parser = MacroArgParser::new(); - parser.lo = sp.lo(); + parser.lo = delimited_span.open.lo(); let delimited_arg = parser.parse(delimited.tts.clone())?; + let span = delimited_span.entire(); if self.is_meta_var { - self.add_repeat(delimited_arg, delimited.delim, &mut iter, *sp)?; + self.add_repeat(delimited_arg, delimited.delim, &mut iter, span)?; self.is_meta_var = false; } else { - self.add_delimited(delimited_arg, delimited.delim, *sp); + self.add_delimited(delimited_arg, delimited.delim, span); } } } @@ -977,7 +1009,7 @@ enum SpaceState { fn force_space_before(tok: &Token) -> bool { debug!("tok: force_space_before {:?}", tok); - match *tok { + match tok { Token::Eq | Token::Lt | Token::Le @@ -1002,7 +1034,7 @@ fn force_space_before(tok: &Token) -> bool { } fn ident_like(tok: &Token) -> bool { - match *tok { + match tok { Token::Ident(..) | Token::Literal(..) | Token::Lifetime(_) => true, _ => false, } @@ -1011,7 +1043,7 @@ fn ident_like(tok: &Token) -> bool { fn next_space(tok: &Token) -> SpaceState { debug!("next_space: {:?}", tok); - match *tok { + match tok { Token::Not | Token::BinOp(BinOpToken::And) | Token::Tilde @@ -1117,6 +1149,7 @@ fn indent_macro_snippet( } else { Some(get_prefix_space_width(context, &line)) }; + let line = if veto_trim || (kind.is_string() && !line.ends_with('\\')) { veto_trim = kind.is_string() && !line.ends_with('\\'); trimmed = false; @@ -1125,25 +1158,34 @@ fn indent_macro_snippet( line.trim().to_owned() }; trimmed_lines.push((trimmed, line, prefix_space_width)); - prefix_space_width - }).min()?; + + // when computing the minimum, do not consider lines within a string + match kind { + FullCodeCharKind::InString | FullCodeCharKind::EndString => None, + _ => prefix_space_width, + } + }) + .min()?; Some( - first_line + "\n" + &trimmed_lines - .iter() - .map( - |&(trimmed, ref line, prefix_space_width)| match prefix_space_width { - _ if !trimmed => line.to_owned(), - Some(original_indent_width) => { - let new_indent_width = indent.width() + original_indent_width - .saturating_sub(min_prefix_space_width); - let new_indent = Indent::from_width(context.config, new_indent_width); - format!("{}{}", new_indent.to_string(context.config), line.trim()) - } - None => String::new(), - }, - ).collect::>() - .join("\n"), + first_line + + "\n" + + &trimmed_lines + .iter() + .map( + |&(trimmed, ref line, prefix_space_width)| match prefix_space_width { + _ if !trimmed => line.to_owned(), + Some(original_indent_width) => { + let new_indent_width = indent.width() + + original_indent_width.saturating_sub(min_prefix_space_width); + let new_indent = Indent::from_width(context.config, new_indent_width); + format!("{}{}", new_indent.to_string(context.config), line) + } + None => String::new(), + }, + ) + .collect::>() + .join("\n"), ) } @@ -1186,7 +1228,7 @@ fn parse_branch(&mut self) -> Option { let tok = self.toks.next()?; let (lo, args_paren_kind) = match tok { TokenTree::Token(..) => return None, - TokenTree::Delimited(sp, ref d) => (sp.lo(), d.delim), + TokenTree::Delimited(delimited_span, ref d) => (delimited_span.open.lo(), d.delim), }; let args = tok.joint().into(); match self.toks.next()? { @@ -1195,12 +1237,12 @@ fn parse_branch(&mut self) -> Option { } let (mut hi, body, whole_body) = match self.toks.next()? { TokenTree::Token(..) => return None, - TokenTree::Delimited(sp, _) => { - let data = sp.data(); + TokenTree::Delimited(delimited_span, _) => { + let data = delimited_span.entire().data(); ( data.hi, Span::new(data.lo + BytePos(1), data.hi - BytePos(1), data.ctxt), - sp, + delimited_span.entire(), ) } }; @@ -1285,10 +1327,14 @@ fn rewrite( // First try to format as items, then as statements. let new_body = match ::format_snippet(&body_str, &config) { Some(new_body) => new_body, - None => match ::format_code_block(&body_str, &config) { - Some(new_body) => new_body, - None => return None, - }, + None => { + let new_width = new_width + config.tab_spaces(); + config.set().max_width(new_width); + match ::format_code_block(&body_str, &config) { + Some(new_body) => new_body, + None => return None, + } + } }; let new_body = wrap_str(new_body, config.max_width(), shape)?; @@ -1303,7 +1349,8 @@ fn rewrite( } (s + l + "\n", !kind.is_string() || l.ends_with('\\')) }, - ).0; + ) + .0; // Undo our replacement of macro variables. // FIXME: this could be *much* more efficient. @@ -1406,3 +1453,45 @@ fn format_lazy_static(context: &RewriteContext, shape: Shape, ts: &TokenStream) Some(result) } + +fn rewrite_macro_with_items( + context: &RewriteContext, + items: &[MacroArg], + macro_name: &str, + shape: Shape, + style: DelimToken, + position: MacroPosition, + span: Span, +) -> Option { + let (opener, closer) = match style { + DelimToken::Paren => ("(", ")"), + DelimToken::Bracket => ("[", "]"), + DelimToken::Brace => (" {", "}"), + _ => return None, + }; + let trailing_semicolon = match style { + DelimToken::Paren | DelimToken::Bracket if position == MacroPosition::Item => ";", + _ => "", + }; + + let mut visitor = FmtVisitor::from_context(context); + visitor.block_indent = shape.indent.block_indent(context.config); + visitor.last_pos = context.snippet_provider.span_after(span, opener.trim()); + for item in items { + let item = match item { + MacroArg::Item(item) => item, + _ => return None, + }; + visitor.visit_item(&item); + } + + let mut result = String::with_capacity(256); + result.push_str(¯o_name); + result.push_str(opener); + result.push_str(&visitor.block_indent.to_string_with_newline(context.config)); + result.push_str(visitor.buffer.trim()); + result.push_str(&shape.indent.to_string_with_newline(context.config)); + result.push_str(closer); + result.push_str(trailing_semicolon); + return Some(result); +}