aboutsummaryrefslogtreecommitdiff
path: root/crates/ide_db/src
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-06-11 18:33:34 +0100
committerGitHub <[email protected]>2021-06-11 18:33:34 +0100
commit21d441623574e5d5ffa2d8f1add7582c7231e109 (patch)
tree032d077edef18ae5cda7ae3c30bec8980a46de05 /crates/ide_db/src
parent6ac3e666b7c62a9097d10c52636cfe75e7851806 (diff)
parent48f65b3b157a5b974be6252dd8fc9ffc158d4217 (diff)
Merge #9218
9218: Item search now respects trait impl items r=Veykril a=Veykril Fixes #2977 Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/ide_db/src')
-rw-r--r--crates/ide_db/src/search.rs47
1 files changed, 37 insertions, 10 deletions
diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs
index 67840602b..8152630f5 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -8,7 +8,8 @@ use std::{convert::TryInto, mem};
8 8
9use base_db::{FileId, FileRange, SourceDatabase, SourceDatabaseExt}; 9use base_db::{FileId, FileRange, SourceDatabase, SourceDatabaseExt};
10use hir::{ 10use hir::{
11 DefWithBody, HasAttrs, HasSource, InFile, ModuleDef, ModuleSource, Semantics, Visibility, 11 AsAssocItem, DefWithBody, HasAttrs, HasSource, InFile, ModuleDef, ModuleSource, Semantics,
12 Visibility,
12}; 13};
13use once_cell::unsync::Lazy; 14use once_cell::unsync::Lazy;
14use rustc_hash::FxHashMap; 15use rustc_hash::FxHashMap;
@@ -303,13 +304,13 @@ impl Definition {
303 } 304 }
304 } 305 }
305 306
306 pub fn usages<'a>(&'a self, sema: &'a Semantics<RootDatabase>) -> FindUsages<'a> { 307 pub fn usages<'a>(self, sema: &'a Semantics<RootDatabase>) -> FindUsages<'a> {
307 FindUsages { def: self, sema, scope: None, include_self_kw_refs: None } 308 FindUsages { def: self, sema, scope: None, include_self_kw_refs: None }
308 } 309 }
309} 310}
310 311
311pub struct FindUsages<'a> { 312pub struct FindUsages<'a> {
312 def: &'a Definition, 313 def: Definition,
313 sema: &'a Semantics<'a, RootDatabase>, 314 sema: &'a Semantics<'a, RootDatabase>,
314 scope: Option<SearchScope>, 315 scope: Option<SearchScope>,
315 include_self_kw_refs: Option<hir::Type>, 316 include_self_kw_refs: Option<hir::Type>,
@@ -318,7 +319,7 @@ pub struct FindUsages<'a> {
318impl<'a> FindUsages<'a> { 319impl<'a> FindUsages<'a> {
319 /// Enable searching for `Self` when the definition is a type. 320 /// Enable searching for `Self` when the definition is a type.
320 pub fn include_self_refs(mut self) -> FindUsages<'a> { 321 pub fn include_self_refs(mut self) -> FindUsages<'a> {
321 self.include_self_kw_refs = def_to_ty(self.sema, self.def); 322 self.include_self_kw_refs = def_to_ty(self.sema, &self.def);
322 self 323 self
323 } 324 }
324 325
@@ -445,7 +446,7 @@ impl<'a> FindUsages<'a> {
445 sink: &mut dyn FnMut(FileId, FileReference) -> bool, 446 sink: &mut dyn FnMut(FileId, FileReference) -> bool,
446 ) -> bool { 447 ) -> bool {
447 match NameRefClass::classify_lifetime(self.sema, lifetime) { 448 match NameRefClass::classify_lifetime(self.sema, lifetime) {
448 Some(NameRefClass::Definition(def)) if &def == self.def => { 449 Some(NameRefClass::Definition(def)) if def == self.def => {
449 let FileRange { file_id, range } = self.sema.original_range(lifetime.syntax()); 450 let FileRange { file_id, range } = self.sema.original_range(lifetime.syntax());
450 let reference = FileReference { 451 let reference = FileReference {
451 range, 452 range,
@@ -464,7 +465,7 @@ impl<'a> FindUsages<'a> {
464 sink: &mut dyn FnMut(FileId, FileReference) -> bool, 465 sink: &mut dyn FnMut(FileId, FileReference) -> bool,
465 ) -> bool { 466 ) -> bool {
466 match NameRefClass::classify(self.sema, &name_ref) { 467 match NameRefClass::classify(self.sema, &name_ref) {
467 Some(NameRefClass::Definition(def)) if &def == self.def => { 468 Some(NameRefClass::Definition(def)) if def == self.def => {
468 let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax()); 469 let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax());
469 let reference = FileReference { 470 let reference = FileReference {
470 range, 471 range,
@@ -489,10 +490,10 @@ impl<'a> FindUsages<'a> {
489 Some(NameRefClass::FieldShorthand { local_ref: local, field_ref: field }) => { 490 Some(NameRefClass::FieldShorthand { local_ref: local, field_ref: field }) => {
490 let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax()); 491 let FileRange { file_id, range } = self.sema.original_range(name_ref.syntax());
491 let access = match self.def { 492 let access = match self.def {
492 Definition::Field(_) if &field == self.def => { 493 Definition::Field(_) if field == self.def => {
493 reference_access(&field, &name_ref) 494 reference_access(&field, &name_ref)
494 } 495 }
495 Definition::Local(l) if &local == l => { 496 Definition::Local(l) if local == l => {
496 reference_access(&Definition::Local(local), &name_ref) 497 reference_access(&Definition::Local(local), &name_ref)
497 } 498 }
498 _ => return false, 499 _ => return false,
@@ -513,7 +514,7 @@ impl<'a> FindUsages<'a> {
513 match NameClass::classify(self.sema, name) { 514 match NameClass::classify(self.sema, name) {
514 Some(NameClass::PatFieldShorthand { local_def: _, field_ref }) 515 Some(NameClass::PatFieldShorthand { local_def: _, field_ref })
515 if matches!( 516 if matches!(
516 self.def, Definition::Field(_) if &field_ref == self.def 517 self.def, Definition::Field(_) if field_ref == self.def
517 ) => 518 ) =>
518 { 519 {
519 let FileRange { file_id, range } = self.sema.original_range(name.syntax()); 520 let FileRange { file_id, range } = self.sema.original_range(name.syntax());
@@ -525,12 +526,38 @@ impl<'a> FindUsages<'a> {
525 }; 526 };
526 sink(file_id, reference) 527 sink(file_id, reference)
527 } 528 }
528 Some(NameClass::ConstReference(def)) if *self.def == def => { 529 Some(NameClass::ConstReference(def)) if self.def == def => {
529 let FileRange { file_id, range } = self.sema.original_range(name.syntax()); 530 let FileRange { file_id, range } = self.sema.original_range(name.syntax());
530 let reference = 531 let reference =
531 FileReference { range, name: ast::NameLike::Name(name.clone()), access: None }; 532 FileReference { range, name: ast::NameLike::Name(name.clone()), access: None };
532 sink(file_id, reference) 533 sink(file_id, reference)
533 } 534 }
535 // Resolve trait impl function definitions to the trait definition's version if self.def is the trait definition's
536 Some(NameClass::Definition(Definition::ModuleDef(mod_def))) => {
537 /* poor man's try block */
538 (|| {
539 let this = match self.def {
540 Definition::ModuleDef(this) if this != mod_def => this,
541 _ => return None,
542 };
543 let this_trait = this
544 .as_assoc_item(self.sema.db)?
545 .containing_trait_or_trait_impl(self.sema.db)?;
546 let trait_ = mod_def
547 .as_assoc_item(self.sema.db)?
548 .containing_trait_or_trait_impl(self.sema.db)?;
549 (trait_ == this_trait).then(|| {
550 let FileRange { file_id, range } = self.sema.original_range(name.syntax());
551 let reference = FileReference {
552 range,
553 name: ast::NameLike::Name(name.clone()),
554 access: None,
555 };
556 sink(file_id, reference)
557 })
558 })()
559 .unwrap_or(false)
560 }
534 _ => false, 561 _ => false,
535 } 562 }
536 } 563 }