Merge #693

693: Name resolution refactoring r=matklad a=flodiebold This is still very WIP, but it's becoming quite big and I want to make sure this isn't going in a completely bad direction :sweat_smile:. I'm not really happy with how the path resolution looks, and I'm not sure `PerNs<Resolution>` is the best return type -- there are 'this cannot happen in the (types/values) namespace' cases everywhere. I also want to unify the `resolver` and `nameres` namespaces once I'm done switching everything to `Resolver`. Also, `Resolver` only has a lifetime because it needs to have a reference to the `ItemMap` during import resolution :confused: The differences in the completion snapshots are almost completely just ordering (except it completes `Self` as well now), so I changed it to sort the completions before snapshotting. Co-authored-by: Florian Diebold <[email protected]>
author: bors[bot] <bors[bot]@users.noreply.github.com> 2019-02-01 22:37:59 +0000
committer: bors[bot] <bors[bot]@users.noreply.github.com> 2019-02-01 22:37:59 +0000
commit: 4447019f4b5f24728bb7b91b161755ddb373c74c (patch)
tree: c53ff3531cbbad182e821eb92fa9ad201d2bff0c /crates/ra_hir/src/code_model_api.rs
parent: 2b5c226e86892113bcab478cdf4c9adaf1e7b2f6 (diff)
parent: c5852f422ff45adaa21815c1a15e03b067a56a82 (diff)
1 files changed, 61 insertions, 7 deletions
diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs
index 71123a698..92ab0f692 100644
--- a/crates/ra_hir/src/code_model_api.rs
+++ b/crates/ra_hir/src/code_model_api.rs
@@ -5,18 +5,19 @@ use ra_db::{CrateId, FileId};
 use ra_syntax::{ast::self, TreeArc, SyntaxNode};
 use crate::{
-    Name, Path, PerNs, ScopesWithSyntaxMapping, Ty, HirFileId,
+    Name, ScopesWithSyntaxMapping, Ty, HirFileId,
    type_ref::TypeRef,
    nameres::{ModuleScope, lower::ImportId},
    HirDatabase, PersistentHirDatabase,
-    expr::BodySyntaxMapping,
+    expr::{Body, BodySyntaxMapping},
-    ty::{InferenceResult},
+    ty::InferenceResult,
    adt::{EnumVariantId, StructFieldId, VariantDef},
    generics::GenericParams,
    docs::{Documentation, Docs, docs_from_ast},
    module_tree::ModuleId,
    ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeId},
    impl_block::ImplId,
+    resolve::Resolver,
 };
 /// hir::Crate describes a single crate. It's the main interface with which
@@ -174,13 +175,14 @@ impl Module {
        db.item_map(self.krate)[self.module_id].clone()
    }
-    pub fn resolve_path(&self, db: &impl PersistentHirDatabase, path: &Path) -> PerNs<ModuleDef> {
-        db.item_map(self.krate).resolve_path(db, *self, path)
-    }
    pub fn problems(&self, db: &impl HirDatabase) -> Vec<(TreeArc<SyntaxNode>, Problem)> {
        self.problems_impl(db)
    }
