mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: donot generate redundant use stmt for items in selection in extract_module

Browse Source
This commit is contained in:
roife 2024-03-14 15:18:31 +08:00
parent 9c8a57ed08
commit 418056597b
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/ide-assists/src/handlers/extract_module.rs
View File

@ -462,7 +462,7 @@ fn process_def_in_sel(
} }
} }
let def_in_mod_and_out_sel = let (def_in_mod, def_out_sel) =
check_def_in_mod_and_out_sel(def, ctx, curr_parent_module, selection_range, file_id); check_def_in_mod_and_out_sel(def, ctx, curr_parent_module, selection_range, file_id);
// Find use stmt that use def in current file // Find use stmt that use def in current file
@ -493,9 +493,9 @@ fn process_def_in_sel(
//If not, insert a use stmt with super and the given nameref //If not, insert a use stmt with super and the given nameref
match self.process_use_stmt_for_import_resolve(use_stmt, node_syntax) { match self.process_use_stmt_for_import_resolve(use_stmt, node_syntax) {
Some((use_tree_str, _)) => use_tree_str_opt = Some(use_tree_str), Some((use_tree_str, _)) => use_tree_str_opt = Some(use_tree_str),
None if def_in_mod_and_out_sel => { None if def_in_mod && def_out_sel => {
//Considered only after use_stmt is not present //Considered only after use_stmt is not present
//def_in_mod_and_out_sel | exists_outside_sel(exists_inside_sel = //def_in_mod && def_out_sel | exists_outside_sel(exists_inside_sel =
//true for all cases) //true for all cases)
// false | false -> Do nothing // false | false -> Do nothing
// false | true -> If source is in selection -> nothing to do, If source is outside // false | true -> If source is in selection -> nothing to do, If source is outside
@ -516,7 +516,7 @@ fn process_def_in_sel(
import_path_to_be_removed = Some(text_range); import_path_to_be_removed = Some(text_range);
} }
if def_in_mod_and_out_sel { if def_in_mod && def_out_sel {
if let Some(first_path_in_use_tree) = use_tree_str.last() { if let Some(first_path_in_use_tree) = use_tree_str.last() {
let first_path_in_use_tree_str = first_path_in_use_tree.to_string(); let first_path_in_use_tree_str = first_path_in_use_tree.to_string();
if !first_path_in_use_tree_str.contains("super") if !first_path_in_use_tree_str.contains("super")
@ -529,7 +529,7 @@ fn process_def_in_sel(
} }
use_tree_str_opt = Some(use_tree_str); use_tree_str_opt = Some(use_tree_str);
} else if def_in_mod_and_out_sel { } else if def_in_mod && def_out_sel {
self.make_use_stmt_of_node_with_super(node_syntax); self.make_use_stmt_of_node_with_super(node_syntax);
} }
} }
@ -538,7 +538,7 @@ fn process_def_in_sel(
let mut use_tree_str = use_tree_str; let mut use_tree_str = use_tree_str;
use_tree_str.reverse(); use_tree_str.reverse();
if exists_outside_sel || !exists_inside_sel || !def_in_mod_and_out_sel { if exists_outside_sel || !exists_inside_sel || !def_in_mod || !def_out_sel {
if let Some(first_path_in_use_tree) = use_tree_str.first() { if let Some(first_path_in_use_tree) = use_tree_str.first() {
if first_path_in_use_tree.to_string().contains("super") { if first_path_in_use_tree.to_string().contains("super") {
use_tree_str.insert(0, make::ext::ident_path("super")); use_tree_str.insert(0, make::ext::ident_path("super"));
@ -549,7 +549,10 @@ fn process_def_in_sel(
let use_ = let use_ =
make::use_(None, make::use_tree(make::join_paths(use_tree_str), None, None, false)); make::use_(None, make::use_tree(make::join_paths(use_tree_str), None, None, false));
let item = ast::Item::from(use_); let item = ast::Item::from(use_);
self.use_items.insert(0, item);
if def_out_sel {
self.use_items.insert(0, item.clone());
}
} }
import_path_to_be_removed import_path_to_be_removed
@ -624,7 +627,7 @@ fn check_def_in_mod_and_out_sel(
curr_parent_module: &Option<ast::Module>, curr_parent_module: &Option<ast::Module>,
selection_range: TextRange, selection_range: TextRange,
curr_file_id: FileId, curr_file_id: FileId,
) -> bool { ) -> (bool, bool) {
macro_rules! check_item { macro_rules! check_item {
($x:ident) => { ($x:ident) => {
if let Some(source) = $x.source(ctx.db()) { if let Some(source) = $x.source(ctx.db()) {
@ -634,9 +637,8 @@ macro_rules! check_item {
source.file_id.original_file(ctx.db()) == curr_file_id source.file_id.original_file(ctx.db()) == curr_file_id
}; };
if have_same_parent { let in_sel = !selection_range.contains_range(source.value.syntax().text_range());
return !selection_range.contains_range(source.value.syntax().text_range()); return (have_same_parent, in_sel);
}
} }
}; };
} }
@ -653,9 +655,12 @@ macro_rules! check_item {
if have_same_parent { if have_same_parent {
if let ModuleSource::Module(module_) = source.value { if let ModuleSource::Module(module_) = source.value {
return !selection_range.contains_range(module_.syntax().text_range()); let in_sel = !selection_range.contains_range(module_.syntax().text_range());
return (have_same_parent, in_sel);
} }
} }
return (have_same_parent, false);
} }
Definition::Function(x) => check_item!(x), Definition::Function(x) => check_item!(x),
Definition::Adt(x) => check_item!(x), Definition::Adt(x) => check_item!(x),
@ -667,7 +672,7 @@ macro_rules! check_item {
_ => {} _ => {}
} }
false (false, false)
} }
fn get_replacements_for_visibility_change( fn get_replacements_for_visibility_change(