Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions crates/ide-assists/src/handlers/merge_imports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext<'_>) -> Optio
SyntaxElement::Node(n) => n,
SyntaxElement::Token(t) => t.parent()?,
};
let mut selected_nodes =
parent_node.children().filter(|it| selection_range.contains_range(it.text_range()));
let mut selected_nodes = parent_node.children().filter(|it| {
selection_range.intersect(it.text_range()).is_some_and(|it| !it.is_empty())
});

let first_selected = selected_nodes.next()?;
let edits = match_ast! {
Expand Down Expand Up @@ -677,6 +678,25 @@ use std::fmt::Result;
);
}

#[test]
fn merge_partial_selection_uses() {
cov_mark::check!(merge_with_selected_use_item_neighbors);
check_assist(
merge_imports,
r"
use std::fmt::Error;
$0use std::fmt::Display;
use std::fmt::Debug;
use std::fmt::Write;
use$0 std::fmt::Result;
",
r"
use std::fmt::Error;
use std::fmt::{Debug, Display, Result, Write};
",
);
}

#[test]
fn merge_selection_use_trees() {
cov_mark::check!(merge_with_selected_use_tree_neighbors);
Expand Down
Loading