Skip to content

Fix/comments inside trait generics gets duplicated #5446

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

Merged
merged 4 commits into from
Jul 18, 2022
Merged

Fix/comments inside trait generics gets duplicated #5446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b84b39
Bugfix: Now slash/start comments aren't duplicated on trait parameters.
jmj0502 Jul 16, 2022
2e205b9
Removing unnecesary comment.
jmj0502 Jul 16, 2022
83b82a6
Improvements: Improving the BytePos offset.
jmj0502 Jul 16, 2022
2ce5697
Improvements: Improving the description of the test cases.
jmj0502 Jul 17, 2022
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
6 changes: 5 additions & 1 deletion src/items.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,11 @@ pub(crate) fn format_trait(
let item_snippet = context.snippet(item.span);
if let Some(lo) = item_snippet.find('/') {
// 1 = `{`
let comment_hi = body_lo - BytePos(1);
let comment_hi = if generics.params.len() > 0 {
generics.span.lo() - BytePos(1)
} else {
body_lo - BytePos(1)
};
let comment_lo = item.span.lo() + BytePos(lo as u32);
if comment_lo < comment_hi {
match recover_missing_comment_in_span(
Expand Down
4 changes: 4 additions & 0 deletions tests/target/issue-5358.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Test /* comment */ inside trait generics does not get duplicated.
trait Test</* comment */ T> {}

trait TestTwo</* comment */ T, /* comment */ V> {}