Consider crate declaration names

crates/ra_db/src/fixture.rs

@@ -56,6 +56,7 @@ fn with_single_file(db: &mut dyn SourceDatabaseExt, text: &str) -> FileId {
     crate_graph.add_crate_root(
         file_id,
         Edition::Edition2018,
+        None,
         CfgOptions::default(),
         Env::default(),
     );
@@ -98,8 +99,13 @@ fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option<FilePosit
         assert!(meta.path.starts_with(&source_root_prefix));
 
         if let Some(krate) = meta.krate {
-            let crate_id =
+            let crate_id = crate_graph.add_crate_root(
-                crate_graph.add_crate_root(file_id, meta.edition, meta.cfg, Env::default());
+                file_id,
+                meta.edition,
+                Some(krate.clone()),
+                meta.cfg,
+                Env::default(),
+            );
             let prev = crates.insert(krate.clone(), crate_id);
             assert!(prev.is_none());
             for dep in meta.deps {
@@ -132,6 +138,7 @@ fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option<FilePosit
         crate_graph.add_crate_root(
             crate_root,
             Edition::Edition2018,
+            None,
             CfgOptions::default(),
             Env::default(),
         );

crates/ra_db/src/input.rs

@@ -86,7 +86,7 @@ pub struct CrateId(pub u32);
 pub struct CrateName(SmolStr);
 
 impl CrateName {
-    /// Crates a crate name, checking for dashes in the string provided.
+    /// Creates a crate name, checking for dashes in the string provided.
     /// Dashes are not allowed in the crate names,
     /// hence the input string is returned as `Err` for those cases.
     pub fn new(name: &str) -> Result<CrateName, &str> {
@@ -97,7 +97,7 @@ impl CrateName {
         }
     }
 
-    /// Crates a crate name, unconditionally replacing the dashes with underscores.
+    /// Creates a crate name, unconditionally replacing the dashes with underscores.
     pub fn normalize_dashes(name: &str) -> CrateName {
         Self(SmolStr::new(name.replace('-', "_")))
     }
@@ -107,6 +107,7 @@ impl CrateName {
 struct CrateData {
     file_id: FileId,
     edition: Edition,
+    declaration_name: Option<String>,
     cfg_options: CfgOptions,
     env: Env,
     dependencies: Vec<Dependency>,
@@ -134,10 +135,11 @@ impl CrateGraph {
         &mut self,
         file_id: FileId,
         edition: Edition,
+        declaration_name: Option<String>,
         cfg_options: CfgOptions,
         env: Env,
     ) -> CrateId {
-        let data = CrateData::new(file_id, edition, cfg_options, env);
+        let data = CrateData::new(file_id, edition, declaration_name, cfg_options, env);
         let crate_id = CrateId(self.arena.len() as u32);
         let prev = self.arena.insert(crate_id, data);
         assert!(prev.is_none());
@@ -177,6 +179,15 @@ impl CrateGraph {
         self.arena[&crate_id].edition
     }
 
+    /// Returns a name of a crate, declared in the root project.
+    /// May be missing for some cases, such as when the crate definition was created for a code snippet.
+    ///
+    /// This should not be considered as a normal crate name, since the actual name can be different in
+    /// a particular dependent crate, where it is specified.
+    pub fn declaration_name(&self, crate_id: &CrateId) -> Option<&String> {
+        self.arena[crate_id].declaration_name.as_ref()
+    }
+
     // FIXME: this only finds one crate with the given root; we could have multiple
     pub fn crate_id_for_crate_root(&self, file_id: FileId) -> Option<CrateId> {
         let (&crate_id, _) = self.arena.iter().find(|(_crate_id, data)| data.file_id == file_id)?;
@@ -230,8 +241,14 @@ impl CrateId {
 }
 
 impl CrateData {
-    fn new(file_id: FileId, edition: Edition, cfg_options: CfgOptions, env: Env) -> CrateData {
+    fn new(
-        CrateData { file_id, edition, dependencies: Vec::new(), cfg_options, env }
+        file_id: FileId,
+        edition: Edition,
+        declaration_name: Option<String>,
+        cfg_options: CfgOptions,
+        env: Env,
+    ) -> CrateData {
+        CrateData { file_id, edition, declaration_name, dependencies: Vec::new(), cfg_options, env }
     }
 
     fn add_dep(&mut self, name: SmolStr, crate_id: CrateId) {
@@ -290,12 +307,27 @@ mod tests {
     #[test]
     fn it_should_panic_because_of_cycle_dependencies() {
         let mut graph = CrateGraph::default();
-        let crate1 =
+        let crate1 = graph.add_crate_root(
-            graph.add_crate_root(FileId(1u32), Edition2018, CfgOptions::default(), Env::default());
+            FileId(1u32),
-        let crate2 =
+            Edition2018,
-            graph.add_crate_root(FileId(2u32), Edition2018, CfgOptions::default(), Env::default());
+            None,
-        let crate3 =
+            CfgOptions::default(),
-            graph.add_crate_root(FileId(3u32), Edition2018, CfgOptions::default(), Env::default());
+            Env::default(),
+        );
+        let crate2 = graph.add_crate_root(
+            FileId(2u32),
+            Edition2018,
+            None,
+            CfgOptions::default(),
+            Env::default(),
+        );
+        let crate3 = graph.add_crate_root(
+            FileId(3u32),
+            Edition2018,
+            None,
+            CfgOptions::default(),
+            Env::default(),
+        );
         assert!(graph.add_dep(crate1, CrateName::new("crate2").unwrap(), crate2).is_ok());
         assert!(graph.add_dep(crate2, CrateName::new("crate3").unwrap(), crate3).is_ok());
         assert!(graph.add_dep(crate3, CrateName::new("crate1").unwrap(), crate1).is_err());
@@ -304,12 +336,27 @@ mod tests {
     #[test]
     fn it_works() {
         let mut graph = CrateGraph::default();
-        let crate1 =
+        let crate1 = graph.add_crate_root(
-            graph.add_crate_root(FileId(1u32), Edition2018, CfgOptions::default(), Env::default());
+            FileId(1u32),
-        let crate2 =
+            Edition2018,
-            graph.add_crate_root(FileId(2u32), Edition2018, CfgOptions::default(), Env::default());
+            None,
-        let crate3 =
+            CfgOptions::default(),
-            graph.add_crate_root(FileId(3u32), Edition2018, CfgOptions::default(), Env::default());
+            Env::default(),
+        );
+        let crate2 = graph.add_crate_root(
+            FileId(2u32),
+            Edition2018,
+            None,
+            CfgOptions::default(),
+            Env::default(),
+        );
+        let crate3 = graph.add_crate_root(
+            FileId(3u32),
+            Edition2018,
+            None,
+            CfgOptions::default(),
+            Env::default(),
+        );
         assert!(graph.add_dep(crate1, CrateName::new("crate2").unwrap(), crate2).is_ok());
         assert!(graph.add_dep(crate2, CrateName::new("crate3").unwrap(), crate3).is_ok());
     }
@@ -317,10 +364,20 @@ mod tests {
     #[test]
     fn dashes_are_normalized() {
         let mut graph = CrateGraph::default();
-        let crate1 =
+        let crate1 = graph.add_crate_root(
-            graph.add_crate_root(FileId(1u32), Edition2018, CfgOptions::default(), Env::default());
+            FileId(1u32),
-        let crate2 =
+            Edition2018,
-            graph.add_crate_root(FileId(2u32), Edition2018, CfgOptions::default(), Env::default());
+            None,
+            CfgOptions::default(),
+            Env::default(),
+        );
+        let crate2 = graph.add_crate_root(
+            FileId(2u32),
+            Edition2018,
+            None,
+            CfgOptions::default(),
+            Env::default(),
+        );
         assert!(graph
             .add_dep(crate1, CrateName::normalize_dashes("crate-name-with-dashes"), crate2)
             .is_ok());

crates/ra_ide/src/hover.rs

@@ -1,8 +1,10 @@
 //! FIXME: write short doc here
 
 use hir::{
-    Adt, AsAssocItem, AssocItemContainer, HasSource, HirDisplay, ModuleDef, ModuleSource, Semantics,
+    Adt, AsAssocItem, AssocItemContainer, FieldSource, HasSource, HirDisplay, ModuleDef,
+    ModuleSource, Semantics,
 };
+use ra_db::SourceDatabase;
 use ra_ide_db::{
     defs::{classify_name, classify_name_ref, Definition},
     RootDatabase,
@@ -119,7 +121,7 @@ fn definition_owner_name(db: &RootDatabase, def: &Definition) -> Option<String>
 
 fn determine_mod_path(db: &RootDatabase, def: &Definition) -> Option<String> {
     let mod_path = def.module(db).map(|module| {
-        once(db.get_crate_original_name(&module.krate().into()))
+        once(db.crate_graph().declaration_name(&module.krate().into()).cloned())
             .chain(
                 module
                     .path_to_root(db)
@@ -144,7 +146,7 @@ fn hover_text_from_name_kind(db: &RootDatabase, def: Definition) -> Option<Strin
         Definition::StructField(it) => {
             let src = it.source(db);
             match src.value {
-                hir::FieldSource::Named(it) => {
+                FieldSource::Named(it) => {
                     hover_text(it.doc_comment_text(), it.short_label(), mod_path)
                 }
                 _ => None,
@@ -576,21 +578,23 @@ fn func(foo: i32) { if true { <|>foo; }; }
     fn test_hover_infer_associated_method_exact() {
         let (analysis, position) = single_file_with_position(
             "
-            struct Thing { x: u32 }
+            mod wrapper {
+                struct Thing { x: u32 }
 
-            impl Thing {
+                impl Thing {
-                fn new() -> Thing {
+                    fn new() -> Thing {
-                    Thing { x: 0 }
+                        Thing { x: 0 }
+                    }
                 }
             }
 
             fn main() {
-                let foo_test = Thing::new<|>();
+                let foo_test = wrapper::Thing::new<|>();
             }
             ",
         );
         let hover = analysis.hover(position).unwrap().unwrap();
-        assert_eq!(trim_markup_opt(hover.info.first()), Some("fn new() -> Thing"));
+        assert_eq!(trim_markup_opt(hover.info.first()), Some("wrapper::Thing\nfn new() -> Thing"));
         assert_eq!(hover.info.is_exact(), true);
     }
 
@@ -863,25 +867,4 @@ fn func(foo: i32) { if true { <|>foo; }; }
             &["fn foo()\n```\n\n<- `\u{3000}` here"],
         );
     }
-
-    #[test]
-    fn zzz() {
-        check_hover_result(
-            "
-            //- /main.rs
-            mod vvv {
-                pub struct Test;
-
-                impl Test {
-                    pub fn whatever() {}
-                }
-            }
-
-            fn main() {
-                vvv::Test::what<|>ever();
-            }
-            ",
-            &["vvv::Test\npub fn whatever()"],
-        );
-    }
 }

crates/ra_ide/src/lib.rs

@@ -211,7 +211,13 @@ impl Analysis {
         // Default to enable test for single file.
         let mut cfg_options = CfgOptions::default();
         cfg_options.insert_atom("test".into());
-        crate_graph.add_crate_root(file_id, Edition::Edition2018, cfg_options, Env::default());
+        crate_graph.add_crate_root(
+            file_id,
+            Edition::Edition2018,
+            None,
+            cfg_options,
+            Env::default(),
+        );
         change.add_file(source_root, file_id, "main.rs".into(), Arc::new(text));
         change.set_crate_graph(crate_graph);
         host.apply_change(change);

crates/ra_ide/src/mock_analysis.rs

@@ -99,13 +99,19 @@ impl MockAnalysis {
                 root_crate = Some(crate_graph.add_crate_root(
                     file_id,
                     Edition2018,
+                    None,
                     cfg_options,
                     Env::default(),
                 ));
             } else if path.ends_with("/lib.rs") {
-                let other_crate =
-                    crate_graph.add_crate_root(file_id, Edition2018, cfg_options, Env::default());
                 let crate_name = path.parent().unwrap().file_name().unwrap();
+                let other_crate = crate_graph.add_crate_root(
+                    file_id,
+                    Edition2018,
+                    Some(crate_name.to_owned()),
+                    cfg_options,
+                    Env::default(),
+                );
                 if let Some(root_crate) = root_crate {
                     crate_graph
                         .add_dep(root_crate, CrateName::new(crate_name).unwrap(), other_crate)

crates/ra_ide/src/parent_module.rs

@@ -133,6 +133,7 @@ mod tests {
         let crate_id = crate_graph.add_crate_root(
             root_file,
             Edition2018,
+            None,
             CfgOptions::default(),
             Env::default(),
         );

crates/ra_ide_db/src/change.rs

@@ -5,7 +5,7 @@ use std::{fmt, sync::Arc, time};
 
 use ra_db::{
     salsa::{Database, Durability, SweepStrategy},
-    CrateGraph, CrateId, FileId, RelativePathBuf, SourceDatabase, SourceDatabaseExt, SourceRoot,
+    CrateGraph, FileId, RelativePathBuf, SourceDatabase, SourceDatabaseExt, SourceRoot,
     SourceRootId,
 };
 use ra_prof::{memory_usage, profile, Bytes};
@@ -88,10 +88,6 @@ impl AnalysisChange {
         self.crate_graph = Some(graph);
     }
 
-    pub fn set_debug_crate_name(&mut self, crate_id: CrateId, name: String) {
-        self.debug_data.crate_names.insert(crate_id, name);
-    }
-
     pub fn set_debug_root_path(&mut self, source_root_id: SourceRootId, path: String) {
         self.debug_data.root_paths.insert(source_root_id, path);
     }

crates/ra_ide_db/src/lib.rs

@@ -104,10 +104,6 @@ impl RootDatabase {
         db.query_mut(hir::db::MacroExpandQuery).set_lru_capacity(lru_capacity);
         db
     }
-
-    pub fn get_crate_original_name(&self, crate_id: &CrateId) -> Option<String> {
-        self.debug_data.crate_names.get(crate_id).cloned()
-    }
 }
 
 impl salsa::ParallelDatabase for RootDatabase {
@@ -135,12 +131,10 @@ fn line_index(db: &impl LineIndexDatabase, file_id: FileId) -> Arc<LineIndex> {
 #[derive(Debug, Default, Clone)]
 pub(crate) struct DebugData {
     pub(crate) root_paths: FxHashMap<SourceRootId, String>,
-    pub(crate) crate_names: FxHashMap<CrateId, String>,
 }
 
 impl DebugData {
     pub(crate) fn merge(&mut self, other: DebugData) {
         self.root_paths.extend(other.root_paths.into_iter());
-        self.crate_names.extend(other.crate_names.into_iter());
     }
 }

crates/ra_project_model/src/lib.rs

@@ -14,7 +14,7 @@ use std::{
 
 use anyhow::{bail, Context, Result};
 use ra_cfg::CfgOptions;
-use ra_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId};
+use ra_db::{CrateGraph, CrateName, Edition, Env, FileId};
 use rustc_hash::FxHashMap;
 use serde_json::from_reader;
 
@@ -163,9 +163,8 @@ impl ProjectWorkspace {
         &self,
         default_cfg_options: &CfgOptions,
         load: &mut dyn FnMut(&Path) -> Option<FileId>,
-    ) -> (CrateGraph, FxHashMap<CrateId, String>) {
+    ) -> CrateGraph {
         let mut crate_graph = CrateGraph::default();
-        let mut names = FxHashMap::default();
         match self {
             ProjectWorkspace::Json { project } => {
                 let mut crates = FxHashMap::default();
@@ -191,6 +190,8 @@ impl ProjectWorkspace {
                             crate_graph.add_crate_root(
                                 file_id,
                                 edition,
+                                // FIXME json definitions can store the crate name
+                                None,
                                 cfg_options,
                                 Env::default(),
                             ),
@@ -233,11 +234,11 @@ impl ProjectWorkspace {
                         let crate_id = crate_graph.add_crate_root(
                             file_id,
                             Edition::Edition2018,
+                            Some(krate.name(&sysroot).to_string()),
                             cfg_options,
                             Env::default(),
                         );
                         sysroot_crates.insert(krate, crate_id);
-                        names.insert(crate_id, krate.name(&sysroot).to_string());
                     }
                 }
                 for from in sysroot.crates() {
@@ -277,10 +278,10 @@ impl ProjectWorkspace {
                             let crate_id = crate_graph.add_crate_root(
                                 file_id,
                                 edition,
+                                Some(pkg.name(&cargo).to_string()),
                                 cfg_options,
                                 Env::default(),
                             );
-                            names.insert(crate_id, pkg.name(&cargo).to_string());
                             if tgt.kind(&cargo) == TargetKind::Lib {
                                 lib_tgt = Some(crate_id);
                                 pkg_to_lib_crate.insert(pkg, crate_id);
@@ -381,7 +382,7 @@ impl ProjectWorkspace {
                 }
             }
         }
-        (crate_graph, names)
+        crate_graph
     }
 
     pub fn workspace_root_for(&self, path: &Path) -> Option<&Path> {

crates/rust-analyzer/src/cli/load_cargo.rs

@@ -52,12 +52,11 @@ pub(crate) fn load_cargo(
         opts
     };
 
-    let (crate_graph, _crate_names) =
+    let crate_graph = ws.to_crate_graph(&default_cfg_options, &mut |path: &Path| {
-        ws.to_crate_graph(&default_cfg_options, &mut |path: &Path| {
+        let vfs_file = vfs.load(path);
-            let vfs_file = vfs.load(path);
+        log::debug!("vfs file {:?} -> {:?}", path, vfs_file);
-            log::debug!("vfs file {:?} -> {:?}", path, vfs_file);
+        vfs_file.map(vfs_file_to_id)
-            vfs_file.map(vfs_file_to_id)
+    });
-        });
     log::debug!("crate graph: {:?}", crate_graph);
 
     let source_roots = roots

crates/rust-analyzer/src/world.rs

@@ -123,13 +123,12 @@ impl WorldState {
             let vfs_file = vfs.load(path);
             vfs_file.map(|f| FileId(f.0))
         };
-        for ws in workspaces.iter() {
+
-            let (graph, crate_names) = ws.to_crate_graph(&default_cfg_options, &mut load);
+        workspaces.iter().map(|ws| ws.to_crate_graph(&default_cfg_options, &mut load)).for_each(
-            let shift = crate_graph.extend(graph);
+            |graph| {
-            for (crate_id, name) in crate_names {
+                crate_graph.extend(graph);
-                change.set_debug_crate_name(crate_id.shift(shift), name)
+            },
-            }
+        );
-        }
         change.set_crate_graph(crate_graph);
 
         // FIXME: Figure out the multi-workspace situation