9 files changed, 105 insertions, 462 deletions

diff --git a/crates/hir_def/src/attr.rs b/crates/hir_def/src/attr.rs
index 12f4b02e2..228d706db 100644
--- a/crates/hir_def/src/attr.rs
+++ b/crates/hir_def/src/attr.rs
@@ -9,7 +9,7 @@ use itertools::Itertools;
 use mbe::ast_to_token_tree;
 use syntax::{
     ast::{self, AstNode, AttrsOwner},
-    AstToken, SmolStr,
+    match_ast, AstToken, SmolStr, SyntaxNode,
 };
 use tt::Subtree;
 
@@ -110,7 +110,17 @@ impl Attrs {
     }
 
     pub(crate) fn new(owner: &dyn AttrsOwner, hygiene: &Hygiene) -> Attrs {
-        let docs = ast::CommentIter::from_syntax_node(owner.syntax()).map(|docs_text| {
+        let (inner_attrs, inner_docs) = inner_attributes(owner.syntax())
+            .map_or((None, None), |(attrs, docs)| ((Some(attrs), Some(docs))));
+
+        let outer_attrs = owner.attrs().filter(|attr| attr.excl_token().is_none());
+        let attrs = outer_attrs
+            .chain(inner_attrs.into_iter().flatten())
+            .map(|attr| (attr.syntax().text_range().start(), Attr::from_src(attr, hygiene)));
+
+        let outer_docs =
+            ast::CommentIter::from_syntax_node(owner.syntax()).filter(ast::Comment::is_outer);
+        let docs = outer_docs.chain(inner_docs.into_iter().flatten()).map(|docs_text| {
             (
                 docs_text.syntax().text_range().start(),
                 docs_text.doc_comment().map(|doc| Attr {
@@ -119,9 +129,6 @@ impl Attrs {
                 }),
             )
         });
-        let attrs = owner
-            .attrs()
-            .map(|attr| (attr.syntax().text_range().start(), Attr::from_src(attr, hygiene)));
         // sort here by syntax node offset because the source can have doc attributes and doc strings be interleaved
         let attrs: Vec<_> = docs.chain(attrs).sorted_by_key(|&(offset, _)| offset).collect();
         let entries = if attrs.is_empty() {
@@ -184,6 +191,41 @@ impl Attrs {
     }
 }
 
+fn inner_attributes(
+    syntax: &SyntaxNode,
+) -> Option<(impl Iterator<Item = ast::Attr>, impl Iterator<Item = ast::Comment>)> {
+    let (attrs, docs) = match_ast! {
+        match syntax {
+            ast::SourceFile(it) => (it.attrs(), ast::CommentIter::from_syntax_node(it.syntax())),
+            ast::ExternBlock(it) => {
+                let extern_item_list = it.extern_item_list()?;
+                (extern_item_list.attrs(), ast::CommentIter::from_syntax_node(extern_item_list.syntax()))
+            },
+            ast::Fn(it) => {
+                let body = it.body()?;
+                (body.attrs(), ast::CommentIter::from_syntax_node(body.syntax()))
+            },
+            ast::Impl(it) => {
+                let assoc_item_list = it.assoc_item_list()?;
+                (assoc_item_list.attrs(), ast::CommentIter::from_syntax_node(assoc_item_list.syntax()))
+            },
+            ast::Module(it) => {
+                let item_list = it.item_list()?;
+                (item_list.attrs(), ast::CommentIter::from_syntax_node(item_list.syntax()))
+            },
+            // FIXME: BlockExpr's only accept inner attributes in specific cases
+            // Excerpt from the reference:
+            // Block expressions accept outer and inner attributes, but only when they are the outer
+            // expression of an expression statement or the final expression of another block expression.
+            ast::BlockExpr(it) => return None,
+            _ => return None,
+        }
+    };
+    let attrs = attrs.filter(|attr| attr.excl_token().is_some());
+    let docs = docs.filter(|doc| doc.is_inner());
+    Some((attrs, docs))
+}
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Attr {
     pub(crate) path: ModPath,
diff --git a/crates/hir_def/src/body.rs b/crates/hir_def/src/body.rs
index 92bcc1705..c5d6f5fb0 100644
--- a/crates/hir_def/src/body.rs
+++ b/crates/hir_def/src/body.rs
@@ -103,8 +103,7 @@ impl Expander {
         local_scope: Option<&ItemScope>,
         macro_call: ast::MacroCall,
     ) -> ExpandResult<Option<(Mark, T)>> {
-        self.recursion_limit += 1;
-        if self.recursion_limit > EXPANSION_RECURSION_LIMIT {
+        if self.recursion_limit + 1 > EXPANSION_RECURSION_LIMIT {
             mark::hit!(your_stack_belongs_to_me);
             return ExpandResult::str_err("reached recursion limit during macro expansion".into());
         }
@@ -165,6 +164,7 @@ impl Expander {
 
         log::debug!("macro expansion {:#?}", node.syntax());
 
+        self.recursion_limit += 1;
         let mark = Mark {
             file_id: self.current_file_id,
             ast_id_map: mem::take(&mut self.ast_id_map),
diff --git a/crates/hir_def/src/body/tests.rs b/crates/hir_def/src/body/tests.rs
index 6dba9817d..de77d5fc9 100644
--- a/crates/hir_def/src/body/tests.rs
+++ b/crates/hir_def/src/body/tests.rs
@@ -134,3 +134,31 @@ fn f() {
       "#,
     );
 }
+
+#[test]
+fn dollar_crate_in_builtin_macro() {
+    check_diagnostics(
+        r#"
+#[macro_export]
+#[rustc_builtin_macro]
+macro_rules! format_args {}
+
+#[macro_export]
+macro_rules! arg {
+    () => {}
+}
+
+#[macro_export]
+macro_rules! outer {
+    () => {
+        $crate::format_args!( "", $crate::arg!(1) )
+    };
+}
+
+fn f() {
+    outer!();
+  //^^^^^^^^ leftover tokens
+}
+        "#,
+    )
+}
diff --git a/crates/hir_def/src/data.rs b/crates/hir_def/src/data.rs
index 146045938..dd3a906af 100644
--- a/crates/hir_def/src/data.rs
+++ b/crates/hir_def/src/data.rs
@@ -28,6 +28,7 @@ pub struct FunctionData {
     pub has_body: bool,
     pub is_unsafe: bool,
     pub is_varargs: bool,
+    pub is_extern: bool,
     pub visibility: RawVisibility,
 }
 
@@ -46,6 +47,7 @@ impl FunctionData {
             has_body: func.has_body,
             is_unsafe: func.is_unsafe,
             is_varargs: func.is_varargs,
+            is_extern: func.is_extern,
             visibility: item_tree[func.visibility].clone(),
         })
     }
@@ -191,6 +193,7 @@ pub struct StaticData {
     pub type_ref: TypeRef,
     pub visibility: RawVisibility,
     pub mutable: bool,
+    pub is_extern: bool,
 }
 
 impl StaticData {
@@ -204,6 +207,7 @@ impl StaticData {
             type_ref: statik.type_ref.clone(),
             visibility: item_tree[statik.visibility].clone(),
             mutable: statik.mutable,
+            is_extern: statik.is_extern,
         })
     }
 }
diff --git a/crates/hir_def/src/item_tree.rs b/crates/hir_def/src/item_tree.rs
index 7eb388bae..c017b352d 100644
--- a/crates/hir_def/src/item_tree.rs
+++ b/crates/hir_def/src/item_tree.rs
@@ -1,8 +1,6 @@
 //! A simplified AST that only contains items.
 
 mod lower;
-#[cfg(test)]
-mod tests;
 
 use std::{
     any::type_name,
@@ -507,6 +505,9 @@ pub struct Function {
     pub has_self_param: bool,
     pub has_body: bool,
     pub is_unsafe: bool,
+    /// Whether the function is located in an `extern` block (*not* whether it is an
+    /// `extern "abi" fn`).
+    pub is_extern: bool,
     pub params: Box<[TypeRef]>,
     pub is_varargs: bool,
     pub ret_type: TypeRef,
@@ -565,6 +566,8 @@ pub struct Static {
     pub name: Name,
     pub visibility: RawVisibilityId,
     pub mutable: bool,
+    /// Whether the static is in an `extern` block.
+    pub is_extern: bool,
     pub type_ref: TypeRef,
     pub ast_id: FileAstId<ast::Static>,
 }
diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs
index ca7fb4a43..63b2826f8 100644
--- a/crates/hir_def/src/item_tree/lower.rs
+++ b/crates/hir_def/src/item_tree/lower.rs
@@ -340,6 +340,7 @@ impl Ctx {
             has_self_param,
             has_body,
             is_unsafe: func.unsafe_token().is_some(),
+            is_extern: false,
             params: params.into_boxed_slice(),
             is_varargs,
             ret_type,
@@ -378,7 +379,7 @@ impl Ctx {
         let visibility = self.lower_visibility(static_);
         let mutable = static_.mut_token().is_some();
         let ast_id = self.source_ast_id_map.ast_id(static_);
-        let res = Static { name, visibility, mutable, type_ref, ast_id };
+        let res = Static { name, visibility, mutable, type_ref, ast_id, is_extern: false };
         Some(id(self.data().statics.alloc(res)))
     }
 
@@ -554,13 +555,15 @@ impl Ctx {
                     let attrs = Attrs::new(&item, &self.hygiene);
                     let id: ModItem = match item {
                         ast::ExternItem::Fn(ast) => {
-                            let func = self.lower_function(&ast)?;
-                            self.data().functions[func.index].is_unsafe =
-                                is_intrinsic_fn_unsafe(&self.data().functions[func.index].name);
-                            func.into()
+                            let func_id = self.lower_function(&ast)?;
+                            let func = &mut self.data().functions[func_id.index];
+                            func.is_unsafe = is_intrinsic_fn_unsafe(&func.name);
+                            func.is_extern = true;
+                            func_id.into()
                         }
                         ast::ExternItem::Static(ast) => {
                             let statik = self.lower_static(&ast)?;
+                            self.data().statics[statik.index].is_extern = true;
                             statik.into()
                         }
                         ast::ExternItem::TypeAlias(ty) => {
diff --git a/crates/hir_def/src/item_tree/tests.rs b/crates/hir_def/src/item_tree/tests.rs
deleted file mode 100644
index 4b354c4c1..000000000
--- a/crates/hir_def/src/item_tree/tests.rs
+++ /dev/null
@@ -1,439 +0,0 @@
-use base_db::fixture::WithFixture;
-use expect_test::{expect, Expect};
-use hir_expand::{db::AstDatabase, HirFileId, InFile};
-use rustc_hash::FxHashSet;
-use std::sync::Arc;
-use stdx::format_to;
-use syntax::{ast, AstNode};
-
-use crate::{db::DefDatabase, test_db::TestDB};
-
-use super::{ItemTree, ModItem, ModKind};
-
-fn test_inner_items(ra_fixture: &str) {
-    let (db, file_id) = TestDB::with_single_file(ra_fixture);
-    let file_id = HirFileId::from(file_id);
-    let tree = db.item_tree(file_id);
-    let root = db.parse_or_expand(file_id).unwrap();
-    let ast_id_map = db.ast_id_map(file_id);
-
-    // Traverse the item tree and collect all module/impl/trait-level items as AST nodes.
-    let mut outer_items = FxHashSet::default();
-    let mut worklist = tree.top_level_items().to_vec();
-    while let Some(item) = worklist.pop() {
-        let node: ast::Item = match item {
-            ModItem::Import(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::ExternCrate(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Function(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Struct(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Union(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Enum(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Const(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Static(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::TypeAlias(it) => tree.source(&db, InFile::new(file_id, it)).into(),
-            ModItem::Mod(it) => {
-                if let ModKind::Inline { items } = &tree[it].kind {
-                    worklist.extend(&**items);
-                }
-                tree.source(&db, InFile::new(file_id, it)).into()
-            }
-            ModItem::Trait(it) => {
-                worklist.extend(tree[it].items.iter().map(|item| ModItem::from(*item)));
-                tree.source(&db, InFile::new(file_id, it)).into()
-            }
-            ModItem::Impl(it) => {
-                worklist.extend(tree[it].items.iter().map(|item| ModItem::from(*item)));
-                tree.source(&db, InFile::new(file_id, it)).into()
-            }
-            ModItem::MacroCall(_) => continue,
-        };
-
-        outer_items.insert(node);
-    }
-
-    // Now descend the root node and check that all `ast::ModuleItem`s are either recorded above, or
-    // registered as inner items.
-    for item in root.descendants().skip(1).filter_map(ast::Item::cast) {
-        if outer_items.contains(&item) {
-            continue;
-        }
-
-        let ast_id = ast_id_map.ast_id(&item);
-        assert!(!tree.inner_items(ast_id).is_empty());
-    }
-}
-
-fn item_tree(ra_fixture: &str) -> Arc<ItemTree> {
-    let (db, file_id) = TestDB::with_single_file(ra_fixture);
-    db.item_tree(file_id.into())
-}
-
-fn print_item_tree(ra_fixture: &str) -> String {
-    let tree = item_tree(ra_fixture);
-    let mut out = String::new();
-
-    format_to!(out, "inner attrs: {:?}\n\n", tree.top_level_attrs());
-    format_to!(out, "top-level items:\n");
-    for item in tree.top_level_items() {
-        fmt_mod_item(&mut out, &tree, *item);
-        format_to!(out, "\n");
-    }
-
-    if !tree.inner_items.is_empty() {
-        format_to!(out, "\ninner items:\n\n");
-        for (ast_id, items) in &tree.inner_items {
-            format_to!(out, "for AST {:?}:\n", ast_id);
-            for inner in items {
-                fmt_mod_item(&mut out, &tree, *inner);
-                format_to!(out, "\n\n");
-            }
-        }
-    }
-
-    out
-}
-
-fn fmt_mod_item(out: &mut String, tree: &ItemTree, item: ModItem) {
-    let attrs = tree.attrs(item.into());
-    if !attrs.is_empty() {
-        format_to!(out, "#[{:?}]\n", attrs);
-    }
-
-    let mut children = String::new();
-    match item {
-        ModItem::ExternCrate(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Import(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Function(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Struct(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Union(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Enum(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Const(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Static(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Trait(it) => {
-            format_to!(out, "{:?}", tree[it]);
-            for item in &*tree[it].items {
-                fmt_mod_item(&mut children, tree, ModItem::from(*item));
-                format_to!(children, "\n");
-            }
-        }
-        ModItem::Impl(it) => {
-            format_to!(out, "{:?}", tree[it]);
-            for item in &*tree[it].items {
-                fmt_mod_item(&mut children, tree, ModItem::from(*item));
-                format_to!(children, "\n");
-            }
-        }
-        ModItem::TypeAlias(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-        ModItem::Mod(it) => {
-            format_to!(out, "{:?}", tree[it]);
-            match &tree[it].kind {
-                ModKind::Inline { items } => {
-                    for item in &**items {
-                        fmt_mod_item(&mut children, tree, *item);
-                        format_to!(children, "\n");
-                    }
-                }
-                ModKind::Outline {} => {}
-            }
-        }
-        ModItem::MacroCall(it) => {
-            format_to!(out, "{:?}", tree[it]);
-        }
-    }
-
-    for line in children.lines() {
-        format_to!(out, "\n> {}", line);
-    }
-}
-
-fn check(ra_fixture: &str, expect: Expect) {
-    let actual = print_item_tree(ra_fixture);
-    expect.assert_eq(&actual);
-}
-
-#[test]
-fn smoke() {
-    check(
-        r"
-        #![attr]
-
-        #[attr_on_use]
-        use {a, b::*};
-
-        #[ext_crate]
-        extern crate krate;
-
-        #[on_trait]
-        trait Tr<U> {
-            #[assoc_ty]
-            type AssocTy: Tr<()>;
-
-            #[assoc_const]
-            const CONST: u8;
-
-            #[assoc_method]
-            fn method(&self);
-
-            #[assoc_dfl_method]
-            fn dfl_method(&mut self) {}
-        }
-
-        #[struct0]
-        struct Struct0<T = ()>;
-
-        #[struct1]
-        struct Struct1<T>(#[struct1fld] u8);
-
-        #[struct2]
-        struct Struct2<T> {
-            #[struct2fld]
-            fld: (T, ),
-        }
-
-        #[en]
-        enum En {
-            #[enum_variant]
-            Variant {
-                #[enum_field]
-                field: u8,
-            },
-        }
-
-        #[un]
-        union Un {
-            #[union_fld]
-            fld: u16,
-        }
-    ",
-        expect![[r##"
-            inner attrs: Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr"))] }, input: None }]) }
-
-            top-level items:
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }]
-            Import { path: ModPath { kind: Plain, segments: [Name(Text("a"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: false, is_prelude: false, ast_id: FileAstId::<syntax::ast::generated::nodes::Use>(0), index: 0 }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_on_use"))] }, input: None }]) }]
-            Import { path: ModPath { kind: Plain, segments: [Name(Text("b"))] }, alias: None, visibility: RawVisibilityId("pub(self)"), is_glob: true, is_prelude: false, ast_id: FileAstId::<syntax::ast::generated::nodes::Use>(0), index: 1 }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("ext_crate"))] }, input: None }]) }]
-            ExternCrate { name: Name(Text("krate")), alias: None, visibility: RawVisibilityId("pub(self)"), is_macro_use: false, ast_id: FileAstId::<syntax::ast::generated::nodes::ExternCrate>(1) }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_trait"))] }, input: None }]) }]
-            Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [TypeAlias(Idx::<TypeAlias>(0)), Const(Idx::<Const>(0)), Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<syntax::ast::generated::nodes::Trait>(2) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_ty"))] }, input: None }]) }]
-            > TypeAlias { name: Name(Text("AssocTy")), visibility: RawVisibilityId("pub(self)"), bounds: [Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Tr"))] }, generic_args: [Some(GenericArgs { args: [Type(Tuple([]))], has_self_type: false, bindings: [] })] })], generic_params: GenericParamsId(4294967295), type_ref: None, is_extern: false, ast_id: FileAstId::<syntax::ast::generated::nodes::TypeAlias>(8) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_const"))] }, input: None }]) }]
-            > Const { name: Some(Name(Text("CONST"))), visibility: RawVisibilityId("pub(self)"), type_ref: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("u8"))] }, generic_args: [None] }), ast_id: FileAstId::<syntax::ast::generated::nodes::Const>(9) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_method"))] }, input: None }]) }]
-            > Function { name: Name(Text("method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, has_body: false, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Shared)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(10) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("assoc_dfl_method"))] }, input: None }]) }]
-            > Function { name: Name(Text("dfl_method")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: true, has_body: true, is_unsafe: false, params: [Reference(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Self"))] }, generic_args: [None] }), Mut)], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(11) }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct0"))] }, input: None }]) }]
-            Struct { name: Name(Text("Struct0")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), fields: Unit, ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(3), kind: Unit }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct1"))] }, input: None }]) }]
-            Struct { name: Name(Text("Struct1")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(2), fields: Tuple(IdRange::<hir_def::item_tree::Field>(0..1)), ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(4), kind: Tuple }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct2"))] }, input: None }]) }]
-            Struct { name: Name(Text("Struct2")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(3), fields: Record(IdRange::<hir_def::item_tree::Field>(1..2)), ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(5), kind: Record }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("en"))] }, input: None }]) }]
-            Enum { name: Name(Text("En")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), variants: IdRange::<hir_def::item_tree::Variant>(0..1), ast_id: FileAstId::<syntax::ast::generated::nodes::Enum>(6) }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("un"))] }, input: None }]) }]
-            Union { name: Name(Text("Un")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), fields: Record(IdRange::<hir_def::item_tree::Field>(3..4)), ast_id: FileAstId::<syntax::ast::generated::nodes::Union>(7) }
-        "##]],
-    );
-}
-
-#[test]
-fn simple_inner_items() {
-    check(
-        r"
-        impl<T:A> D for Response<T> {
-            fn foo() {
-                end();
-                fn end<W: Write>() {
-                    let _x: T = loop {};
-                }
-            }
-        }
-    ",
-        expect![[r#"
-            inner attrs: Attrs { entries: None }
-
-            top-level items:
-            Impl { generic_params: GenericParamsId(0), target_trait: Some(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("D"))] }, generic_args: [None] })), target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Response"))] }, generic_args: [Some(GenericArgs { args: [Type(Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("T"))] }, generic_args: [None] }))], has_self_type: false, bindings: [] })] }), is_negative: false, items: [Function(Idx::<Function>(1))], ast_id: FileAstId::<syntax::ast::generated::nodes::Impl>(0) }
-            > Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
-
-            inner items:
-
-            for AST FileAstId::<syntax::ast::generated::nodes::Item>(2):
-            Function { name: Name(Text("end")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(2) }
-
-        "#]],
-    );
-}
-
-#[test]
-fn extern_attrs() {
-    check(
-        r#"
-        #[block_attr]
-        extern "C" {
-            #[attr_a]
-            fn a() {}
-            #[attr_b]
-            fn b() {}
-        }
-    "#,
-        expect![[r##"
-            inner attrs: Attrs { entries: None }
-
-            top-level items:
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }, Attr { path: ModPath { kind: Plain, segments: [Name(Text("block_attr"))] }, input: None }]) }]
-            Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }, Attr { path: ModPath { kind: Plain, segments: [Name(Text("block_attr"))] }, input: None }]) }]
-            Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: true, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(2) }
-        "##]],
-    );
-}
-
-#[test]
-fn trait_attrs() {
-    check(
-        r#"
-        #[trait_attr]
-        trait Tr {
-            #[attr_a]
-            fn a() {}
-            #[attr_b]
-            fn b() {}
-        }
-    "#,
-        expect![[r##"
-            inner attrs: Attrs { entries: None }
-
-            top-level items:
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("trait_attr"))] }, input: None }]) }]
-            Trait { name: Name(Text("Tr")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(0), auto: false, items: [Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<syntax::ast::generated::nodes::Trait>(0) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }]) }]
-            > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }]) }]
-            > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(2) }
-        "##]],
-    );
-}
-
-#[test]
-fn impl_attrs() {
-    check(
-        r#"
-        #[impl_attr]
-        impl Ty {
-            #[attr_a]
-            fn a() {}
-            #[attr_b]
-            fn b() {}
-        }
-    "#,
-        expect![[r##"
-            inner attrs: Attrs { entries: None }
-
-            top-level items:
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("impl_attr"))] }, input: None }]) }]
-            Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("Ty"))] }, generic_args: [None] }), is_negative: false, items: [Function(Idx::<Function>(0)), Function(Idx::<Function>(1))], ast_id: FileAstId::<syntax::ast::generated::nodes::Impl>(0) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_a"))] }, input: None }]) }]
-            > Function { name: Name(Text("a")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
-            > #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("attr_b"))] }, input: None }]) }]
-            > Function { name: Name(Text("b")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(2) }
-        "##]],
-    );
-}
-
-#[test]
-fn cursed_inner_items() {
-    test_inner_items(
-        r"
-        struct S<T: Trait = [u8; { fn f() {} 0 }]>(T);
-
-        enum En {
-            Var1 {
-                t: [(); { trait Inner {} 0 }],
-            },
-
-            Var2([u16; { enum Inner {} 0 }]),
-        }
-
-        type Ty = [En; { struct Inner; 0 }];
-
-        impl En {
-            fn assoc() {
-                trait InnerTrait<T = [u8; { fn f() {} }]> {}
-                struct InnerStruct<T = [u8; { fn f() {} }]> {}
-                impl<T = [u8; { fn f() {} }]> InnerTrait for InnerStruct {}
-            }
-        }
-
-        trait Tr<T = [u8; { fn f() {} }]> {
-            type AssocTy = [u8; { fn f() {} }];
-
-            const AssocConst: [u8; { fn f() {} }];
-        }
-    ",
-    );
-}
-
-#[test]
-fn inner_item_attrs() {
-    check(
-        r"
-        fn foo() {
-            #[on_inner]
-            fn inner() {}
-        }
-    ",
-        expect![[r##"
-            inner attrs: Attrs { entries: None }
-
-            top-level items:
-            Function { name: Name(Text("foo")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(0) }
-
-            inner items:
-
-            for AST FileAstId::<syntax::ast::generated::nodes::Item>(1):
-            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("on_inner"))] }, input: None }]) }]
-            Function { name: Name(Text("inner")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), has_self_param: false, has_body: true, is_unsafe: false, params: [], is_varargs: false, ret_type: Tuple([]), ast_id: FileAstId::<syntax::ast::generated::nodes::Fn>(1) }
-
-        "##]],
-    );
-}
-
-#[test]
-fn assoc_item_macros() {
-    check(
-        r"
-        impl S {
-            items!();
-        }
-    ",
-        expect![[r#"
-            inner attrs: Attrs { entries: None }
-
-            top-level items:
-            Impl { generic_params: GenericParamsId(4294967295), target_trait: None, target_type: Path(Path { type_anchor: None, mod_path: ModPath { kind: Plain, segments: [Name(Text("S"))] }, generic_args: [None] }), is_negative: false, items: [MacroCall(Idx::<MacroCall>(0))], ast_id: FileAstId::<syntax::ast::generated::nodes::Impl>(0) }
-            > MacroCall { name: None, path: ModPath { kind: Plain, segments: [Name(Text("items"))] }, is_export: false, is_local_inner: false, is_builtin: false, ast_id: FileAstId::<syntax::ast::generated::nodes::MacroCall>(1) }
-        "#]],
-    );
-}
diff --git a/crates/hir_def/src/nameres/mod_resolution.rs b/crates/hir_def/src/nameres/mod_resolution.rs
index c0c789cae..b4ccd4488 100644
--- a/crates/hir_def/src/nameres/mod_resolution.rs
+++ b/crates/hir_def/src/nameres/mod_resolution.rs
@@ -1,5 +1,5 @@
 //! This module resolves `mod foo;` declaration to file.
-use base_db::FileId;
+use base_db::{AnchoredPath, FileId};
 use hir_expand::name::Name;
 use syntax::SmolStr;
 use test_utils::mark;
@@ -77,7 +77,8 @@ impl ModDir {
         };
 
         for candidate in candidate_files.iter() {
-            if let Some(file_id) = db.resolve_path(file_id, candidate.as_str()) {
+            let path = AnchoredPath { anchor: file_id, path: candidate.as_str() };
+            if let Some(file_id) = db.resolve_path(path) {
                 let is_mod_rs = candidate.ends_with("mod.rs");
 
                 let (dir_path, root_non_dir_owner) = if is_mod_rs || attr_path.is_some() {
diff --git a/crates/hir_def/src/test_db.rs b/crates/hir_def/src/test_db.rs
index 00fe711fe..574c0201a 100644
--- a/crates/hir_def/src/test_db.rs
+++ b/crates/hir_def/src/test_db.rs
@@ -5,8 +5,8 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use base_db::SourceDatabase;
 use base_db::{salsa, CrateId, FileId, FileLoader, FileLoaderDelegate, Upcast};
+use base_db::{AnchoredPath, SourceDatabase};
 use hir_expand::db::AstDatabase;
 use hir_expand::diagnostics::Diagnostic;
 use hir_expand::diagnostics::DiagnosticSinkBuilder;
@@ -63,8 +63,8 @@ impl FileLoader for TestDB {
     fn file_text(&self, file_id: FileId) -> Arc<String> {
         FileLoaderDelegate(self).file_text(file_id)
     }
-    fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> {
-        FileLoaderDelegate(self).resolve_path(anchor, path)
+    fn resolve_path(&self, path: AnchoredPath) -> Option<FileId> {
+        FileLoaderDelegate(self).resolve_path(path)
     }
     fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
         FileLoaderDelegate(self).relevant_crates(file_id)
@@ -157,11 +157,12 @@ impl TestDB {
         db.diagnostics(|d| {
             let src = d.display_source();
             let root = db.parse_or_expand(src.file_id).unwrap();
-            // FIXME: macros...
-            let file_id = src.file_id.original_file(db);
-            let range = src.value.to_node(&root).text_range();
+
+            let node = src.map(|ptr| ptr.to_node(&root));
+            let frange = node.as_ref().original_file_range(db);
+
             let message = d.message().to_owned();
-            actual.entry(file_id).or_default().push((range, message));
+            actual.entry(frange.file_id).or_default().push((frange.range, message));
         });
 
         for (file_id, diags) in actual.iter_mut() {