language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

make function builder create ast directly

Browse source
This commit is contained in:
morine0122 2024-04-13 20:16:12 +09:00
parent 657b33b0cb
commit 145078e09f
1 changed files with 26 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

70
crates/ide-assists/src/handlers/generate_function.rs
View file

@ -175,8 +175,7 @@ fn add_func_to_accumulator(
edit.edit_file(file); edit.edit_file(file);
let target = function_builder.target.clone(); let target = function_builder.target.clone();
let function_template = function_builder.render(); let func = function_builder.render(ctx.config.snippet_cap, edit);
let func = function_template.to_ast(ctx.config.snippet_cap, edit);
if let Some(name) = adt_name { if let Some(name) = adt_name {
let name = make::ty_path(make::ext::ident_path(&format!("{}", name.display(ctx.db())))); let name = make::ty_path(make::ext::ident_path(&format!("{}", name.display(ctx.db()))));
@ -205,37 +204,6 @@ fn get_adt_source(
find_struct_impl(ctx, &adt_source, &[fn_name.to_owned()]).map(|impl_| (impl_, range.file_id)) find_struct_impl(ctx, &adt_source, &[fn_name.to_owned()]).map(|impl_| (impl_, range.file_id))
} }
struct FunctionTemplate {
fn_def: ast::Fn,
ret_type: Option<ast::RetType>,
should_focus_return_type: bool,
tail_expr: ast::Expr,
}
impl FunctionTemplate {
fn to_ast(&self, cap: Option<SnippetCap>, edit: &mut SourceChangeBuilder) -> ast::Fn {
let Self { fn_def, ret_type, should_focus_return_type, tail_expr } = self;
if let Some(cap) = cap {
if *should_focus_return_type {
// Focus the return type if there is one
match ret_type {
Some(ret_type) => {
edit.add_placeholder_snippet(cap, ret_type.clone());
}
None => {
edit.add_placeholder_snippet(cap, tail_expr.clone());
}
}
} else {
edit.add_placeholder_snippet(cap, tail_expr.clone());
}
}
fn_def.clone()
}
}
struct FunctionBuilder { struct FunctionBuilder {
target: GeneratedFunctionTarget, target: GeneratedFunctionTarget,
fn_name: ast::Name, fn_name: ast::Name,
@ -339,7 +307,7 @@ impl FunctionBuilder {
}) })
} }
fn render(self) -> FunctionTemplate { fn render(self, cap: Option<SnippetCap>, edit: &mut SourceChangeBuilder) -> ast::Fn {
let placeholder_expr = make::ext::expr_todo(); let placeholder_expr = make::ext::expr_todo();
let fn_body = make::block_expr(vec![], Some(placeholder_expr)); let fn_body = make::block_expr(vec![], Some(placeholder_expr));
let visibility = match self.visibility { let visibility = match self.visibility {
@ -361,17 +329,31 @@ impl FunctionBuilder {
) )
.clone_for_update(); .clone_for_update();
FunctionTemplate { let ret_type = fn_def.ret_type();
ret_type: fn_def.ret_type(), // PANIC: we guarantee we always create a function body with a tail expr
// PANIC: we guarantee we always create a function body with a tail expr let tail_expr = fn_def
tail_expr: fn_def .body()
.body() .expect("generated function should have a body")
.expect("generated function should have a body") .tail_expr()
.tail_expr() .expect("function body should have a tail expression");
.expect("function body should have a tail expression"),
should_focus_return_type: self.should_focus_return_type, if let Some(cap) = cap {
fn_def, if self.should_focus_return_type {
// Focus the return type if there is one
match ret_type {
Some(ret_type) => {
edit.add_placeholder_snippet(cap, ret_type.clone());
}
None => {
edit.add_placeholder_snippet(cap, tail_expr.clone());
}
}
} else {
edit.add_placeholder_snippet(cap, tail_expr.clone());
}
} }
fn_def
} }
} }