Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Expose find_insert_use_container

Browse source
This commit is contained in:
Jonas Schievink 2020-06-13 18:56:14 +02:00
parent e9eb54c617
commit b65c0a5893
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_assists/src/utils.rs
View file

@ -13,7 +13,7 @@ use rustc_hash::FxHashSet;
use crate::assist_config::SnippetCap;
pub(crate) use insert_use::insert_use_statement;
pub(crate) use insert_use::{find_insert_use_container, insert_use_statement};
#[derive(Clone, Copy, Debug)]
pub(crate) enum Cursor<'a> {

24
crates/ra_assists/src/utils/insert_use.rs
View file

@ -12,6 +12,20 @@ use ra_syntax::{
use ra_text_edit::TextEditBuilder;
use crate::assist_context::AssistContext;
use either::Either;
/// Determines the containing syntax node in which to insert a `use` statement affecting `position`.
pub(crate) fn find_insert_use_container(
position: &SyntaxNode,
ctx: &AssistContext,
) -> Option<Either<ast::ItemList, ast::SourceFile>> {
ctx.sema.ancestors_with_macros(position.clone()).find_map(|n| {
if let Some(module) = ast::Module::cast(n.clone()) {
return module.item_list().map(|it| Either::Left(it));
}
Some(Either::Right(ast::SourceFile::cast(n)?))
})
}
/// Creates and inserts a use statement for the given path to import.
/// The use statement is inserted in the scope most appropriate to the
@ -24,15 +38,11 @@ pub(crate) fn insert_use_statement(
builder: &mut TextEditBuilder,
) {
let target = path_to_import.to_string().split("::").map(SmolStr::new).collect::<Vec<_>>();
let container = ctx.sema.ancestors_with_macros(position.clone()).find_map(|n| {
if let Some(module) = ast::Module::cast(n.clone()) {
return module.item_list().map(|it| it.syntax().clone());
}
ast::SourceFile::cast(n).map(|it| it.syntax().clone())
});
let container = find_insert_use_container(position, ctx);
if let Some(container) = container {
let action = best_action_for_target(container, position.clone(), &target);
let syntax = container.either(|l| l.syntax().clone(), |r| r.syntax().clone());
let action = best_action_for_target(syntax, position.clone(), &target);
make_assist(&action, &target, builder);
}
}