language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-30 11:37:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #20385 from Hmikihiro/migrate_expand_glob_import
Some checks are pending
metrics / build_metrics (push) Waiting to run
Details
metrics / other_metrics (diesel-1.4.8) (push) Blocked by required conditions
Details
metrics / other_metrics (hyper-0.14.18) (push) Blocked by required conditions
Details
metrics / other_metrics (ripgrep-13.0.0) (push) Blocked by required conditions
Details
metrics / other_metrics (self) (push) Blocked by required conditions
Details
metrics / other_metrics (webrender-2022) (push) Blocked by required conditions
Details
metrics / generate_final_metrics (push) Blocked by required conditions
Details
rustdoc / rustdoc (push) Waiting to run
Details

Browse source 
Migrate `expand_glob_import` assist to use `SyntaxEditor`
This commit is contained in:
Shoyu Vanilla (Flint) 2025-08-05 09:47:09 +00:00 • committed by GitHub
commit 2e283c1106
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/ide-assists/src/handlers/expand_glob_import.rs
View file

@ -9,7 +9,6 @@ use stdx::never;
use syntax::{ use syntax::{
AstNode, Direction, SyntaxNode, SyntaxToken, T, AstNode, Direction, SyntaxNode, SyntaxToken, T,
ast::{self, Use, UseTree, VisibilityKind, make}, ast::{self, Use, UseTree, VisibilityKind, make},
ted,
}; };
use crate::{ use crate::{
@ -165,8 +164,6 @@ fn build_expanded_import(
let filtered_defs = let filtered_defs =
if reexport_public_items { refs_in_target } else { refs_in_target.used_refs(ctx) }; if reexport_public_items { refs_in_target } else { refs_in_target.used_refs(ctx) };
let use_tree = builder.make_mut(use_tree);
let names_to_import = find_names_to_import(filtered_defs, imported_defs); let names_to_import = find_names_to_import(filtered_defs, imported_defs);
let expanded = make::use_tree_list(names_to_import.iter().map(|n| { let expanded = make::use_tree_list(names_to_import.iter().map(|n| {
let path = make::ext::ident_path( let path = make::ext::ident_path(
@ -176,22 +173,24 @@ fn build_expanded_import(
})) }))
.clone_for_update(); .clone_for_update();
let mut editor = builder.make_editor(use_tree.syntax());
match use_tree.star_token() { match use_tree.star_token() {
Some(star) => { Some(star) => {
let needs_braces = use_tree.path().is_some() && names_to_import.len() != 1; let needs_braces = use_tree.path().is_some() && names_to_import.len() != 1;
if needs_braces { if needs_braces {
ted::replace(star, expanded.syntax()) editor.replace(star, expanded.syntax())
} else { } else {
let without_braces = expanded let without_braces = expanded
.syntax() .syntax()
.children_with_tokens() .children_with_tokens()
.filter(|child| !matches!(child.kind(), T!['{'] | T!['}'])) .filter(|child| !matches!(child.kind(), T!['{'] | T!['}']))
.collect(); .collect();
ted::replace_with_many(star, without_braces) editor.replace_with_many(star, without_braces)
} }
} }
None => never!(), None => never!(),
} }
builder.add_file_edits(ctx.vfs_file_id(), editor);
} }
fn get_export_visibility_kind(use_item: &Use) -> VisibilityKind { fn get_export_visibility_kind(use_item: &Use) -> VisibilityKind {