nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-31 17:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use block indent when visual indent failed

Browse Source
This commit is contained in:
topecongiro 2017-05-08 08:07:18 +09:00
parent 459b4449a6
commit d062d79fb5
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/expr.rs
View File

@ -681,8 +681,9 @@ impl Rewrite for ast::Block {
};
visitor.visit_block(self);
if visitor.failed {
None
if visitor.failed && shape.indent.alignment != 0 {
self.rewrite(context,
Shape::indented(shape.indent.block_only(), context.config))
} else {
Some(format!("{}{}", prefix, visitor.buffer))
}

20
src/visitor.rs
View File

@ -65,9 +65,6 @@ impl<'a> FmtVisitor<'a> {
let rewrite =
stmt.rewrite(&self.get_context(),
Shape::indented(self.block_indent, self.config));
if rewrite.is_none() {
self.failed = true;
}
self.push_rewrite(stmt.span, rewrite);
}
ast::StmtKind::Mac(ref mac) => {
@ -433,17 +430,22 @@ impl<'a> FmtVisitor<'a> {
fn visit_mac(&mut self, mac: &ast::Mac, ident: Option<ast::Ident>, pos: MacroPosition) {
// 1 = ;
let width = self.config.max_width - self.block_indent.width() - 1;
let rewrite = rewrite_macro(mac,
ident,
&self.get_context(),
Shape::legacy(width, self.block_indent),
pos);
let shape = Shape::indented(self.block_indent, self.config)
.sub_width(1)
.unwrap();
let rewrite = rewrite_macro(mac, ident, &self.get_context(), shape, pos);
self.push_rewrite(mac.span, rewrite);
}
fn push_rewrite(&mut self, span: Span, rewrite: Option<String>) {
self.format_missing_with_indent(source!(self, span).lo);
self.failed = match rewrite {
Some(ref s) if s.rewrite(&self.get_context(),
Shape::indented(self.block_indent, self.config))
.is_none() => true,
None => true,
_ => self.failed,
};
let result = rewrite.unwrap_or_else(|| self.snippet(span));
self.buffer.push_str(&result);
self.last_pos = source!(self, span).hi;

5
tests/source/large-block.rs Normal file
View File

@ -0,0 +1,5 @@
fn issue1351() {
std_fmt_Arguments_new_v1_std_rt_begin_panic_fmt_sdfasfasdfasdf({
static __STATIC_FMTSTR: &'static [&'static str] = &[];
});
}

5
tests/target/large-block.rs Normal file
View File

@ -0,0 +1,5 @@
fn issue1351() {
std_fmt_Arguments_new_v1_std_rt_begin_panic_fmt_sdfasfasdfasdf({
static __STATIC_FMTSTR: &'static [&'static str] = &[];
});
}