diff options
| author | Ali Bektas <bektasali@protonmail.com> | 2023-08-09 23:51:27 +0200 |
|---|---|---|
| committer | Ali Bektas <bektasali@protonmail.com> | 2023-08-09 23:51:27 +0200 |
| commit | a46eebbc9f0904f35fe992cc44d6a9e64c3e6086 (patch) | |
| tree | 8cc865c53908b8647571c5aaa74a135cda5a82e6 | |
| parent | b78d69c79586aeed7f2c8afb9a4e2c0543b3876f (diff) | |
| download | rust-a46eebbc9f0904f35fe992cc44d6a9e64c3e6086.tar.gz rust-a46eebbc9f0904f35fe992cc44d6a9e64c3e6086.zip | |
Deunwrap wrap_return_type_in_result
| -rw-r--r-- | crates/ide-assists/src/handlers/wrap_return_type_in_result.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/crates/ide-assists/src/handlers/wrap_return_type_in_result.rs b/crates/ide-assists/src/handlers/wrap_return_type_in_result.rs index 24c3387457a..51b7181b3d1 100644 --- a/crates/ide-assists/src/handlers/wrap_return_type_in_result.rs +++ b/crates/ide-assists/src/handlers/wrap_return_type_in_result.rs @@ -48,6 +48,12 @@ pub(crate) fn wrap_return_type_in_result(acc: &mut Assists, ctx: &AssistContext< return None; } + let new_result_ty = + make::ext::ty_result(type_ref.clone(), make::ty_placeholder()).clone_for_update(); + let generic_args = + new_result_ty.syntax().descendants().find_map(ast::GenericArgList::cast).unwrap(); + let last_genarg = generic_args.generic_args().last()?; + acc.add( AssistId("wrap_return_type_in_result", AssistKind::RefactorRewrite), "Wrap return type in Result", @@ -75,19 +81,12 @@ pub(crate) fn wrap_return_type_in_result(acc: &mut Assists, ctx: &AssistContext< ted::replace(ret_expr_arg.syntax(), ok_wrapped.syntax()); } - let new_result_ty = - make::ext::ty_result(type_ref.clone(), make::ty_placeholder()).clone_for_update(); let old_result_ty = edit.make_mut(type_ref.clone()); ted::replace(old_result_ty.syntax(), new_result_ty.syntax()); if let Some(cap) = ctx.config.snippet_cap { - let generic_args = new_result_ty - .syntax() - .descendants() - .find_map(ast::GenericArgList::cast) - .unwrap(); - edit.add_placeholder_snippet(cap, generic_args.generic_args().last().unwrap()); + edit.add_placeholder_snippet(cap, last_genarg); } }, ) |