aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-05-31 18:07:37 +0100
committerGitHub <[email protected]>2020-05-31 18:07:37 +0100
commite4bdc1495142a7497a92388570defd519c22dcb1 (patch)
tree63be567a0e5c2f42d71bcdb4281f3390f18b909a
parent9feb15e6a2ab6903769e9ad2d4e7c4006e80c501 (diff)
parentd39cbeef9181ebb5a81dd9aec1a38033bb16da93 (diff)
Merge #4674
4674: Recursively search submodules to find modules in which a definition is visible. r=matklad a=umanwizard Co-authored-by: Brennan Vincent <[email protected]>
-rw-r--r--crates/ra_ide/src/references.rs27
-rw-r--r--crates/ra_ide_db/src/search.rs40
2 files changed, 49 insertions, 18 deletions
diff --git a/crates/ra_ide/src/references.rs b/crates/ra_ide/src/references.rs
index 96444bf6a..bb40d2043 100644
--- a/crates/ra_ide/src/references.rs
+++ b/crates/ra_ide/src/references.rs
@@ -615,6 +615,33 @@ mod tests {
615 ); 615 );
616 } 616 }
617 617
618 #[test]
619 fn test_find_all_refs_nested_module() {
620 let code = r#"
621 //- /lib.rs
622 mod foo {
623 mod bar;
624 }
625
626 fn f<|>() {}
627
628 //- /foo/bar.rs
629 use crate::f;
630
631 fn g() {
632 f();
633 }
634 "#;
635
636 let (analysis, pos) = analysis_and_position(code);
637 let refs = analysis.find_all_refs(pos, None).unwrap().unwrap();
638 check_result(
639 refs,
640 "f FN_DEF FileId(1) 25..34 28..29 Other",
641 &["FileId(2) 11..12 Other", "FileId(2) 27..28 StructLiteral"],
642 );
643 }
644
618 fn get_all_refs(text: &str) -> ReferenceSearchResult { 645 fn get_all_refs(text: &str) -> ReferenceSearchResult {
619 let (analysis, position) = single_file_with_position(text); 646 let (analysis, position) = single_file_with_position(text);
620 analysis.find_all_refs(position, None).unwrap().unwrap() 647 analysis.find_all_refs(position, None).unwrap().unwrap()
diff --git a/crates/ra_ide_db/src/search.rs b/crates/ra_ide_db/src/search.rs
index 589f44771..335a1ad03 100644
--- a/crates/ra_ide_db/src/search.rs
+++ b/crates/ra_ide_db/src/search.rs
@@ -124,29 +124,33 @@ impl Definition {
124 124
125 let vis = self.visibility(db); 125 let vis = self.visibility(db);
126 126
127 // FIXME:
128 // The following logic are wrong that it does not search
129 // for submodules within other files recursively.
130
131 if let Some(Visibility::Module(module)) = vis.and_then(|it| it.into()) { 127 if let Some(Visibility::Module(module)) = vis.and_then(|it| it.into()) {
132 let module: Module = module.into(); 128 let module: Module = module.into();
133 let mut res = FxHashMap::default(); 129 let mut res = FxHashMap::default();
134 let src = module.definition_source(db);
135 let file_id = src.file_id.original_file(db);
136 130
137 match src.value { 131 let mut to_visit = vec![module];
138 ModuleSource::Module(m) => { 132 let mut is_first = true;
139 let range = Some(m.syntax().text_range()); 133 while let Some(module) = to_visit.pop() {
140 res.insert(file_id, range); 134 let src = module.definition_source(db);
141 } 135 let file_id = src.file_id.original_file(db);
142 ModuleSource::SourceFile(_) => { 136 match src.value {
143 res.insert(file_id, None); 137 ModuleSource::Module(m) => {
144 res.extend(module.children(db).map(|m| { 138 if is_first {
145 let src = m.definition_source(db); 139 let range = Some(m.syntax().text_range());
146 (src.file_id.original_file(db), None) 140 res.insert(file_id, range);
147 })); 141 } else {
148 } 142 // We have already added the enclosing file to the search scope,
143 // so do nothing.
144 }
145 }
146 ModuleSource::SourceFile(_) => {
147 res.insert(file_id, None);
148 }
149 };
150 is_first = false;
151 to_visit.extend(module.children(db));
149 } 152 }
153
150 return SearchScope::new(res); 154 return SearchScope::new(res);
151 } 155 }
152 156