Prevent include! macro include itself

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

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(

View File

@ -510,6 +510,24 @@ fn bar() -> u32 {0}
assert_eq!("{unknown}", type_at_pos(&db, pos));
}
#[test]
fn infer_builtin_macros_include_itself_should_failed() {
let (db, pos) = TestDB::with_position(
r#"
//- /main.rs
#[rustc_builtin_macro]
macro_rules! include {() => {}}
include!("main.rs");
fn main() {
0<|>
}
"#,
);
assert_eq!("i32", type_at_pos(&db, pos));
}
#[test]
fn infer_builtin_macros_concat_with_lazy() {
assert_snapshot!(