Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide_assists/src/handlers/generate_documentation_template.rs')
| -rw-r--r-- | crates/ide_assists/src/handlers/generate_documentation_template.rs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/crates/ide_assists/src/handlers/generate_documentation_template.rs b/crates/ide_assists/src/handlers/generate_documentation_template.rs index a2fe3463b6..36b3321f91 100644 --- a/crates/ide_assists/src/handlers/generate_documentation_template.rs +++ b/crates/ide_assists/src/handlers/generate_documentation_template.rs @@ -159,7 +159,7 @@ fn safety_builder(ast_func: &ast::Fn) -> Option<Vec<String>> { fn gen_ex_template(ast_func: &ast::Fn, ctx: &AssistContext) -> Option<Vec<String>> { let (mut lines, ex_helper) = gen_ex_start_helper(ast_func, ctx)?; // Call the function, check result - if returns_a_value(ast_func) { + if returns_a_value(ast_func, ctx) { if count_parameters(&ex_helper.param_list) < 3 { lines.push(format!("assert_eq!({}, );", ex_helper.function_call)); } else { @@ -183,7 +183,7 @@ fn gen_ex_template(ast_func: &ast::Fn, ctx: &AssistContext) -> Option<Vec<String /// `None` if the function has a `self` parameter but is not in an `impl`. fn gen_panic_ex_template(ast_func: &ast::Fn, ctx: &AssistContext) -> Option<Vec<String>> { let (mut lines, ex_helper) = gen_ex_start_helper(ast_func, ctx)?; - match returns_a_value(ast_func) { + match returns_a_value(ast_func, ctx) { true => lines.push(format!("let _ = {}; // panics", ex_helper.function_call)), false => lines.push(format!("{}; // panics", ex_helper.function_call)), } @@ -424,11 +424,12 @@ fn return_type(ast_func: &ast::Fn) -> Option<ast::Type> { } /// Helper function to determine if the function returns some data -fn returns_a_value(ast_func: &ast::Fn) -> bool { - match return_type(ast_func) { - Some(ret_type) => !["()", "!"].contains(&ret_type.to_string().as_str()), - None => false, - } +fn returns_a_value(ast_func: &ast::Fn, ctx: &AssistContext) -> bool { + ctx.sema + .to_def(ast_func) + .map(|hir_func| hir_func.ret_type(ctx.db())) + .map(|ret_ty| !ret_ty.is_unit() && !ret_ty.is_never()) + .unwrap_or(false) } #[cfg(test)] |