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

Replace tuple with TargetInfo struct

Browse source
This commit is contained in:
Dorian Scheidt 2022-08-18 18:20:06 -05:00
parent 30eabeb95d
commit e513d7b504
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,7 @@ fn gen_fn(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
} }
let fn_name = &*name_ref.text(); let fn_name = &*name_ref.text();
let (target_module, adt_name, target, file, insert_offset) = let TargetInfo { target_module, adt_name, target, file, insert_offset } =
fn_target_info(path, ctx, &call, fn_name)?; fn_target_info(path, ctx, &call, fn_name)?;
let function_builder = FunctionBuilder::from_call(ctx, &call, fn_name, target_module, target)?; let function_builder = FunctionBuilder::from_call(ctx, &call, fn_name, target_module, target)?;
let text_range = call.syntax().text_range(); let text_range = call.syntax().text_range();
@ -78,12 +78,20 @@ fn gen_fn(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
) )
} }
struct TargetInfo {
target_module: Option<Module>,
adt_name: Option<hir::Name>,
target: GeneratedFunctionTarget,
file: FileId,
insert_offset: TextSize,
}
fn fn_target_info( fn fn_target_info(
path: ast::Path, path: ast::Path,
ctx: &AssistContext<'_>, ctx: &AssistContext<'_>,
call: &CallExpr, call: &CallExpr,
fn_name: &str, fn_name: &str,
) -> Option<(Option<Module>, Option<hir::Name>, GeneratedFunctionTarget, FileId, TextSize)> { ) -> Option<TargetInfo> {
let mut target_module = None; let mut target_module = None;
let mut adt_name = None; let mut adt_name = None;
let (target, file, insert_offset) = match path.qualifier() { let (target, file, insert_offset) = match path.qualifier() {
@ -115,7 +123,7 @@ fn fn_target_info(
get_fn_target(ctx, &target_module, call.clone())? get_fn_target(ctx, &target_module, call.clone())?
} }
}; };
Some((target_module, adt_name, target, file, insert_offset)) Some(TargetInfo { target_module, adt_name, target, file, insert_offset })
} }
fn gen_method(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { fn gen_method(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {