6 files changed, 27 insertions, 53 deletions

diff --git a/crates/ra_hir_def/src/find_path.rs b/crates/ra_hir_def/src/find_path.rs
index f7dc8acb7..8cc2fb160 100644
--- a/crates/ra_hir_def/src/find_path.rs
+++ b/crates/ra_hir_def/src/find_path.rs
@@ -35,7 +35,7 @@ fn find_path_inner(
     let def_map = db.crate_def_map(from.krate);
     let from_scope: &crate::item_scope::ItemScope = &def_map.modules[from.local_id].scope;
     if let Some((name, _)) = from_scope.name_of(item) {
-        return Some(ModPath::from_simple_segments(PathKind::Plain, vec![name.clone()]));
+        return Some(ModPath::from_segments(PathKind::Plain, vec![name.clone()]));
     }
 
     // - if the item is the crate root, return `crate`
@@ -45,12 +45,12 @@ fn find_path_inner(
             local_id: def_map.root,
         }))
     {
-        return Some(ModPath::from_simple_segments(PathKind::Crate, Vec::new()));
+        return Some(ModPath::from_segments(PathKind::Crate, Vec::new()));
     }
 
     // - if the item is the module we're in, use `self`
     if item == ItemInNs::Types(from.into()) {
-        return Some(ModPath::from_simple_segments(PathKind::Super(0), Vec::new()));
+        return Some(ModPath::from_segments(PathKind::Super(0), Vec::new()));
     }
 
     // - if the item is the parent module, use `super` (this is not used recursively, since `super::super` is ugly)
@@ -61,14 +61,14 @@ fn find_path_inner(
                 local_id: parent_id,
             }))
         {
-            return Some(ModPath::from_simple_segments(PathKind::Super(1), Vec::new()));
+            return Some(ModPath::from_segments(PathKind::Super(1), Vec::new()));
         }
     }
 
     // - if the item is the crate root of a dependency crate, return the name from the extern prelude
     for (name, def_id) in &def_map.extern_prelude {
         if item == ItemInNs::Types(*def_id) {
-            return Some(ModPath::from_simple_segments(PathKind::Plain, vec![name.clone()]));
+            return Some(ModPath::from_segments(PathKind::Plain, vec![name.clone()]));
         }
     }
 
@@ -79,7 +79,7 @@ fn find_path_inner(
             &prelude_def_map.modules[prelude_module.local_id].scope;
         if let Some((name, vis)) = prelude_scope.name_of(item) {
             if vis.is_visible_from(db, from) {
-                return Some(ModPath::from_simple_segments(PathKind::Plain, vec![name.clone()]));
+                return Some(ModPath::from_segments(PathKind::Plain, vec![name.clone()]));
             }
         }
     }
diff --git a/crates/ra_hir_def/src/keys.rs b/crates/ra_hir_def/src/keys.rs
index d844f7a62..5913f12b1 100644
--- a/crates/ra_hir_def/src/keys.rs
+++ b/crates/ra_hir_def/src/keys.rs
@@ -2,7 +2,7 @@
 
 use std::marker::PhantomData;
 
-use hir_expand::InFile;
+use hir_expand::{InFile, MacroDefId};
 use ra_syntax::{ast, AstNode, AstPtr};
 use rustc_hash::FxHashMap;
 
@@ -29,6 +29,8 @@ pub const TUPLE_FIELD: Key<ast::TupleFieldDef, StructFieldId> = Key::new();
 pub const RECORD_FIELD: Key<ast::RecordFieldDef, StructFieldId> = Key::new();
 pub const TYPE_PARAM: Key<ast::TypeParam, TypeParamId> = Key::new();
 
+pub const MACRO: Key<ast::MacroCall, MacroDefId> = Key::new();
+
 /// XXX: AST Nodes and SyntaxNodes have identity equality semantics: nodes are
 /// equal if they point to exactly the same object.
 ///
diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_def/src/lib.rs
index ebc12e891..feb3a300d 100644
--- a/crates/ra_hir_def/src/lib.rs
+++ b/crates/ra_hir_def/src/lib.rs
@@ -332,7 +332,7 @@ pub enum VariantId {
     StructId(StructId),
     UnionId(UnionId),
 }
