Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 21:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify mod completion

Browse source
This commit is contained in:
Lukas Wirth 2021-01-07 23:33:52 +01:00
parent ca6db58762
commit 6dca2cbba5
1 changed files with 31 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
crates/completion/src/completions/mod_.rs
View file

@ -1,5 +1,7 @@
//! Completes mod declarations. //! Completes mod declarations.
use std::iter;
use hir::{Module, ModuleSource}; use hir::{Module, ModuleSource};
use ide_db::base_db::{SourceDatabaseExt, VfsPath}; use ide_db::base_db::{SourceDatabaseExt, VfsPath};
use ide_db::RootDatabase; use ide_db::RootDatabase;
@ -12,9 +14,8 @@ use crate::{context::CompletionContext, item::CompletionKind, Completions};
/// Complete mod declaration, i.e. `mod $0 ;` /// Complete mod declaration, i.e. `mod $0 ;`
pub(crate) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> { pub(crate) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Option<()> {
let mod_under_caret = match &ctx.mod_declaration_under_caret { let mod_under_caret = match &ctx.mod_declaration_under_caret {
Some(mod_under_caret) if mod_under_caret.item_list().is_some() => return None, Some(mod_under_caret) if mod_under_caret.item_list().is_none() => mod_under_caret,
Some(mod_under_caret) => mod_under_caret, _ => return None,
None => return None,
}; };
let _p = profile::span("completion::complete_mod"); let _p = profile::span("completion::complete_mod");
@ -49,9 +50,13 @@ pub(crate) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Op
.filter_map(|submodule_file| { .filter_map(|submodule_file| {
let submodule_path = source_root.path_for_file(&submodule_file)?; let submodule_path = source_root.path_for_file(&submodule_file)?;
let directory_with_submodule = submodule_path.parent()?; let directory_with_submodule = submodule_path.parent()?;
match submodule_path.name_and_extension()? { let (name, ext) = submodule_path.name_and_extension()?;
("lib", Some("rs")) | ("main", Some("rs")) => None, if ext != Some("rs") {
("mod", Some("rs")) => { return None;
}
match name {
"lib" | "main" => None,
"mod" => {
if directory_with_submodule.parent()? == directory_to_look_for_submodules { if directory_with_submodule.parent()? == directory_to_look_for_submodules {
match directory_with_submodule.name_and_extension()? { match directory_with_submodule.name_and_extension()? {
(directory_name, None) => Some(directory_name.to_owned()), (directory_name, None) => Some(directory_name.to_owned()),
@ -61,9 +66,7 @@ pub(crate) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Op
None None
} }
} }
(file_name, Some("rs")) file_name if directory_with_submodule == directory_to_look_for_submodules => {
if directory_with_submodule == directory_to_look_for_submodules =>
{
Some(file_name.to_owned()) Some(file_name.to_owned())
} }
_ => None, _ => None,
@ -73,7 +76,7 @@ pub(crate) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Op
.for_each(|submodule_name| { .for_each(|submodule_name| {
let mut label = submodule_name; let mut label = submodule_name;
if mod_under_caret.semicolon_token().is_none() { if mod_under_caret.semicolon_token().is_none() {
label.push(';') label.push(';');
} }
CompletionItem::new(CompletionKind::Magic, ctx.source_range(), &label) CompletionItem::new(CompletionKind::Magic, ctx.source_range(), &label)
.kind(CompletionItemKind::Module) .kind(CompletionItemKind::Module)
@ -89,11 +92,13 @@ fn directory_to_look_for_submodules(
module_file_path: &VfsPath, module_file_path: &VfsPath,
) -> Option<VfsPath> { ) -> Option<VfsPath> {
let directory_with_module_path = module_file_path.parent()?; let directory_with_module_path = module_file_path.parent()?;
let base_directory = match module_file_path.name_and_extension()? { let (name, ext) = module_file_path.name_and_extension()?;
("mod", Some("rs")) | ("lib", Some("rs")) | ("main", Some("rs")) => { if ext != Some("rs") {
Some(directory_with_module_path) return None;
} }
(regular_rust_file_name, Some("rs")) => { let base_directory = match name {
"mod" | "lib" | "main" => Some(directory_with_module_path),
regular_rust_file_name => {
if matches!( if matches!(
( (
directory_with_module_path directory_with_module_path
@ -110,37 +115,25 @@ fn directory_to_look_for_submodules(
directory_with_module_path.join(regular_rust_file_name) directory_with_module_path.join(regular_rust_file_name)
} }
} }
_ => None,
}?; }?;
let mut resulting_path = base_directory; module_chain_to_containing_module_file(module, db)
for module in module_chain_to_containing_module_file(module, db) { .into_iter()
if let Some(name) = module.name(db) { .filter_map(|module| module.name(db))
resulting_path = resulting_path.join(&name.to_string())?; .try_fold(base_directory, |path, name| path.join(&name.to_string()))
}
}
Some(resulting_path)
} }
fn module_chain_to_containing_module_file( fn module_chain_to_containing_module_file(
current_module: Module, current_module: Module,
db: &RootDatabase, db: &RootDatabase,
) -> Vec<Module> { ) -> Vec<Module> {
let mut path = Vec::new(); let mut path =
iter::successors(Some(current_module), |current_module| current_module.parent(db))
let mut current_module = Some(current_module); .take_while(|current_module| {
while let Some(ModuleSource::Module(_)) = matches!(current_module.definition_source(db).value, ModuleSource::Module(_))
current_module.map(|module| module.definition_source(db).value) })
{ .collect::<Vec<_>>();
if let Some(module) = current_module { path.reverse();
path.insert(0, module);
current_module = module.parent(db);
} else {
current_module = None;
}
}
path path
} }