language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-12-20 07:13:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

minor: add missing SyntaxFactory::assoc_item_list

Browse source
This commit is contained in:
Young-Flash 2025-12-05 20:27:30 +08:00
parent 1a5d1bf56d
commit d5ea35572b
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ide-assists/src/handlers/generate_delegate_trait.rs
View file

@ -296,7 +296,7 @@ fn generate_impl(
.collect() .collect()
}); });
let delegate = finalize_delegate(&delegate, assoc_items, false)?; let delegate = finalize_delegate(&make, &delegate, assoc_items, false)?;
let target_scope = ctx.sema.scope(strukt.strukt.syntax())?; let target_scope = ctx.sema.scope(strukt.strukt.syntax())?;
let source_scope = ctx.sema.scope(bound_def.syntax())?; let source_scope = ctx.sema.scope(bound_def.syntax())?;
@ -406,7 +406,7 @@ fn generate_impl(
.collect() .collect()
}); });
finalize_delegate(&delegate, assoc_items, true) finalize_delegate(&make, &delegate, assoc_items, true)
} }
} }
} }
@ -552,6 +552,7 @@ fn remove_useless_where_clauses(editor: &mut SyntaxEditor, delegate: &ast::Impl)
/// 1. Replacing the assoc_item_list with new items (if any) /// 1. Replacing the assoc_item_list with new items (if any)
/// 2. Removing useless where clauses /// 2. Removing useless where clauses
fn finalize_delegate( fn finalize_delegate(
make: &SyntaxFactory,
delegate: &ast::Impl, delegate: &ast::Impl,
assoc_items: Option<Vec<ast::AssocItem>>, assoc_items: Option<Vec<ast::AssocItem>>,
remove_where_clauses: bool, remove_where_clauses: bool,
@ -568,8 +569,7 @@ fn finalize_delegate(
if let Some(items) = assoc_items if let Some(items) = assoc_items
&& !items.is_empty() && !items.is_empty()
{ {
let new_assoc_item_list = let new_assoc_item_list = make.assoc_item_list(items);
syntax::ast::make::assoc_item_list(Some(items)).clone_for_update();
if let Some(old_list) = delegate.assoc_item_list() { if let Some(old_list) = delegate.assoc_item_list() {
editor.replace(old_list.syntax(), new_assoc_item_list.syntax()); editor.replace(old_list.syntax(), new_assoc_item_list.syntax());
} }

17
crates/syntax/src/ast/syntax_factory/constructors.rs
View file

@ -1454,6 +1454,23 @@ impl SyntaxFactory {
ast ast
} }
pub fn assoc_item_list(
&self,
items: impl IntoIterator<Item = ast::AssocItem>,
) -> ast::AssocItemList {
let (items, input) = iterator_input(items);
let items_vec: Vec<_> = items.into_iter().collect();
let ast = make::assoc_item_list(Some(items_vec)).clone_for_update();
if let Some(mut mapping) = self.mappings() {
let mut builder = SyntaxMappingBuilder::new(ast.syntax().clone());
builder.map_children(input, ast.assoc_items().map(|item| item.syntax().clone()));
builder.finish(&mut mapping);
}
ast
}
pub fn attr_outer(&self, meta: ast::Meta) -> ast::Attr { pub fn attr_outer(&self, meta: ast::Meta) -> ast::Attr {
let ast = make::attr_outer(meta.clone()).clone_for_update(); let ast = make::attr_outer(meta.clone()).clone_for_update();