From 18f88ad10bed9f8d82a3a67c2bb9eb23995641a0 Mon Sep 17 00:00:00 2001
From: Edwin Cheng <edwin0cheng@gmail.com>
Date: Sat, 7 Mar 2020 16:25:43 +0800
Subject: Prevent include! macro include itself

---
 crates/ra_hir_expand/src/builtin_macro.rs |  7 ++++++-
 crates/ra_hir_ty/src/tests/macros.rs      | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'crates')

diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs
index a57e9285f..9bc33cfa8 100644
--- a/crates/ra_hir_expand/src/builtin_macro.rs
+++ b/crates/ra_hir_expand/src/builtin_macro.rs
@@ -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(
diff --git a/crates/ra_hir_ty/src/tests/macros.rs b/crates/ra_hir_ty/src/tests/macros.rs
index c86733ac3..ffa78b046 100644
--- a/crates/ra_hir_ty/src/tests/macros.rs
+++ b/crates/ra_hir_ty/src/tests/macros.rs
@@ -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!(
-- 
cgit v1.2.3