bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use correct span for tuple struct's body

Browse source
This commit is contained in:
topecongiro 2017-11-03 23:53:07 +09:00
parent 84526ab87e
commit 3973cdd0a8
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/items.rs
View file

@ -1189,12 +1189,13 @@ fn format_tuple_struct(
result.push_str(&header_str);
let body_lo = if fields.is_empty() {
context.codemap.span_after(span, "(")
let lo = get_bytepos_after_visibility(context, vis, span, ")");
context.codemap.span_after(mk_sp(lo, span.hi()), "(")
} else {
fields[0].span.lo()
};
let body_hi = if fields.is_empty() {
context.codemap.span_after(span, ")")
context.codemap.span_after(mk_sp(body_lo, span.hi()), ")")
} else {
// This is a dirty hack to work around a missing `)` from the span of the last field.
let last_arg_span = fields[fields.len() - 1].span;
@ -1242,7 +1243,10 @@ fn format_tuple_struct(
.to_string(context.config))
}
result.push('(');
let snippet = context.snippet(mk_sp(body_lo, context.codemap.span_before(span, ")")));
let snippet = context.snippet(mk_sp(
body_lo,
context.codemap.span_before(mk_sp(body_lo, span.hi()), ")"),
));
if snippet.is_empty() {
// `struct S ()`
} else if snippet.trim_right_matches(&[' ', '\t'][..]).ends_with('\n') {