Skip to content

Commit d5ea355

Browse files
committed
minor: add missing SyntaxFactory::assoc_item_list
1 parent 1a5d1bf commit d5ea355

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

crates/ide-assists/src/handlers/generate_delegate_trait.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ fn generate_impl(
296296
.collect()
297297
});
298298

299-
let delegate = finalize_delegate(&delegate, assoc_items, false)?;
299+
let delegate = finalize_delegate(&make, &delegate, assoc_items, false)?;
300300

301301
let target_scope = ctx.sema.scope(strukt.strukt.syntax())?;
302302
let source_scope = ctx.sema.scope(bound_def.syntax())?;
@@ -406,7 +406,7 @@ fn generate_impl(
406406
.collect()
407407
});
408408

409-
finalize_delegate(&delegate, assoc_items, true)
409+
finalize_delegate(&make, &delegate, assoc_items, true)
410410
}
411411
}
412412
}
@@ -552,6 +552,7 @@ fn remove_useless_where_clauses(editor: &mut SyntaxEditor, delegate: &ast::Impl)
552552
/// 1. Replacing the assoc_item_list with new items (if any)
553553
/// 2. Removing useless where clauses
554554
fn finalize_delegate(
555+
make: &SyntaxFactory,
555556
delegate: &ast::Impl,
556557
assoc_items: Option<Vec<ast::AssocItem>>,
557558
remove_where_clauses: bool,
@@ -568,8 +569,7 @@ fn finalize_delegate(
568569
if let Some(items) = assoc_items
569570
&& !items.is_empty()
570571
{
571-
let new_assoc_item_list =
572-
syntax::ast::make::assoc_item_list(Some(items)).clone_for_update();
572+
let new_assoc_item_list = make.assoc_item_list(items);
573573
if let Some(old_list) = delegate.assoc_item_list() {
574574
editor.replace(old_list.syntax(), new_assoc_item_list.syntax());
575575
}

crates/syntax/src/ast/syntax_factory/constructors.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,6 +1454,23 @@ impl SyntaxFactory {
14541454
ast
14551455
}
14561456

1457+
pub fn assoc_item_list(
1458+
&self,
1459+
items: impl IntoIterator<Item = ast::AssocItem>,
1460+
) -> ast::AssocItemList {
1461+
let (items, input) = iterator_input(items);
1462+
let items_vec: Vec<_> = items.into_iter().collect();
1463+
let ast = make::assoc_item_list(Some(items_vec)).clone_for_update();
1464+
1465+
if let Some(mut mapping) = self.mappings() {
1466+
let mut builder = SyntaxMappingBuilder::new(ast.syntax().clone());
1467+
builder.map_children(input, ast.assoc_items().map(|item| item.syntax().clone()));
1468+
builder.finish(&mut mapping);
1469+
}
1470+
1471+
ast
1472+
}
1473+
14571474
pub fn attr_outer(&self, meta: ast::Meta) -> ast::Attr {
14581475
let ast = make::attr_outer(meta.clone()).clone_for_update();
14591476

0 commit comments

Comments
 (0)