itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #6715

Browse Source 
6715: Don't diagnose `#[cfg]` in macros r=jonas-schievink a=jonas-schievink

Fixes https://github.com/rust-analyzer/rust-analyzer/issues/6363

bors r+

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
This commit is contained in:
bors[bot] 2020-12-03 19:47:00 +00:00 committed by GitHub
commit b988c6f84e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/ide/src/diagnostics.rs
View File

@ -135,6 +135,11 @@ pub(crate) fn diagnostics(
res.borrow_mut().push(warning_with_fix(d, &sema)); res.borrow_mut().push(warning_with_fix(d, &sema));
}) })
.on::<hir::diagnostics::InactiveCode, _>(|d| { .on::<hir::diagnostics::InactiveCode, _>(|d| {
// If there's inactive code somewhere in a macro, don't propagate to the call-site.
if d.display_source().file_id.expansion_info(db).is_some() {
return;
}
// Override severity and mark as unused. // Override severity and mark as unused.
res.borrow_mut().push( res.borrow_mut().push(
Diagnostic::hint(sema.diagnostics_display_range(d).range, d.message()) Diagnostic::hint(sema.diagnostics_display_range(d).range, d.message())