diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-02-21 12:44:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-21 12:44:10 +0000 |
| commit | 36f302355b864d9c4a454e1436aad4ce0b91f70a (patch) | |
| tree | fdb7b11bed2e0b6ee8333fd69b124928a908ac10 | |
| parent | d771e3a7e939e0ed3ac65e666a4e0d4ffc9af6f0 (diff) | |
| parent | 8cdef2ffcf09e1830d62eb82e0b484341bec39f0 (diff) | |
| download | rust-36f302355b864d9c4a454e1436aad4ce0b91f70a.tar.gz rust-36f302355b864d9c4a454e1436aad4ce0b91f70a.zip | |
Merge #11516
11516: fix: Don't count commas when looking for the derive attribute in diagnostics r=Veykril a=Veykril bors r+ Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
| -rw-r--r-- | crates/hir/src/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index c75ceed9e3a..a26d8e9ebf9 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -649,6 +649,7 @@ fn emit_def_diagnostic(db: &dyn HirDatabase, acc: &mut Vec<AnyDiagnostic>, diag: }) .group_by(|t| t.kind() == T![,]) .into_iter() + .filter(|&(comma, _)| !comma) .nth(*derive_index as usize) .and_then(|(_, mut g)| g.find(|t| t.kind() == T![ident])) })(); |