-impl_froms!(VariantId: EnumVariantId, StructId);
+impl_froms!(VariantId: EnumVariantId, StructId, UnionId);
 
 trait Intern {
     type ID;
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs
index 4d210eab1..27c12e46c 100644
--- a/crates/ra_hir_def/src/nameres.rs
+++ b/crates/ra_hir_def/src/nameres.rs
@@ -59,12 +59,9 @@ use std::sync::Arc;
 
 use hir_expand::{diagnostics::DiagnosticSink, name::Name, InFile};
 use ra_arena::Arena;
-use ra_db::{CrateId, Edition, FileId, FilePosition};
+use ra_db::{CrateId, Edition, FileId};
 use ra_prof::profile;
-use ra_syntax::{
-    ast::{self, AstNode},
-    SyntaxNode,
-};
+use ra_syntax::ast;
 use rustc_hash::FxHashMap;
 
 use crate::{
@@ -145,6 +142,13 @@ impl ModuleOrigin {
         }
     }
 
+    pub fn is_inline(&self) -> bool {
+        match self {
+            ModuleOrigin::Inline { .. } => true,
+            ModuleOrigin::CrateRoot { .. } | ModuleOrigin::File { .. } => false,
+        }
+    }
+
     /// Returns a node which defines this module.
     /// That is, a file or a `mod foo {}` with items.
     fn definition_source(&self, db: &impl DefDatabase) -> InFile<ModuleSource> {
@@ -248,35 +252,6 @@ pub enum ModuleSource {
     Module(ast::Module),
 }
 
-impl ModuleSource {
-    // FIXME: this methods do not belong here
-    pub fn from_position(db: &impl DefDatabase, position: FilePosition) -> ModuleSource {
-        let parse = db.parse(position.file_id);
-        match &ra_syntax::algo::find_node_at_offset::<ast::Module>(
-            parse.tree().syntax(),
-            position.offset,
-        ) {
-            Some(m) if !m.has_semi() => ModuleSource::Module(m.clone()),
-            _ => {
-                let source_file = parse.tree();
-                ModuleSource::SourceFile(source_file)
-            }
-        }
-    }
-
-    pub fn from_child_node(db: &impl DefDatabase, child: InFile<&SyntaxNode>) -> ModuleSource {
-        if let Some(m) =
-            child.value.ancestors().filter_map(ast::Module::cast).find(|it| !it.has_semi())
-        {
-            ModuleSource::Module(m)
-        } else {
-            let file_id = child.file_id.original_file(db);
-            let source_file = db.parse(file_id).tree();
-            ModuleSource::SourceFile(source_file)
-        }
-    }
-}
-
 mod diagnostics {
     use hir_expand::diagnostics::DiagnosticSink;
     use ra_db::RelativePathBuf;
diff --git a/crates/ra_hir_def/src/path.rs b/crates/ra_hir_def/src/path.rs
index 9f93a5424..ab290e2c9 100644
--- a/crates/ra_hir_def/src/path.rs
+++ b/crates/ra_hir_def/src/path.rs
@@ -39,10 +39,7 @@ impl ModPath {
         lower::lower_path(path, hygiene).map(|it| it.mod_path)
     }
 
-    pub fn from_simple_segments(
-        kind: PathKind,
-        segments: impl IntoIterator<Item = Name>,
-    ) -> ModPath {
+    pub fn from_segments(kind: PathKind, segments: impl IntoIterator<Item = Name>) -> ModPath {
         let segments = segments.into_iter().collect::<Vec<_>>();
         ModPath { kind, segments }
     }
@@ -240,7 +237,7 @@ impl From<Name> for Path {
     fn from(name: Name) -> Path {
         Path {
             type_anchor: None,
-            mod_path: ModPath::from_simple_segments(PathKind::Plain, iter::once(name)),
+            mod_path: ModPath::from_segments(PathKind::Plain, iter::once(name)),
             generic_args: vec![None],
         }
     }
@@ -248,7 +245,7 @@ impl From<Name> for Path {
 
 impl From<Name> for ModPath {
     fn from(name: Name) -> ModPath {
-        ModPath::from_simple_segments(PathKind::Plain, iter::once(name))
+        ModPath::from_segments(PathKind::Plain, iter::once(name))
     }
 }
 
@@ -311,7 +308,7 @@ macro_rules! __known_path {
 macro_rules! __path {
     ($start:ident $(:: $seg:ident)*) => ({
         $crate::__known_path!($start $(:: $seg)*);
-        $crate::path::ModPath::from_simple_segments($crate::path::PathKind::Abs, vec![
+        $crate::path::ModPath::from_segments($crate::path::PathKind::Abs, vec![
             $crate::path::__name![$start], $($crate::path::__name![$seg],)*
         ])
     });
diff --git a/crates/ra_hir_def/src/path/lower/lower_use.rs b/crates/ra_hir_def/src/path/lower/lower_use.rs
index 3218eaf0a..531878174 100644
--- a/crates/ra_hir_def/src/path/lower/lower_use.rs
+++ b/crates/ra_hir_def/src/path/lower/lower_use.rs
@@ -84,7 +84,7 @@ fn convert_path(prefix: Option<ModPath>, path: ast::Path, hygiene: &Hygiene) ->
                     res
                 }
                 Either::Right(crate_id) => {
-                    return Some(ModPath::from_simple_segments(
+                    return Some(ModPath::from_segments(
                         PathKind::DollarCrate(crate_id),
                         iter::empty(),
                     ))
@@ -95,19 +95,19 @@ fn convert_path(prefix: Option<ModPath>, path: ast::Path, hygiene: &Hygiene) ->
             if prefix.is_some() {
                 return None;
             }
-            ModPath::from_simple_segments(PathKind::Crate, iter::empty())
+            ModPath::from_segments(PathKind::Crate, iter::empty())
         }
         ast::PathSegmentKind::SelfKw => {
             if prefix.is_some() {
                 return None;
             }
-            ModPath::from_simple_segments(PathKind::Super(0), iter::empty())
+            ModPath::from_segments(PathKind::Super(0), iter::empty())
         }
         ast::PathSegmentKind::SuperKw => {
             if prefix.is_some() {
                 return None;
             }
-            ModPath::from_simple_segments(PathKind::Super(1), iter::empty())
+            ModPath::from_segments(PathKind::Super(1), iter::empty())
         }
         ast::PathSegmentKind::Type { .. } => {
             // not allowed in imports