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

use the lists module for formatting the generic bounds #3680

Closed
wants to merge 11 commits into from
Closed

use the lists module for formatting the generic bounds #3680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7aad919
use the lists module for formatting the generic bounds
scampi Jul 9, 2019
ca9ffcc
add tests with type_punctuation_density set to Compressed and a list …
scampi Jul 12, 2019
2f9357b
clarified logic for formatting the type bounds as a list
scampi Jul 16, 2019
3850fb1
trailing newlines in post_comments should be removed
scampi Jul 24, 2019
58ad27c
take into consideration the length taken by the separator when aligni…
scampi Jul 30, 2019
62961be
extract some write_list variables into separate structs to better ind…
scampi Jul 31, 2019
9865ce0
move item_max_width into the PostCommentAlignment struct
scampi Jul 31, 2019
db09dac
add documentation and clarify some code about list stringification
scampi Jul 31, 2019
8ee296d
Merge branch 'master' of github.com:rust-lang/rustfmt into format-bou…
scampi Sep 20, 2019
a601c5e
fix indent in types_compressed.rs test following #3731
scampi Sep 20, 2019
6e2202e
gated the handling of comment in types list
scampi Sep 25, 2019
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
8 changes: 4 additions & 4 deletions src/comment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1789,7 +1789,7 @@ mod test {
* test3
*/"#,
false,
Shape::legacy(100, Indent::new(0, 0)),
Shape::legacy(100, Indent::empty()),
&wrap_normalize_config).unwrap();
assert_eq!("/// test1\n/// test2\n// test3", comment);

Expand All @@ -1798,7 +1798,7 @@ mod test {

// test2"#,
false,
Shape::legacy(100, Indent::new(0, 0)),
Shape::legacy(100, Indent::empty()),
&wrap_normalize_config).unwrap();
assert_eq!("// test1\n\n// test2", comment);

Expand All @@ -1807,7 +1807,7 @@ mod test {

//@ test2"#,
false,
Shape::legacy(100, Indent::new(0, 0)),
Shape::legacy(100, Indent::empty()),
&wrap_normalize_config).unwrap();
assert_eq!("//@ test1\n\n//@ test2", comment);

Expand All @@ -1819,7 +1819,7 @@ mod test {
another bare line!
*/"#,
false,
Shape::legacy(100, Indent::new(0, 0)),
Shape::legacy(100, Indent::empty()),
&wrap_config).unwrap();
assert_eq!("// test1\n/*\n a bare line!\n\n another bare line!\n*/", comment);
}
Expand Down
40 changes: 28 additions & 12 deletions src/items.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,20 +990,32 @@ pub(crate) fn format_trait(
rewrite_generics(context, rewrite_ident(context, item.ident), generics, shape)?;
result.push_str(&generics_str);

// FIXME(#2055): rustfmt fails to format when there are comments between trait bounds.
if !generic_bounds.is_empty() {
let ident_hi = context
.snippet_provider
.span_after(item.span, &item.ident.as_str());
let bound_hi = generic_bounds.last().unwrap().span().hi();
let snippet = context.snippet(mk_sp(ident_hi, bound_hi));
if contains_comment(snippet) {
return None;
}

let comment = if context.config.version() == Version::Two {
let comment_span = mk_sp(generics.span.hi(), generic_bounds[0].span().lo());
let after_colon = context.snippet_provider.span_after(comment_span, ":");
recover_missing_comment_in_span(
mk_sp(after_colon, comment_span.hi()),
shape,
context,
// 1 = ":"
last_line_width(&result) + 1,
)
.unwrap_or_default()
} else {
let ident_hi = context
.snippet_provider
.span_after(item.span, &item.ident.as_str());
let bound_hi = generic_bounds.last().unwrap().span().hi();
let snippet = context.snippet(mk_sp(ident_hi, bound_hi));
if contains_comment(snippet) {
return None;
}
String::new()
};
result = rewrite_assign_rhs_with(
context,
result + ":",
format!("{}:{}", result, comment),
generic_bounds,
shape,
RhsTactics::ForceNextLineWithoutIndent,
Expand Down Expand Up @@ -1048,7 +1060,11 @@ pub(crate) fn format_trait(
if let Some(lo) = item_snippet.find('/') {
// 1 = `{`
let comment_hi = body_lo - BytePos(1);
let comment_lo = item.span.lo() + BytePos(lo as u32);
let comment_lo = if generic_bounds.is_empty() {
item.span.lo() + BytePos(lo as u32)
} else {
generic_bounds[generic_bounds.len() - 1].span().hi()
};
if comment_lo < comment_hi {
match recover_missing_comment_in_span(
mk_sp(comment_lo, comment_hi),
Expand Down
Loading