Skip to content

internal: migrate generate_single_field_struct_from assist to SyntaxEditor #20860

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

Merged
merged 1 commit into from
Oct 19, 2025
Merged

internal: migrate generate_single_field_struct_from assist to SyntaxEditor #20860

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions crates/ide-assists/src/handlers/generate_single_field_struct_from.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ use ide_db::{
RootDatabase, famous_defs::FamousDefs, helpers::mod_path_to_ast,
imports::import_assets::item_for_path_search, use_trivial_constructor::use_trivial_constructor,
};
use syntax::syntax_editor::{Element, Position};
use syntax::{
TokenText,
ast::{self, AstNode, HasAttrs, HasGenericParams, HasName, edit, edit_in_place::Indent},
ast::{self, AstNode, HasAttrs, HasGenericParams, HasName, edit::AstNodeEdit},
};

use crate::{
Expand Down Expand Up @@ -111,9 +112,8 @@ pub(crate) fn generate_single_field_struct_from(
false,
false,
)
.clone_for_update();
.indent(1.into());

fn_.indent(1.into());
let cfg_attrs = strukt
.attrs()
.filter(|attr| attr.as_simple_call().is_some_and(|(name, _arg)| name == "cfg"));
Expand All @@ -129,16 +129,25 @@ pub(crate) fn generate_single_field_struct_from(
make::ty("From"),
ty.clone(),
None,
ty_where_clause.map(|wc| edit::AstNodeEdit::reset_indent(&wc)),
ty_where_clause.map(|wc| wc.reset_indent()),
None,
)
.clone_for_update();

impl_.get_or_create_assoc_item_list().add_item(fn_.into());
let impl_ = impl_.indent(indent);

let mut edit = builder.make_editor(strukt.syntax());

impl_.reindent_to(indent);
edit.insert_all(
Position::after(strukt.syntax()),
vec![
make::tokens::whitespace(&format!("\n\n{indent}")).syntax_element(),
impl_.syntax().syntax_element(),
],
);

builder.insert(strukt.syntax().text_range().end(), format!("\n\n{indent}{impl_}"));
builder.add_file_edits(ctx.vfs_file_id(), edit);
},
)
}
Expand Down