3 files changed, 43 insertions, 5 deletions

diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs
index fe4137176..5b36a7cc1 100644
--- a/crates/ra_hir_def/src/body/scope.rs
+++ b/crates/ra_hir_def/src/body/scope.rs
@@ -325,8 +325,11 @@ mod tests {
         let resolved = scopes.resolve_name_in_scope(expr_scope, &name_ref.as_name()).unwrap();
         let pat_src = source_map.pat_syntax(resolved.pat()).unwrap();
 
-        let local_name = pat_src.value.either(|it| it.syntax_node_ptr(), |it| it.syntax_node_ptr());
-        assert_eq!(local_name.range(), expected_name.syntax().text_range());
+        let local_name = pat_src.value.either(
+            |it| it.syntax_node_ptr().to_node(file.syntax()),
+            |it| it.syntax_node_ptr().to_node(file.syntax()),
+        );
+        assert_eq!(local_name.text_range(), expected_name.syntax().text_range());
     }
 
     #[test]
diff --git a/crates/ra_hir_def/src/nameres/raw.rs b/crates/ra_hir_def/src/nameres/raw.rs
index afd538e4a..39b011ad7 100644
--- a/crates/ra_hir_def/src/nameres/raw.rs
+++ b/crates/ra_hir_def/src/nameres/raw.rs
@@ -266,8 +266,8 @@ impl RawItemsCollector {
                 self.add_macro(current_module, it);
                 return;
             }
-            ast::ModuleItem::ExternBlock(_) => {
-                // FIXME: add extern block
+            ast::ModuleItem::ExternBlock(it) => {
+                self.add_extern_block(current_module, it);
                 return;
             }
         };
@@ -278,6 +278,34 @@ impl RawItemsCollector {
         }
     }
 
+    fn add_extern_block(
+        &mut self,
+        current_module: Option<Idx<ModuleData>>,
+        block: ast::ExternBlock,
+    ) {
+        if let Some(items) = block.extern_item_list() {
+            for item in items.extern_items() {
+                let attrs = self.parse_attrs(&item);
+                let visibility =
+                    RawVisibility::from_ast_with_hygiene(item.visibility(), &self.hygiene);
+                let (kind, name) = match item {
+                    ast::ExternItem::FnDef(it) => {
+                        (DefKind::Function(self.source_ast_id_map.ast_id(&it)), it.name())
+                    }
+                    ast::ExternItem::StaticDef(it) => {
+                        (DefKind::Static(self.source_ast_id_map.ast_id(&it)), it.name())
+                    }
+                };
+
+                if let Some(name) = name {
+                    let name = name.as_name();
+                    let def = self.raw_items.defs.alloc(DefData { name, kind, visibility });
+                    self.push_item(current_module, attrs, RawItemKind::Def(def));
+                }
+            }
+        }
+    }
+
     fn add_module(&mut self, current_module: Option<Idx<ModuleData>>, module: ast::Module) {
         let name = match module.name() {
             Some(it) => it.as_name(),
diff --git a/crates/ra_hir_def/src/nameres/tests.rs b/crates/ra_hir_def/src/nameres/tests.rs
index 949ca7595..83120fa36 100644
--- a/crates/ra_hir_def/src/nameres/tests.rs
+++ b/crates/ra_hir_def/src/nameres/tests.rs
@@ -25,7 +25,7 @@ fn compute_crate_def_map(fixture: &str) -> Arc<CrateDefMap> {
 #[test]
 fn crate_def_map_smoke_test() {
     let map = def_map(
-        "
+        r"
         //- /lib.rs
         mod foo;
         struct S;
@@ -45,6 +45,11 @@ fn crate_def_map_smoke_test() {
         }
 
         enum E { V }
+
+        extern {
+            static EXT: u8;
+            fn ext();
+        }
         ",
     );
     assert_snapshot!(map, @r###"
@@ -61,7 +66,9 @@ fn crate_def_map_smoke_test() {
         ⋮crate::foo::bar
         ⋮Baz: t v
         ⋮E: t
+        ⋮EXT: v
         ⋮U: t v
+        ⋮ext: v
     "###)
 }