Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Give unmerge_use a label explaining what it will affect. #15621

Merged
merged 1 commit into from
Sep 20, 2023
Merged

Give unmerge_use a label explaining what it will affect. #15621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 18 additions & 22 deletions crates/ide-assists/src/handlers/unmerge_use.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,29 +36,25 @@ pub(crate) fn unmerge_use(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<
let old_parent_range = use_.syntax().parent()?.text_range();
let new_parent = use_.syntax().parent()?;

// If possible, explain what is going to be done.
let label = match tree.path().and_then(|path| path.first_segment()) {
Some(name) => format!("Unmerge use of `{name}`"),
None => "Unmerge use".into(),
};

let target = tree.syntax().text_range();
acc.add(
AssistId("unmerge_use", AssistKind::RefactorRewrite),
"Unmerge use",
target,
|builder| {
let new_use = make::use_(
use_.visibility(),
make::use_tree(
path,
tree.use_tree_list(),
tree.rename(),
tree.star_token().is_some(),
),
)
.clone_for_update();

tree.remove();
ted::insert(Position::after(use_.syntax()), new_use.syntax());

builder.replace(old_parent_range, new_parent.to_string());
},
)
acc.add(AssistId("unmerge_use", AssistKind::RefactorRewrite), label, target, |builder| {
let new_use = make::use_(
use_.visibility(),
make::use_tree(path, tree.use_tree_list(), tree.rename(), tree.star_token().is_some()),
)
.clone_for_update();

tree.remove();
ted::insert(Position::after(use_.syntax()), new_use.syntax());

builder.replace(old_parent_range, new_parent.to_string());
})
}

fn resolve_full_path(tree: &ast::UseTree) -> Option<ast::Path> {
Expand Down