Handle aliasing imports for renaming

Author: nrc

src/analysis.rs

@@ -22,6 +22,15 @@ pub struct Analysis {
     /// Contains lowered data with global inter-crate `Id`s per each crate.
     pub per_crate: HashMap<CrateId, PerCrateAnalysis>,
 
+    // This is a bit of a hack and should be considered temporary. A def has an
+    // entry if there exists an import of the def which aliases it. We use this
+    // for find_all_refs with unique spans to ensure that clients don't rename a
+    // definition when they only mean to rename an alias.
+    //
+    // In the future we should handle imports, in particular aliasing ones, more
+    // explicitly and then this can be removed.
+    pub(crate) aliased_imports: HashSet<Id>,
+
     pub doc_url_base: String,
     pub src_url_base: String,
 }
@@ -135,6 +144,7 @@ impl Analysis {
     pub fn new() -> Analysis {
         Analysis {
             per_crate: HashMap::new(),
+            aliased_imports: HashSet::new(),
             // TODO don't hardcode these
             doc_url_base: "https://doc.rust-lang.org/nightly".to_owned(),
             src_url_base: "https://github.com/rust-lang/rust/blob/master".to_owned(),

src/lib.rs

@@ -307,6 +307,9 @@ impl<L: AnalysisLoader> AnalysisHost<L> {
         let t_start = Instant::now();
         let result = self.with_analysis(|a| {
             a.def_id_for_span(span).map(|id| {
+                if force_unique_spans && a.aliased_imports.contains(&id) {
+                    return vec![];
+                }
                 let decl = if include_decl {
                     def_span!(a, id)
                 } else {

src/lowering.rs

@@ -190,6 +190,8 @@ impl CrateReader {
                 if let Some(alias_span) = i.alias_span {
                     let alias_span = lower_span(&alias_span, &self.base_dir, &self.path_rewrite);
                     self.record_ref(def_id, alias_span, analysis, project_analysis);
+                    let mut analysis = project_analysis.analysis.lock().unwrap();
+                    analysis.as_mut().unwrap().aliased_imports.insert(def_id);
                 }
             }
         }