language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Prevent include! macro include itself

Browse source
This commit is contained in:
Edwin Cheng 2020-03-07 16:25:43 +08:00
parent 919747c323
commit 18f88ad10b
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_hir_expand/src/builtin_macro.rs
View file

@ -279,7 +279,12 @@ fn relative_file(db: &dyn AstDatabase, call_id: MacroCallId, path: &str) -> Opti
let call_site = call_id.as_file().original_file(db);
let path = RelativePath::new(&path);
db.resolve_relative_path(call_site, &path)
let res = db.resolve_relative_path(call_site, &path)?;
// Prevent include itself
if res == call_site {
return None;
}
Some(res)
}
fn include_expand(