+    pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
+        let item_map = db.item_map(self.krate);
+        Resolver::default().push_module_scope(item_map, *self)
+    }
 }
 impl Docs for Module {
@@ -282,6 +284,21 @@ impl Struct {
    pub fn ty(&self, db: &impl HirDatabase) -> Ty {
        db.type_for_def((*self).into())
    }
+    // TODO move to a more general type
+    /// Builds a resolver for type references inside this struct.
+    pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
+        // take the outer scope...
+        let r = self.module(db).resolver(db);
+        // ...and add generic params, if present
+        let p = self.generic_params(db);
+        let r = if !p.params.is_empty() {
+            r.push_generic_params_scope(p)
+        } else {
+            r
+        };
+        r
+    }
 }
 impl Docs for Struct {
@@ -331,6 +348,21 @@ impl Enum {
    pub fn ty(&self, db: &impl HirDatabase) -> Ty {
        db.type_for_def((*self).into())
    }
+    // TODO move to a more general type
+    /// Builds a resolver for type references inside this struct.
+    pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
+        // take the outer scope...
+        let r = self.module(db).resolver(db);
+        // ...and add generic params, if present
+        let p = self.generic_params(db);
+        let r = if !p.params.is_empty() {
+            r.push_generic_params_scope(p)
+        } else {
+            r
+        };
+        r
+    }
 }
 impl Docs for Enum {
@@ -449,6 +481,10 @@ impl Function {
        db.body_syntax_mapping(*self)
    }
+    pub fn body(&self, db: &impl HirDatabase) -> Arc<Body> {
+        db.body_hir(*self)
+    }
    pub fn scopes(&self, db: &impl HirDatabase) -> ScopesWithSyntaxMapping {
        let scopes = db.expr_scopes(*self);
        let syntax_mapping = db.body_syntax_mapping(*self);
@@ -469,6 +505,24 @@ impl Function {
    pub fn generic_params(&self, db: &impl PersistentHirDatabase) -> Arc<GenericParams> {
        db.generic_params((*self).into())
    }
+    // TODO move to a more general type for 'body-having' items
+    /// Builds a resolver for code inside this item.
+    pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
+        // take the outer scope...
+        let r = self
+            .impl_block(db)
+            .map(|ib| ib.resolver(db))
+            .unwrap_or_else(|| self.module(db).resolver(db));
+        // ...and add generic params, if present
+        let p = self.generic_params(db);
+        let r = if !p.params.is_empty() {
+            r.push_generic_params_scope(p)
+        } else {
+            r
+        };
+        r
+    }
 }
 impl Docs for Function {
author	bors[bot] <bors[bot]@users.noreply.github.com>	2019-02-01 22:37:59 +0000
committer	bors[bot] <bors[bot]@users.noreply.github.com>	2019-02-01 22:37:59 +0000
commit	4447019f4b5f24728bb7b91b161755ddb373c74c (patch)
tree	c53ff3531cbbad182e821eb92fa9ad201d2bff0c /crates/ra_hir/src/code_model_api.rs
parent	2b5c226e86892113bcab478cdf4c9adaf1e7b2f6 (diff)
parent	c5852f422ff45adaa21815c1a15e03b067a56a82 (diff)

diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs index 71123a698..92ab0f692 100644 --- a/crates/ra_hir/src/code_model_api.rs +++ b/crates/ra_hir/src/code_model_api.rs
@@ -5,18 +5,19 @@ use ra_db::{CrateId, FileId};
5	use ra_syntax::{ast::self, TreeArc, SyntaxNode};	5	use ra_syntax::{ast::self, TreeArc, SyntaxNode};
6		6
7	use crate::{	7	use crate::{
8	Name, Path, PerNs, ScopesWithSyntaxMapping, Ty, HirFileId,	8	Name, ScopesWithSyntaxMapping, Ty, HirFileId,
9	type_ref::TypeRef,	9	type_ref::TypeRef,
10	nameres::{ModuleScope, lower::ImportId},	10	nameres::{ModuleScope, lower::ImportId},
11	HirDatabase, PersistentHirDatabase,	11	HirDatabase, PersistentHirDatabase,
12	expr::BodySyntaxMapping,	12	expr::{Body, BodySyntaxMapping},
13	ty::{InferenceResult},	13	ty::InferenceResult,
14	adt::{EnumVariantId, StructFieldId, VariantDef},	14	adt::{EnumVariantId, StructFieldId, VariantDef},
15	generics::GenericParams,	15	generics::GenericParams,
16	docs::{Documentation, Docs, docs_from_ast},	16	docs::{Documentation, Docs, docs_from_ast},
17	module_tree::ModuleId,	17	module_tree::ModuleId,
18	ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeId},	18	ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeId},
19	impl_block::ImplId,	19	impl_block::ImplId,
		20	resolve::Resolver,
20	};	21	};
21		22
22	/// hir::Crate describes a single crate. It's the main interface with which	23	/// hir::Crate describes a single crate. It's the main interface with which
@@ -174,13 +175,14 @@ impl Module {
174	db.item_map(self.krate)[self.module_id].clone()	175	db.item_map(self.krate)[self.module_id].clone()
175	}	176	}
176		177
177	pub fn resolve_path(&self, db: &impl PersistentHirDatabase, path: &Path) -> PerNs<ModuleDef> {
178	db.item_map(self.krate).resolve_path(db, *self, path)
179	}
180
181	pub fn problems(&self, db: &impl HirDatabase) -> Vec<(TreeArc<SyntaxNode>, Problem)> {	178	pub fn problems(&self, db: &impl HirDatabase) -> Vec<(TreeArc<SyntaxNode>, Problem)> {
182	self.problems_impl(db)	179	self.problems_impl(db)
183	}	180	}
		181
		182	pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
		183	let item_map = db.item_map(self.krate);
		184	Resolver::default().push_module_scope(item_map, *self)
		185	}
