diff options
Diffstat (limited to 'crates/ra_hir_def/src/data.rs')
-rw-r--r-- | crates/ra_hir_def/src/data.rs | 194 |
1 files changed, 94 insertions, 100 deletions
diff --git a/crates/ra_hir_def/src/data.rs b/crates/ra_hir_def/src/data.rs index 7a2067e49..e2130d931 100644 --- a/crates/ra_hir_def/src/data.rs +++ b/crates/ra_hir_def/src/data.rs | |||
@@ -9,7 +9,7 @@ use hir_expand::{ | |||
9 | }; | 9 | }; |
10 | use ra_prof::profile; | 10 | use ra_prof::profile; |
11 | use ra_syntax::ast::{ | 11 | use ra_syntax::ast::{ |
12 | self, AstNode, ImplItem, ModuleItemOwner, NameOwner, TypeAscriptionOwner, TypeBoundsOwner, | 12 | self, AssocItem, AstNode, ModuleItemOwner, NameOwner, TypeAscriptionOwner, TypeBoundsOwner, |
13 | VisibilityOwner, | 13 | VisibilityOwner, |
14 | }; | 14 | }; |
15 | 15 | ||
@@ -150,51 +150,31 @@ pub struct TraitData { | |||
150 | 150 | ||
151 | impl TraitData { | 151 | impl TraitData { |
152 | pub(crate) fn trait_data_query(db: &dyn DefDatabase, tr: TraitId) -> Arc<TraitData> { | 152 | pub(crate) fn trait_data_query(db: &dyn DefDatabase, tr: TraitId) -> Arc<TraitData> { |
153 | let src = tr.lookup(db).source(db); | 153 | let tr_loc = tr.lookup(db); |
154 | let src = tr_loc.source(db); | ||
154 | let name = src.value.name().map_or_else(Name::missing, |n| n.as_name()); | 155 | let name = src.value.name().map_or_else(Name::missing, |n| n.as_name()); |
155 | let auto = src.value.auto_token().is_some(); | 156 | let auto = src.value.auto_token().is_some(); |
156 | let ast_id_map = db.ast_id_map(src.file_id); | 157 | let module_id = tr_loc.container.module(db); |
157 | 158 | ||
158 | let container = AssocContainerId::TraitId(tr); | 159 | let container = AssocContainerId::TraitId(tr); |
159 | let items = if let Some(item_list) = src.value.item_list() { | 160 | let mut items = Vec::new(); |
160 | item_list | 161 | |
161 | .impl_items() | 162 | if let Some(item_list) = src.value.item_list() { |
162 | .map(|item_node| match item_node { | 163 | let mut expander = Expander::new(db, tr_loc.ast_id.file_id, module_id); |
163 | ast::ImplItem::FnDef(it) => { | 164 | items.extend(collect_items( |
164 | let name = it.name().map_or_else(Name::missing, |it| it.as_name()); | 165 | db, |
165 | let def = FunctionLoc { | 166 | &mut expander, |
166 | container, | 167 | item_list.assoc_items(), |
167 | ast_id: AstId::new(src.file_id, ast_id_map.ast_id(&it)), | 168 | src.file_id, |
168 | } | 169 | container, |
169 | .intern(db) | 170 | )); |
170 | .into(); | 171 | items.extend(collect_items_in_macros( |
171 | (name, def) | 172 | db, |
172 | } | 173 | &mut expander, |
173 | ast::ImplItem::ConstDef(it) => { | 174 | &src.with_value(item_list), |
174 | let name = it.name().map_or_else(Name::missing, |it| it.as_name()); | 175 | container, |
175 | let def = ConstLoc { | 176 | )); |
176 | container, | 177 | } |
177 | ast_id: AstId::new(src.file_id, ast_id_map.ast_id(&it)), | ||
178 | } | ||
179 | .intern(db) | ||
180 | .into(); | ||
181 | (name, def) | ||
182 | } | ||
183 | ast::ImplItem::TypeAliasDef(it) => { | ||
184 | let name = it.name().map_or_else(Name::missing, |it| it.as_name()); | ||
185 | let def = TypeAliasLoc { | ||
186 | container, | ||
187 | ast_id: AstId::new(src.file_id, ast_id_map.ast_id(&it)), | ||
188 | } | ||
189 | .intern(db) | ||
190 | .into(); | ||
191 | (name, def) | ||
192 | } | ||
193 | }) | ||
194 | .collect() | ||
195 | } else { | ||
196 | Vec::new() | ||
197 | }; | ||
198 | Arc::new(TraitData { name, items, auto }) | 178 | Arc::new(TraitData { name, items, auto }) |
199 | } | 179 | } |
200 | 180 | ||
@@ -232,24 +212,22 @@ impl ImplData { | |||
232 | let target_type = TypeRef::from_ast_opt(&lower_ctx, src.value.target_type()); | 212 | let target_type = TypeRef::from_ast_opt(&lower_ctx, src.value.target_type()); |
233 | let is_negative = src.value.excl_token().is_some(); | 213 | let is_negative = src.value.excl_token().is_some(); |
234 | let module_id = impl_loc.container.module(db); | 214 | let module_id = impl_loc.container.module(db); |
215 | let container = AssocContainerId::ImplId(id); | ||
235 | 216 | ||
236 | let mut items = Vec::new(); | 217 | let mut items: Vec<AssocItemId> = Vec::new(); |
237 | 218 | ||
238 | if let Some(item_list) = src.value.item_list() { | 219 | if let Some(item_list) = src.value.item_list() { |
239 | let mut expander = Expander::new(db, impl_loc.ast_id.file_id, module_id); | 220 | let mut expander = Expander::new(db, impl_loc.ast_id.file_id, module_id); |
240 | items.extend(collect_impl_items( | 221 | items.extend( |
241 | db, | 222 | collect_items(db, &mut expander, item_list.assoc_items(), src.file_id, container) |
242 | &mut expander, | 223 | .into_iter() |
243 | item_list.impl_items(), | 224 | .map(|(_, item)| item), |
244 | src.file_id, | 225 | ); |
245 | id, | 226 | items.extend( |
246 | )); | 227 | collect_items_in_macros(db, &mut expander, &src.with_value(item_list), container) |
247 | items.extend(collect_impl_items_in_macros( | 228 | .into_iter() |
248 | db, | 229 | .map(|(_, item)| item), |
249 | &mut expander, | 230 | ); |
250 | &src.with_value(item_list), | ||
251 | id, | ||
252 | )); | ||
253 | } | 231 | } |
254 | 232 | ||
255 | let res = ImplData { target_trait, target_type, items, is_negative }; | 233 | let res = ImplData { target_trait, target_type, items, is_negative }; |
@@ -273,11 +251,6 @@ impl ConstData { | |||
273 | Arc::new(ConstData::new(db, vis_default, node)) | 251 | Arc::new(ConstData::new(db, vis_default, node)) |
274 | } | 252 | } |
275 | 253 | ||
276 | pub(crate) fn static_data_query(db: &dyn DefDatabase, konst: StaticId) -> Arc<ConstData> { | ||
277 | let node = konst.lookup(db).source(db); | ||
278 | Arc::new(ConstData::new(db, RawVisibility::private(), node)) | ||
279 | } | ||
280 | |||
281 | fn new<N: NameOwner + TypeAscriptionOwner + VisibilityOwner>( | 254 | fn new<N: NameOwner + TypeAscriptionOwner + VisibilityOwner>( |
282 | db: &dyn DefDatabase, | 255 | db: &dyn DefDatabase, |
283 | vis_default: RawVisibility, | 256 | vis_default: RawVisibility, |
@@ -292,49 +265,76 @@ impl ConstData { | |||
292 | } | 265 | } |
293 | } | 266 | } |
294 | 267 | ||
295 | fn collect_impl_items_in_macros( | 268 | #[derive(Debug, Clone, PartialEq, Eq)] |
269 | pub struct StaticData { | ||
270 | pub name: Option<Name>, | ||
271 | pub type_ref: TypeRef, | ||
272 | pub visibility: RawVisibility, | ||
273 | pub mutable: bool, | ||
274 | } | ||
275 | |||
276 | impl StaticData { | ||
277 | pub(crate) fn static_data_query(db: &dyn DefDatabase, konst: StaticId) -> Arc<StaticData> { | ||
278 | let node = konst.lookup(db).source(db); | ||
279 | let ctx = LowerCtx::new(db, node.file_id); | ||
280 | |||
281 | let name = node.value.name().map(|n| n.as_name()); | ||
282 | let type_ref = TypeRef::from_ast_opt(&ctx, node.value.ascribed_type()); | ||
283 | let mutable = node.value.mut_token().is_some(); | ||
284 | let visibility = RawVisibility::from_ast_with_default( | ||
285 | db, | ||
286 | RawVisibility::private(), | ||
287 | node.map(|n| n.visibility()), | ||
288 | ); | ||
289 | |||
290 | Arc::new(StaticData { name, type_ref, visibility, mutable }) | ||
291 | } | ||
292 | } | ||
293 | |||
294 | fn collect_items_in_macros( | ||
296 | db: &dyn DefDatabase, | 295 | db: &dyn DefDatabase, |
297 | expander: &mut Expander, | 296 | expander: &mut Expander, |
298 | impl_def: &InFile<ast::ItemList>, | 297 | impl_def: &InFile<ast::ItemList>, |
299 | id: ImplId, | 298 | container: AssocContainerId, |
300 | ) -> Vec<AssocItemId> { | 299 | ) -> Vec<(Name, AssocItemId)> { |
301 | let mut res = Vec::new(); | 300 | let mut res = Vec::new(); |
302 | 301 | ||
303 | // We set a limit to protect against infinite recursion | 302 | // We set a limit to protect against infinite recursion |
304 | let limit = 100; | 303 | let limit = 100; |
305 | 304 | ||
306 | for m in impl_def.value.syntax().children().filter_map(ast::MacroCall::cast) { | 305 | for m in impl_def.value.syntax().children().filter_map(ast::MacroCall::cast) { |
307 | res.extend(collect_impl_items_in_macro(db, expander, m, id, limit)) | 306 | res.extend(collect_items_in_macro(db, expander, m, container, limit)) |
308 | } | 307 | } |
309 | 308 | ||
310 | res | 309 | res |
311 | } | 310 | } |
312 | 311 | ||
313 | fn collect_impl_items_in_macro( | 312 | fn collect_items_in_macro( |
314 | db: &dyn DefDatabase, | 313 | db: &dyn DefDatabase, |
315 | expander: &mut Expander, | 314 | expander: &mut Expander, |
316 | m: ast::MacroCall, | 315 | m: ast::MacroCall, |
317 | id: ImplId, | 316 | container: AssocContainerId, |
318 | limit: usize, | 317 | limit: usize, |
319 | ) -> Vec<AssocItemId> { | 318 | ) -> Vec<(Name, AssocItemId)> { |
320 | if limit == 0 { | 319 | if limit == 0 { |
321 | return Vec::new(); | 320 | return Vec::new(); |
322 | } | 321 | } |
323 | 322 | ||
324 | if let Some((mark, items)) = expander.enter_expand(db, None, m) { | 323 | if let Some((mark, items)) = expander.enter_expand(db, None, m) { |
325 | let items: InFile<ast::MacroItems> = expander.to_source(items); | 324 | let items: InFile<ast::MacroItems> = expander.to_source(items); |
326 | let mut res = collect_impl_items( | 325 | let mut res = collect_items( |
327 | db, | 326 | db, |
328 | expander, | 327 | expander, |
329 | items.value.items().filter_map(|it| ImplItem::cast(it.syntax().clone())), | 328 | items.value.items().filter_map(|it| AssocItem::cast(it.syntax().clone())), |
330 | items.file_id, | 329 | items.file_id, |
331 | id, | 330 | container, |
332 | ); | 331 | ); |
332 | |||
333 | // Recursive collect macros | 333 | // Recursive collect macros |
334 | // Note that ast::ModuleItem do not include ast::MacroCall | 334 | // Note that ast::ModuleItem do not include ast::MacroCall |
335 | // We cannot use ModuleItemOwner::items here | 335 | // We cannot use ModuleItemOwner::items here |
336 | for it in items.value.syntax().children().filter_map(ast::MacroCall::cast) { | 336 | for it in items.value.syntax().children().filter_map(ast::MacroCall::cast) { |
337 | res.extend(collect_impl_items_in_macro(db, expander, it, id, limit - 1)) | 337 | res.extend(collect_items_in_macro(db, expander, it, container, limit - 1)) |
338 | } | 338 | } |
339 | expander.exit(db, mark); | 339 | expander.exit(db, mark); |
340 | res | 340 | res |
@@ -343,44 +343,38 @@ fn collect_impl_items_in_macro( | |||
343 | } | 343 | } |
344 | } | 344 | } |
345 | 345 | ||
346 | fn collect_impl_items( | 346 | fn collect_items( |
347 | db: &dyn DefDatabase, | 347 | db: &dyn DefDatabase, |
348 | expander: &mut Expander, | 348 | expander: &mut Expander, |
349 | impl_items: impl Iterator<Item = ImplItem>, | 349 | assoc_items: impl Iterator<Item = AssocItem>, |
350 | file_id: crate::HirFileId, | 350 | file_id: crate::HirFileId, |
351 | id: ImplId, | 351 | container: AssocContainerId, |
352 | ) -> Vec<AssocItemId> { | 352 | ) -> Vec<(Name, AssocItemId)> { |
353 | let items = db.ast_id_map(file_id); | 353 | let items = db.ast_id_map(file_id); |
354 | 354 | ||
355 | impl_items | 355 | assoc_items |
356 | .filter_map(|item_node| match item_node { | 356 | .filter_map(|item_node| match item_node { |
357 | ast::ImplItem::FnDef(it) => { | 357 | ast::AssocItem::FnDef(it) => { |
358 | let attrs = expander.parse_attrs(&it); | 358 | let name = it.name().map_or_else(Name::missing, |it| it.as_name()); |
359 | if !expander.is_cfg_enabled(&attrs) { | 359 | if !expander.is_cfg_enabled(&it) { |
360 | return None; | 360 | return None; |
361 | } | 361 | } |
362 | let def = FunctionLoc { | 362 | let def = FunctionLoc { container, ast_id: AstId::new(file_id, items.ast_id(&it)) } |
363 | container: AssocContainerId::ImplId(id), | 363 | .intern(db); |
364 | ast_id: AstId::new(file_id, items.ast_id(&it)), | 364 | Some((name, def.into())) |
365 | } | ||
366 | .intern(db); | ||
367 | Some(def.into()) | ||
368 | } | 365 | } |
369 | ast::ImplItem::ConstDef(it) => { | 366 | ast::AssocItem::ConstDef(it) => { |
370 | let def = ConstLoc { | 367 | let name = it.name().map_or_else(Name::missing, |it| it.as_name()); |
371 | container: AssocContainerId::ImplId(id), | 368 | let def = ConstLoc { container, ast_id: AstId::new(file_id, items.ast_id(&it)) } |
372 | ast_id: AstId::new(file_id, items.ast_id(&it)), | 369 | .intern(db); |
373 | } | 370 | Some((name, def.into())) |
374 | .intern(db); | ||
375 | Some(def.into()) | ||
376 | } | 371 | } |
377 | ast::ImplItem::TypeAliasDef(it) => { | 372 | ast::AssocItem::TypeAliasDef(it) => { |
378 | let def = TypeAliasLoc { | 373 | let name = it.name().map_or_else(Name::missing, |it| it.as_name()); |
379 | container: AssocContainerId::ImplId(id), | 374 | let def = |
380 | ast_id: AstId::new(file_id, items.ast_id(&it)), | 375 | TypeAliasLoc { container, ast_id: AstId::new(file_id, items.ast_id(&it)) } |
381 | } | 376 | .intern(db); |
382 | .intern(db); | 377 | Some((name, def.into())) |
383 | Some(def.into()) | ||
384 | } | 378 | } |
385 | }) | 379 | }) |
386 | .collect() | 380 | .collect() |