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
4 changes: 4 additions & 0 deletions crates/hir/src/semantics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,10 @@ impl<'db> SemanticsImpl<'db> {
node
}

pub fn to_node_syntax(&self, ptr: InFile<SyntaxNodePtr>) -> SyntaxNode {
ptr.value.to_node(&self.parse_or_expand(ptr.file_id))
}

pub fn to_node<N: AstNode>(&self, ptr: InFile<AstPtr<N>>) -> N {
ptr.value.to_node(&self.parse_or_expand(ptr.file_id))
}
Expand Down
20 changes: 20 additions & 0 deletions crates/ide-diagnostics/src/handlers/field_shorthand.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,4 +220,24 @@ fn f(a: A) {
"#,
);
}

#[test]
fn diagnostic_range_respect_allows() {
check_diagnostics(
r#"
#![allow(clippy::redundant_field_names, unused)]

struct Foo {
bar: u32,
}

fn main() {
let bar = 23;
let foo = Foo {
bar: bar,
};
}
"#,
);
}
}
28 changes: 20 additions & 8 deletions crates/ide-diagnostics/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,25 @@ impl Diagnostic {
self.unused = unused;
self
}

fn main_node(&self, sema: &Semantics<'_, RootDatabase>) -> Option<InFile<SyntaxNode>> {
self.main_node.map(|ptr| ptr.with_value(sema.to_node_syntax(ptr))).or_else(|| {
let token = sema
.parse_guess_edition(self.range.file_id)
.syntax()
.token_at_offset(self.range.range.start())
.right_biased()?;
sema.descend_into_macros(token).into_iter().find_map(|token| {
let node = sema.ancestors_with_macros(token.parent().unwrap()).find(|node| {
let original_range = sema.original_range(node);
original_range.file_id.file_id(sema.db) == self.range.file_id
&& original_range.range.contains_range(self.range.range)
})?;
let file = sema.hir_file_for(&node);
Some(InFile::new(file, node))
})
})
}
}

#[derive(Debug, Clone)]
Expand Down Expand Up @@ -511,14 +530,7 @@ pub fn semantic_diagnostics(
let mut lints = res
.iter_mut()
.filter(|it| matches!(it.code, DiagnosticCode::Clippy(_) | DiagnosticCode::RustcLint(_)))
.filter_map(|it| {
Some((
it.main_node.map(|ptr| {
ptr.map(|node| node.to_node(&ctx.sema.parse_or_expand(ptr.file_id)))
})?,
it,
))
})
.filter_map(|it| Some((it.main_node(&ctx.sema)?, it)))
.collect::<Vec<_>>();

// The edition isn't accurate (each diagnostics may have its own edition due to macros),
Expand Down
Loading