184	}	186	}
185		187
186	impl Docs for Module {	188	impl Docs for Module {
@@ -282,6 +284,21 @@ impl Struct {
282	pub fn ty(&self, db: &impl HirDatabase) -> Ty {	284	pub fn ty(&self, db: &impl HirDatabase) -> Ty {
283	db.type_for_def((*self).into())	285	db.type_for_def((*self).into())
284	}	286	}
		287
		288	// TODO move to a more general type
		289	/// Builds a resolver for type references inside this struct.
		290	pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
		291	// take the outer scope...
		292	let r = self.module(db).resolver(db);
		293	// ...and add generic params, if present
		294	let p = self.generic_params(db);
		295	let r = if !p.params.is_empty() {
		296	r.push_generic_params_scope(p)
		297	} else {
		298	r
		299	};
		300	r
		301	}
285	}	302	}
286		303
287	impl Docs for Struct {	304	impl Docs for Struct {
@@ -331,6 +348,21 @@ impl Enum {
331	pub fn ty(&self, db: &impl HirDatabase) -> Ty {	348	pub fn ty(&self, db: &impl HirDatabase) -> Ty {
332	db.type_for_def((*self).into())	349	db.type_for_def((*self).into())
333	}	350	}
		351
		352	// TODO move to a more general type
		353	/// Builds a resolver for type references inside this struct.
		354	pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
		355	// take the outer scope...
		356	let r = self.module(db).resolver(db);
		357	// ...and add generic params, if present
		358	let p = self.generic_params(db);
		359	let r = if !p.params.is_empty() {
		360	r.push_generic_params_scope(p)
		361	} else {
		362	r
		363	};
		364	r
		365	}
334	}	366	}
335		367
336	impl Docs for Enum {	368	impl Docs for Enum {
@@ -449,6 +481,10 @@ impl Function {
449	db.body_syntax_mapping(*self)	481	db.body_syntax_mapping(*self)
450	}	482	}
451		483
		484	pub fn body(&self, db: &impl HirDatabase) -> Arc<Body> {
		485	db.body_hir(*self)
		486	}
		487
452	pub fn scopes(&self, db: &impl HirDatabase) -> ScopesWithSyntaxMapping {	488	pub fn scopes(&self, db: &impl HirDatabase) -> ScopesWithSyntaxMapping {
453	let scopes = db.expr_scopes(*self);	489	let scopes = db.expr_scopes(*self);
454	let syntax_mapping = db.body_syntax_mapping(*self);	490	let syntax_mapping = db.body_syntax_mapping(*self);
@@ -469,6 +505,24 @@ impl Function {
469	pub fn generic_params(&self, db: &impl PersistentHirDatabase) -> Arc<GenericParams> {	505	pub fn generic_params(&self, db: &impl PersistentHirDatabase) -> Arc<GenericParams> {
470	db.generic_params((*self).into())	506	db.generic_params((*self).into())
471	}	507	}
		508
		509	// TODO move to a more general type for 'body-having' items
		510	/// Builds a resolver for code inside this item.
		511	pub fn resolver(&self, db: &impl HirDatabase) -> Resolver {
		512	// take the outer scope...
		513	let r = self
		514	.impl_block(db)
		515	.map(\|ib\| ib.resolver(db))
		516	.unwrap_or_else(\|\| self.module(db).resolver(db));
		517	// ...and add generic params, if present
		518	let p = self.generic_params(db);
		519	let r = if !p.params.is_empty() {
		520	r.push_generic_params_scope(p)
		521	} else {
		522	r
		523	};
		524	r
		525	}
472	}	526	}
473		527
474	impl Docs for Function {	528	impl Docs for Function {