language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-28 10:39:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

internal: rename children_modules to child_modules

Browse source
This commit is contained in:
David Barsky 2025-04-09 12:03:32 -04:00
parent a05564370d
commit 99a2b676bc
11 changed files with 45 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/ide/src/children_modules.rs → crates/ide/src/child_modules.rs
View file

@ -7,16 +7,16 @@ use syntax::{
use crate::NavigationTarget;
// Feature: Children Modules
// Feature: Child Modules
//
// Navigates to the children modules of the current module.
// Navigates to the child modules of the current module.
//
// | Editor | Action Name |
// |---------|-------------|
// | VS Code | **rust-analyzer: Locate children modules** |
// | VS Code | **rust-analyzer: Locate child modules** |
/// This returns `Vec` because a module may be included from several places.
pub(crate) fn children_modules(db: &RootDatabase, position: FilePosition) -> Vec<NavigationTarget> {
pub(crate) fn child_modules(db: &RootDatabase, position: FilePosition) -> Vec<NavigationTarget> {
let sema = Semantics::new(db);
let source_file = sema.parse_guess_edition(position.file_id);
// First go to the parent module which contains the cursor
@ -24,7 +24,7 @@ pub(crate) fn children_modules(db: &RootDatabase, position: FilePosition) -> Vec
match module {
Some(module) => {
// Return all the children module inside the ItemList of the parent module
// Return all child modules inside the ItemList of the parent module
sema.to_def(&module)
.into_iter()
.flat_map(|module| module.children(db))
@ -32,7 +32,7 @@ pub(crate) fn children_modules(db: &RootDatabase, position: FilePosition) -> Vec
.collect()
}
None => {
// Return all the children module inside the source file
// Return all the child modules inside the source file
sema.file_to_module_defs(position.file_id)
.flat_map(|module| module.children(db))
.map(|module| NavigationTarget::from_module_to_decl(db, module).call_site())
@ -47,9 +47,9 @@ mod tests {
use crate::fixture;
fn check_children_module(#[rust_analyzer::rust_fixture] ra_fixture: &str) {
fn check_child_module(#[rust_analyzer::rust_fixture] ra_fixture: &str) {
let (analysis, position, expected) = fixture::annotations(ra_fixture);
let navs = analysis.children_modules(position).unwrap();
let navs = analysis.child_modules(position).unwrap();
let navs = navs
.iter()
.map(|nav| FileRange { file_id: nav.file_id, range: nav.focus_or_full_range() })
@ -58,8 +58,8 @@ mod tests {
}
#[test]
fn test_resolve_children_module() {
check_children_module(
fn test_resolve_child_module() {
check_child_module(
r#"
//- /lib.rs
$0
@ -73,8 +73,8 @@ mod foo;
}
#[test]
fn test_resolve_children_module_on_module_decl() {
check_children_module(
fn test_resolve_child_module_on_module_decl() {
check_child_module(
r#"
//- /lib.rs
mod $0foo;
@ -89,8 +89,8 @@ mod bar;
}
#[test]
fn test_resolve_children_module_for_inline() {
check_children_module(
fn test_resolve_child_module_for_inline() {
check_child_module(
r#"
//- /lib.rs
mod foo {
@ -104,7 +104,7 @@ mod foo {
#[test]
fn test_resolve_multi_child_module() {
check_children_module(
check_child_module(
r#"
//- /main.rs
$0

6
crates/ide/src/lib.rs
View file

@ -20,7 +20,7 @@ mod navigation_target;
mod annotations;
mod call_hierarchy;
mod children_modules;
mod child_modules;
mod doc_links;
mod expand_macro;
mod extend_selection;
@ -607,8 +607,8 @@ impl Analysis {
}
/// Returns vec of `mod name;` declaration which are created by the current module.
pub fn children_modules(&self, position: FilePosition) -> Cancellable<Vec<NavigationTarget>> {
self.with_db(|db| children_modules::children_modules(db, position))
pub fn child_modules(&self, position: FilePosition) -> Cancellable<Vec<NavigationTarget>> {
self.with_db(|db| child_modules::child_modules(db, position))
}
/// Returns crates that this file belongs to.