Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-09-21 06:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge imports when auto importing

Browse source
This commit is contained in:
Kirill Bulatov 2020-02-02 10:28:16 +02:00
parent 96bd4f5704
commit a9669a5505
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
crates/ra_assists/src/assists/auto_import.rs
View file

@ -79,12 +79,8 @@ pub(crate) fn auto_import<F: ImportsLocator>(
fn import_to_action(import: String, position: &SyntaxNode, anchor: &SyntaxNode) -> ActionBuilder {
let mut action_builder = ActionBuilder::default();
action_builder.label(format!("Import `{}`", &import));
auto_import_text_edit(
position,
anchor,
&[SmolStr::new(import)],
action_builder.text_edit_builder(),
);
let import_segments = import.split("::").map(SmolStr::new).collect::<Vec<_>>();
auto_import_text_edit(position, anchor, &import_segments, action_builder.text_edit_builder());
action_builder
}
@ -120,6 +116,34 @@ mod tests {
);
}
#[test]
fn auto_imports_are_merged() {
check_assist_with_imports_locator(
auto_import,
TestImportsLocator::new,
r"
use PubMod::PubStruct1;
PubStruct2<|>
pub mod PubMod {
pub struct PubStruct1;
pub struct PubStruct2;
}
",
r"
use PubMod::{PubStruct2, PubStruct1};
PubStruct2<|>
pub mod PubMod {
pub struct PubStruct1;
pub struct PubStruct2;
}
",
);
}
#[test]
fn applicable_when_found_multiple_imports() {
check_assist_with_imports_locator(