diff options
author | Seivan Heidari <[email protected]> | 2019-11-15 15:30:21 +0000 |
---|---|---|
committer | Seivan Heidari <[email protected]> | 2019-11-15 15:30:21 +0000 |
commit | cb26df950699586b314731fb70786e0db8eaa049 (patch) | |
tree | 29a1fd853757824572bfebc956d20458d827926f /crates/ra_hir_def/src | |
parent | c622413bc72ea56d5f62a16788d897cb61eca948 (diff) | |
parent | c6f05abfbbfa2fd1ff06e1adeea7885151aaa768 (diff) |
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
Diffstat (limited to 'crates/ra_hir_def/src')
-rw-r--r-- | crates/ra_hir_def/src/body/scope.rs | 219 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres.rs | 22 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres/collector.rs | 5 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres/tests/incremental.rs | 6 | ||||
-rw-r--r-- | crates/ra_hir_def/src/nameres/tests/mod_resolution.rs | 2 |
5 files changed, 245 insertions, 9 deletions
diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/ra_hir_def/src/body/scope.rs index 09a39e721..10cb87d37 100644 --- a/crates/ra_hir_def/src/body/scope.rs +++ b/crates/ra_hir_def/src/body/scope.rs | |||
@@ -67,6 +67,11 @@ impl ExprScopes { | |||
67 | std::iter::successors(scope, move |&scope| self.scopes[scope].parent) | 67 | std::iter::successors(scope, move |&scope| self.scopes[scope].parent) |
68 | } | 68 | } |
69 | 69 | ||
70 | pub fn resolve_name_in_scope(&self, scope: ScopeId, name: &Name) -> Option<&ScopeEntry> { | ||
71 | self.scope_chain(Some(scope)) | ||
72 | .find_map(|scope| self.entries(scope).iter().find(|it| it.name == *name)) | ||
73 | } | ||
74 | |||
70 | pub fn scope_for(&self, expr: ExprId) -> Option<ScopeId> { | 75 | pub fn scope_for(&self, expr: ExprId) -> Option<ScopeId> { |
71 | self.scope_by_expr.get(&expr).copied() | 76 | self.scope_by_expr.get(&expr).copied() |
72 | } | 77 | } |
@@ -163,3 +168,217 @@ fn compute_expr_scopes(expr: ExprId, body: &Body, scopes: &mut ExprScopes, scope | |||
163 | e => e.walk_child_exprs(|e| compute_expr_scopes(e, body, scopes, scope)), | 168 | e => e.walk_child_exprs(|e| compute_expr_scopes(e, body, scopes, scope)), |
164 | }; | 169 | }; |
165 | } | 170 | } |
171 | |||
172 | #[cfg(test)] | ||
173 | mod tests { | ||
174 | use hir_expand::{name::AsName, Source}; | ||
175 | use ra_db::{fixture::WithFixture, FileId, SourceDatabase}; | ||
176 | use ra_syntax::{algo::find_node_at_offset, ast, AstNode}; | ||
177 | use test_utils::{assert_eq_text, extract_offset}; | ||
178 | |||
179 | use crate::{db::DefDatabase2, test_db::TestDB, FunctionId, ModuleDefId}; | ||
180 | |||
181 | fn find_function(db: &TestDB, file_id: FileId) -> FunctionId { | ||
182 | let krate = db.test_crate(); | ||
183 | let crate_def_map = db.crate_def_map(krate); | ||
184 | |||
185 | let module = crate_def_map.modules_for_file(file_id).next().unwrap(); | ||
186 | let (_, res) = crate_def_map[module].scope.entries().next().unwrap(); | ||
187 | match res.def.take_values().unwrap() { | ||
188 | ModuleDefId::FunctionId(it) => it, | ||
189 | _ => panic!(), | ||
190 | } | ||
191 | } | ||
192 | |||
193 | fn do_check(code: &str, expected: &[&str]) { | ||
194 | let (off, code) = extract_offset(code); | ||
195 | let code = { | ||
196 | let mut buf = String::new(); | ||
197 | let off = u32::from(off) as usize; | ||
198 | buf.push_str(&code[..off]); | ||
199 | buf.push_str("marker"); | ||
200 | buf.push_str(&code[off..]); | ||
201 | buf | ||
202 | }; | ||
203 | |||
204 | let (db, file_id) = TestDB::with_single_file(&code); | ||
205 | |||
206 | let file_syntax = db.parse(file_id).syntax_node(); | ||
207 | let marker: ast::PathExpr = find_node_at_offset(&file_syntax, off).unwrap(); | ||
208 | let function = find_function(&db, file_id); | ||
209 | |||
210 | let scopes = db.expr_scopes(function.into()); | ||
211 | let (_body, source_map) = db.body_with_source_map(function.into()); | ||
212 | |||
213 | let expr_id = | ||
214 | source_map.node_expr(Source { file_id: file_id.into(), ast: &marker.into() }).unwrap(); | ||
215 | let scope = scopes.scope_for(expr_id); | ||
216 | |||
217 | let actual = scopes | ||
218 | .scope_chain(scope) | ||
219 | .flat_map(|scope| scopes.entries(scope)) | ||
220 | .map(|it| it.name().to_string()) | ||
221 | .collect::<Vec<_>>() | ||
222 | .join("\n"); | ||
223 | let expected = expected.join("\n"); | ||
224 | assert_eq_text!(&expected, &actual); | ||
225 | } | ||
226 | |||
227 | #[test] | ||
228 | fn test_lambda_scope() { | ||
229 | do_check( | ||
230 | r" | ||
231 | fn quux(foo: i32) { | ||
232 | let f = |bar, baz: i32| { | ||
233 | <|> | ||
234 | }; | ||
235 | }", | ||
236 | &["bar", "baz", "foo"], | ||
237 | ); | ||
238 | } | ||
239 | |||
240 | #[test] | ||
241 | fn test_call_scope() { | ||
242 | do_check( | ||
243 | r" | ||
244 | fn quux() { | ||
245 | f(|x| <|> ); | ||
246 | }", | ||
247 | &["x"], | ||
248 | ); | ||
249 | } | ||
250 | |||
251 | #[test] | ||
252 | fn test_method_call_scope() { | ||
253 | do_check( | ||
254 | r" | ||
255 | fn quux() { | ||
256 | z.f(|x| <|> ); | ||
257 | }", | ||
258 | &["x"], | ||
259 | ); | ||
260 | } | ||
261 | |||
262 | #[test] | ||
263 | fn test_loop_scope() { | ||
264 | do_check( | ||
265 | r" | ||
266 | fn quux() { | ||
267 | loop { | ||
268 | let x = (); | ||
269 | <|> | ||
270 | }; | ||
271 | }", | ||
272 | &["x"], | ||
273 | ); | ||
274 | } | ||
275 | |||
276 | #[test] | ||
277 | fn test_match() { | ||
278 | do_check( | ||
279 | r" | ||
280 | fn quux() { | ||
281 | match () { | ||
282 | Some(x) => { | ||
283 | <|> | ||
284 | } | ||
285 | }; | ||
286 | }", | ||
287 | &["x"], | ||
288 | ); | ||
289 | } | ||
290 | |||
291 | #[test] | ||
292 | fn test_shadow_variable() { | ||
293 | do_check( | ||
294 | r" | ||
295 | fn foo(x: String) { | ||
296 | let x : &str = &x<|>; | ||
297 | }", | ||
298 | &["x"], | ||
299 | ); | ||
300 | } | ||
301 | |||
302 | fn do_check_local_name(code: &str, expected_offset: u32) { | ||
303 | let (off, code) = extract_offset(code); | ||
304 | |||
305 | let (db, file_id) = TestDB::with_single_file(&code); | ||
306 | |||
307 | let file = db.parse(file_id).ok().unwrap(); | ||
308 | let expected_name = find_node_at_offset::<ast::Name>(file.syntax(), expected_offset.into()) | ||
309 | .expect("failed to find a name at the target offset"); | ||
310 | let name_ref: ast::NameRef = find_node_at_offset(file.syntax(), off).unwrap(); | ||
311 | |||
312 | let function = find_function(&db, file_id); | ||
313 | |||
314 | let scopes = db.expr_scopes(function.into()); | ||
315 | let (_body, source_map) = db.body_with_source_map(function.into()); | ||
316 | |||
317 | let expr_scope = { | ||
318 | let expr_ast = name_ref.syntax().ancestors().find_map(ast::Expr::cast).unwrap(); | ||
319 | let expr_id = | ||
320 | source_map.node_expr(Source { file_id: file_id.into(), ast: &expr_ast }).unwrap(); | ||
321 | scopes.scope_for(expr_id).unwrap() | ||
322 | }; | ||
323 | |||
324 | let resolved = scopes.resolve_name_in_scope(expr_scope, &name_ref.as_name()).unwrap(); | ||
325 | let pat_src = source_map.pat_syntax(resolved.pat()).unwrap(); | ||
326 | |||
327 | let local_name = pat_src.ast.either(|it| it.syntax_node_ptr(), |it| it.syntax_node_ptr()); | ||
328 | assert_eq!(local_name.range(), expected_name.syntax().text_range()); | ||
329 | } | ||
330 | |||
331 | #[test] | ||
332 | fn test_resolve_local_name() { | ||
333 | do_check_local_name( | ||
334 | r#" | ||
335 | fn foo(x: i32, y: u32) { | ||
336 | { | ||
337 | let z = x * 2; | ||
338 | } | ||
339 | { | ||
340 | let t = x<|> * 3; | ||
341 | } | ||
342 | }"#, | ||
343 | 21, | ||
344 | ); | ||
345 | } | ||
346 | |||
347 | #[test] | ||
348 | fn test_resolve_local_name_declaration() { | ||
349 | do_check_local_name( | ||
350 | r#" | ||
351 | fn foo(x: String) { | ||
352 | let x : &str = &x<|>; | ||
353 | }"#, | ||
354 | 21, | ||
355 | ); | ||
356 | } | ||
357 | |||
358 | #[test] | ||
359 | fn test_resolve_local_name_shadow() { | ||
360 | do_check_local_name( | ||
361 | r" | ||
362 | fn foo(x: String) { | ||
363 | let x : &str = &x; | ||
364 | x<|> | ||
365 | } | ||
366 | ", | ||
367 | 53, | ||
368 | ); | ||
369 | } | ||
370 | |||
371 | #[test] | ||
372 | fn ref_patterns_contribute_bindings() { | ||
373 | do_check_local_name( | ||
374 | r" | ||
375 | fn foo() { | ||
376 | if let Some(&from) = bar() { | ||
377 | from<|>; | ||
378 | } | ||
379 | } | ||
380 | ", | ||
381 | 53, | ||
382 | ); | ||
383 | } | ||
384 | } | ||
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs index d3ecabb9b..21d5f62e0 100644 --- a/crates/ra_hir_def/src/nameres.rs +++ b/crates/ra_hir_def/src/nameres.rs | |||
@@ -58,7 +58,7 @@ mod tests; | |||
58 | 58 | ||
59 | use std::sync::Arc; | 59 | use std::sync::Arc; |
60 | 60 | ||
61 | use hir_expand::{diagnostics::DiagnosticSink, name::Name, MacroDefId}; | 61 | use hir_expand::{ast_id_map::FileAstId, diagnostics::DiagnosticSink, name::Name, MacroDefId}; |
62 | use once_cell::sync::Lazy; | 62 | use once_cell::sync::Lazy; |
63 | use ra_arena::Arena; | 63 | use ra_arena::Arena; |
64 | use ra_db::{CrateId, Edition, FileId}; | 64 | use ra_db::{CrateId, Edition, FileId}; |
@@ -73,7 +73,7 @@ use crate::{ | |||
73 | diagnostics::DefDiagnostic, path_resolution::ResolveMode, per_ns::PerNs, raw::ImportId, | 73 | diagnostics::DefDiagnostic, path_resolution::ResolveMode, per_ns::PerNs, raw::ImportId, |
74 | }, | 74 | }, |
75 | path::Path, | 75 | path::Path, |
76 | AstId, CrateModuleId, ModuleDefId, ModuleId, TraitId, | 76 | AstId, CrateModuleId, FunctionId, ModuleDefId, ModuleId, TraitId, |
77 | }; | 77 | }; |
78 | 78 | ||
79 | /// Contains all top-level defs from a macro-expanded crate | 79 | /// Contains all top-level defs from a macro-expanded crate |
@@ -87,7 +87,7 @@ pub struct CrateDefMap { | |||
87 | prelude: Option<ModuleId>, | 87 | prelude: Option<ModuleId>, |
88 | extern_prelude: FxHashMap<Name, ModuleDefId>, | 88 | extern_prelude: FxHashMap<Name, ModuleDefId>, |
89 | root: CrateModuleId, | 89 | root: CrateModuleId, |
90 | pub modules: Arena<CrateModuleId, ModuleData>, | 90 | modules: Arena<CrateModuleId, ModuleData>, |
91 | 91 | ||
92 | /// Some macros are not well-behavior, which leads to infinite loop | 92 | /// Some macros are not well-behavior, which leads to infinite loop |
93 | /// e.g. macro_rules! foo { ($ty:ty) => { foo!($ty); } } | 93 | /// e.g. macro_rules! foo { ($ty:ty) => { foo!($ty); } } |
@@ -124,6 +124,11 @@ pub struct ModuleData { | |||
124 | pub definition: Option<FileId>, | 124 | pub definition: Option<FileId>, |
125 | } | 125 | } |
126 | 126 | ||
127 | #[derive(Default, Debug, PartialEq, Eq, Clone)] | ||
128 | pub(crate) struct Declarations { | ||
129 | fns: FxHashMap<FileAstId<ast::FnDef>, FunctionId>, | ||
130 | } | ||
131 | |||
127 | #[derive(Debug, Default, PartialEq, Eq, Clone)] | 132 | #[derive(Debug, Default, PartialEq, Eq, Clone)] |
128 | pub struct ModuleScope { | 133 | pub struct ModuleScope { |
129 | pub items: FxHashMap<Name, Resolution>, | 134 | pub items: FxHashMap<Name, Resolution>, |
@@ -258,6 +263,17 @@ impl CrateDefMap { | |||
258 | let res = self.resolve_path_fp_with_macro(db, ResolveMode::Other, original_module, path); | 263 | let res = self.resolve_path_fp_with_macro(db, ResolveMode::Other, original_module, path); |
259 | (res.resolved_def, res.segment_index) | 264 | (res.resolved_def, res.segment_index) |
260 | } | 265 | } |
266 | |||
267 | pub fn modules(&self) -> impl Iterator<Item = CrateModuleId> + '_ { | ||
268 | self.modules.iter().map(|(id, _data)| id) | ||
269 | } | ||
270 | |||
271 | pub fn modules_for_file(&self, file_id: FileId) -> impl Iterator<Item = CrateModuleId> + '_ { | ||
272 | self.modules | ||
273 | .iter() | ||
274 | .filter(move |(_id, data)| data.definition == Some(file_id)) | ||
275 | .map(|(id, _data)| id) | ||
276 | } | ||
261 | } | 277 | } |
262 | 278 | ||
263 | mod diagnostics { | 279 | mod diagnostics { |
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index 37d0f3093..5c899aff3 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs | |||
@@ -664,7 +664,8 @@ where | |||
664 | let name = def.name.clone(); | 664 | let name = def.name.clone(); |
665 | let def: PerNs = match def.kind { | 665 | let def: PerNs = match def.kind { |
666 | raw::DefKind::Function(ast_id) => { | 666 | raw::DefKind::Function(ast_id) => { |
667 | PerNs::values(FunctionId::from_ast_id(ctx, ast_id).into()) | 667 | let f = FunctionId::from_ast_id(ctx, ast_id); |
668 | PerNs::values(f.into()) | ||
668 | } | 669 | } |
669 | raw::DefKind::Struct(ast_id) => { | 670 | raw::DefKind::Struct(ast_id) => { |
670 | let id = StructOrUnionId::from_ast_id(ctx, ast_id).into(); | 671 | let id = StructOrUnionId::from_ast_id(ctx, ast_id).into(); |
@@ -798,7 +799,7 @@ mod tests { | |||
798 | 799 | ||
799 | fn do_limited_resolve(code: &str, limit: u32, poison_limit: u32) -> CrateDefMap { | 800 | fn do_limited_resolve(code: &str, limit: u32, poison_limit: u32) -> CrateDefMap { |
800 | let (db, _file_id) = TestDB::with_single_file(&code); | 801 | let (db, _file_id) = TestDB::with_single_file(&code); |
801 | let krate = db.crate_graph().iter().next().unwrap(); | 802 | let krate = db.test_crate(); |
802 | 803 | ||
803 | let def_map = { | 804 | let def_map = { |
804 | let edition = db.crate_graph().edition(krate); | 805 | let edition = db.crate_graph().edition(krate); |
diff --git a/crates/ra_hir_def/src/nameres/tests/incremental.rs b/crates/ra_hir_def/src/nameres/tests/incremental.rs index 80dcec62f..903a22771 100644 --- a/crates/ra_hir_def/src/nameres/tests/incremental.rs +++ b/crates/ra_hir_def/src/nameres/tests/incremental.rs | |||
@@ -1,12 +1,12 @@ | |||
1 | use std::sync::Arc; | 1 | use std::sync::Arc; |
2 | 2 | ||
3 | use ra_db::{SourceDatabase, SourceDatabaseExt}; | 3 | use ra_db::SourceDatabaseExt; |
4 | 4 | ||
5 | use super::*; | 5 | use super::*; |
6 | 6 | ||
7 | fn check_def_map_is_not_recomputed(initial: &str, file_change: &str) { | 7 | fn check_def_map_is_not_recomputed(initial: &str, file_change: &str) { |
8 | let (mut db, pos) = TestDB::with_position(initial); | 8 | let (mut db, pos) = TestDB::with_position(initial); |
9 | let krate = db.crate_graph().iter().next().unwrap(); | 9 | let krate = db.test_crate(); |
10 | { | 10 | { |
11 | let events = db.log_executed(|| { | 11 | let events = db.log_executed(|| { |
12 | db.crate_def_map(krate); | 12 | db.crate_def_map(krate); |
@@ -111,7 +111,7 @@ fn typing_inside_a_macro_should_not_invalidate_def_map() { | |||
111 | m!(X); | 111 | m!(X); |
112 | ", | 112 | ", |
113 | ); | 113 | ); |
114 | let krate = db.crate_graph().iter().next().unwrap(); | 114 | let krate = db.test_crate(); |
115 | { | 115 | { |
116 | let events = db.log_executed(|| { | 116 | let events = db.log_executed(|| { |
117 | let crate_def_map = db.crate_def_map(krate); | 117 | let crate_def_map = db.crate_def_map(krate); |
diff --git a/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs b/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs index dee364a14..eb7b85c07 100644 --- a/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs +++ b/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs | |||
@@ -656,7 +656,7 @@ fn unresolved_module_diagnostics() { | |||
656 | //- /foo.rs | 656 | //- /foo.rs |
657 | ", | 657 | ", |
658 | ); | 658 | ); |
659 | let krate = db.crate_graph().iter().next().unwrap(); | 659 | let krate = db.test_crate(); |
660 | 660 | ||
661 | let crate_def_map = db.crate_def_map(krate); | 661 | let crate_def_map = db.crate_def_map(krate); |
662 | 662 | ||