Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle empty tuple struct def with comment properly #1453

Merged
merged 2 commits into from
May 2, 2017
Merged

Handle empty tuple struct def with comment properly #1453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e00c11
Handle empty tuple struct def properly
topecongiro Apr 14, 2017
93dae1a
Add test for empty tuple struct with comment
topecongiro Apr 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 74 additions & 50 deletions src/items.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,6 @@ fn format_struct_struct(context: &RewriteContext,
};
result.push_str(&generics_str);

// FIXME(#919): properly format empty structs and their comments.
if fields.is_empty() {
let snippet = context.snippet(mk_sp(body_lo, span.hi - BytePos(1)));
if snippet.trim().is_empty() {
Expand Down Expand Up @@ -995,9 +994,8 @@ fn format_tuple_struct(context: &RewriteContext,
let header_str = format_header(item_name, ident, vis);
result.push_str(&header_str);

// FIXME(#919): don't lose comments on empty tuple structs.
let body_lo = if fields.is_empty() {
span.hi
context.codemap.span_after(span, "(")
} else {
fields[0].span.lo
};
Expand Down Expand Up @@ -1027,58 +1025,84 @@ fn format_tuple_struct(context: &RewriteContext,
None => "".to_owned(),
};

let (tactic, item_indent) = match context.config.fn_args_layout {
IndentStyle::Visual => {
// 1 = `(`
(ListTactic::HorizontalVertical, offset.block_only() + result.len() + 1)
}
IndentStyle::Block => {
(ListTactic::HorizontalVertical, offset.block_only().block_indent(&context.config))
}
};
// 3 = `();`
let item_budget = try_opt!(context
.config
.max_width
.checked_sub(item_indent.width() + 3));
let shape = Shape::legacy(item_budget, item_indent);

let items = itemize_list(context.codemap,
fields.iter(),
")",
|field| {
// Include attributes and doc comments, if present
if !field.attrs.is_empty() {
field.attrs[0].span.lo
} else {
field.span.lo
}
},
|field| field.ty.span.hi,
|field| field.rewrite(context, shape),
context.codemap.span_after(span, "("),
span.hi);
let body = try_opt!(list_helper(items, shape, context.config, tactic));

if context.config.fn_args_layout == IndentStyle::Visual || !body.contains('\n') {
if fields.is_empty() {
result.push('(');
if context.config.spaces_within_parens && body.len() > 0 {
result.push(' ');
let snippet = context.snippet(mk_sp(body_lo, context.codemap.span_before(span, ")")));
if snippet.is_empty() {
// `struct S ()`
} else if snippet
.trim_right_matches(&[' ', '\t'][..])
.ends_with('\n') {
result.push_str(&snippet.trim_right());
result.push('\n');
result.push_str(&offset.to_string(context.config));
} else {
result.push_str(&snippet);
}
result.push(')');
} else {
let (tactic, item_indent) = match context.config.fn_args_layout {
IndentStyle::Visual => {
// 1 = `(`
(ListTactic::HorizontalVertical, offset.block_only() + result.len() + 1)
}
IndentStyle::Block => {
(ListTactic::HorizontalVertical, offset.block_only().block_indent(&context.config))
}
};
// 3 = `();`
let item_budget = try_opt!(context
.config
.max_width
.checked_sub(item_indent.width() + 3));

let items =
itemize_list(context.codemap,
fields.iter(),
")",
|field| {
// Include attributes and doc comments, if present
if !field.attrs.is_empty() {
field.attrs[0].span.lo
} else {
field.span.lo
}
},
|field| field.ty.span.hi,
|field| field.rewrite(context, Shape::legacy(item_budget, item_indent)),
context.codemap.span_after(span, "("),
span.hi);
let body_budget = try_opt!(context
.config
.max_width
.checked_sub(offset.block_only().width() + result.len() +
3));
let body = try_opt!(list_helper(items,
// TODO budget is wrong in block case
Shape::legacy(body_budget, item_indent),
context.config,
tactic));

if context.config.fn_args_layout == IndentStyle::Visual || !body.contains('\n') {
result.push('(');
if context.config.spaces_within_parens && body.len() > 0 {
result.push(' ');
}

result.push_str(&body);
result.push_str(&body);

if context.config.spaces_within_parens && body.len() > 0 {
result.push(' ');
if context.config.spaces_within_parens && body.len() > 0 {
result.push(' ');
}
result.push(')');
} else {
result.push_str("(\n");
result.push_str(&item_indent.to_string(&context.config));
result.push_str(&body);
result.push('\n');
result.push_str(&offset.block_only().to_string(&context.config));
result.push(')');
}
result.push(')');
} else {
result.push_str("(\n");
result.push_str(&item_indent.to_string(&context.config));
result.push_str(&body);
result.push('\n');
result.push_str(&offset.block_only().to_string(&context.config));
result.push(')');
}

if !where_clause_str.is_empty() && !where_clause_str.contains('\n') &&
Expand Down
2 changes: 1 addition & 1 deletion tests/source/structs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ struct Foo {

}
struct Foo { /* comment */ }
struct Foo();
struct Foo( /* comment */ );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new line should be in addition to the old one, not replace it.


struct LongStruct {
a: A,
Expand Down
2 changes: 1 addition & 1 deletion tests/target/structs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ struct Foo {
// trailing space ->
}
struct Foo { /* comment */ }
struct Foo();
struct Foo( /* comment */ );

struct LongStruct {
a: A,
Expand Down