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

method generation assist: store owned ast nodes

Browse source
This commit is contained in:
mahdi-frms 2021-08-08 17:21:34 +04:30
parent 6240b2dae2
commit 02f5b5e0e2
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/ide_assists/src/handlers/generate_function.rs
View file

@ -17,21 +17,21 @@ use crate::{
AssistContext, AssistId, AssistKind, Assists, AssistContext, AssistId, AssistKind, Assists,
}; };
enum FuncExpr<'a> { enum FuncExpr {
Func(&'a ast::CallExpr), Func(ast::CallExpr),
Method(&'a ast::MethodCallExpr), Method(ast::MethodCallExpr),
} }
impl<'a> FuncExpr<'a> { impl FuncExpr {
fn arg_list(&self) -> Option<ArgList> { fn arg_list(&self) -> Option<ArgList> {
match *self { match self {
FuncExpr::Func(fn_call) => fn_call.arg_list(), FuncExpr::Func(fn_call) => fn_call.arg_list(),
FuncExpr::Method(m_call) => m_call.arg_list(), FuncExpr::Method(m_call) => m_call.arg_list(),
} }
} }
fn syntax(&self) -> &SyntaxNode { fn syntax(&self) -> &SyntaxNode {
match *self { match self {
FuncExpr::Func(fn_call) => fn_call.syntax(), FuncExpr::Func(fn_call) => fn_call.syntax(),
FuncExpr::Method(m_call) => m_call.syntax(), FuncExpr::Method(m_call) => m_call.syntax(),
} }
@ -212,12 +212,12 @@ impl FunctionBuilder {
file = in_file; file = in_file;
target target
} }
None => next_space_for_fn_after_call_site(FuncExpr::Func(call))?, None => next_space_for_fn_after_call_site(FuncExpr::Func(call.clone()))?,
}; };
let needs_pub = target_module.is_some(); let needs_pub = target_module.is_some();
let target_module = target_module.or_else(|| ctx.sema.scope(target.syntax()).module())?; let target_module = target_module.or_else(|| ctx.sema.scope(target.syntax()).module())?;
let fn_name = fn_name(path)?; let fn_name = fn_name(path)?;
let (type_params, params) = fn_args(ctx, target_module, FuncExpr::Func(call))?; let (type_params, params) = fn_args(ctx, target_module, FuncExpr::Func(call.clone()))?;
let await_expr = call.syntax().parent().and_then(ast::AwaitExpr::cast); let await_expr = call.syntax().parent().and_then(ast::AwaitExpr::cast);
let is_async = await_expr.is_some(); let is_async = await_expr.is_some();
@ -287,7 +287,7 @@ impl FunctionBuilder {
let needs_pub = !module_is_descendant(&current_module, &target_module, ctx); let needs_pub = !module_is_descendant(&current_module, &target_module, ctx);
let fn_name = make::name(&name.text()); let fn_name = make::name(&name.text());
let (type_params, params) = fn_args(ctx, target_module, FuncExpr::Method(call))?; let (type_params, params) = fn_args(ctx, target_module, FuncExpr::Method(call.clone()))?;
let await_expr = call.syntax().parent().and_then(ast::AwaitExpr::cast); let await_expr = call.syntax().parent().and_then(ast::AwaitExpr::cast);
let is_async = await_expr.is_some(); let is_async = await_expr.is_some();