Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 10 additions & 6 deletions src/attr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,23 @@ fn format_derive(
// attribute is not parseable, none of the attributes will be
// reformatted.
let item_spans = attr.meta_item_list().map(|meta_item_list| {
meta_item_list
.into_iter()
.map(|meta_item_inner| meta_item_inner.span())
meta_item_list.into_iter().map(|meta_item_inner| {
// Try to format the path, if it fails, fallback to the original
let formatted = meta_item_inner
.rewrite(context, shape)
.unwrap_or_else(|| context.snippet(meta_item_inner.span()).to_owned());
(meta_item_inner.span(), formatted)
})
})?;

let items = itemize_list(
context.snippet_provider,
item_spans,
")",
",",
|span| span.lo(),
|span| span.hi(),
|span| Ok(context.snippet(*span).to_owned()),
|(span, _)| span.lo(),
|(span, _)| span.hi(),
|(_, data)| Ok(data.to_string()),
// We update derive attribute spans to start after the opening '('
// This helps us focus parsing to just what's inside #[derive(...)]
context.snippet_provider.span_after(attr.span, "("),
Expand Down
16 changes: 16 additions & 0 deletions tests/source/issue-6343.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#[derive(serde :: Serialize)]
enum Something {
Variant
}

#[derive(
serde :: Serialize,
IReallyLoveToWriteLongDerives,
Debug,
Eq,
PartialEq, Ord, PartialOrd,
Hash, Clone, Copy, Default
)]
enum SomethingComplex {
Variant5
}
21 changes: 21 additions & 0 deletions tests/target/issue-6343.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#[derive(serde::Serialize)]
enum Something {
Variant,
}

#[derive(
serde::Serialize,
IReallyLoveToWriteLongDerives,
Debug,
Eq,
PartialEq,
Ord,
PartialOrd,
Hash,
Clone,
Copy,
Default,
)]
enum SomethingComplex {
Variant5,
}
Loading