From 57f119b5fa65032d6f387f9e3391d71acd647845 Mon Sep 17 00:00:00 2001
From: vi_mi <fenil.jain2018@vitstudent.ac.in>
Date: Fri, 9 Jul 2021 19:18:22 +0530
Subject: [PATCH] fix: Adding async keyword when await is present in
 generate_function assist

---
 .../src/handlers/generate_function.rs         | 31 +++++++++++++++++--
 crates/syntax/src/ast/make.rs                 |  7 +++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/crates/ide_assists/src/handlers/generate_function.rs b/crates/ide_assists/src/handlers/generate_function.rs
index 60cf49988e1..c620cfac486 100644
--- a/crates/ide_assists/src/handlers/generate_function.rs
+++ b/crates/ide_assists/src/handlers/generate_function.rs
@@ -44,8 +44,8 @@ use crate::{
 pub(crate) fn generate_function(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
     let path_expr: ast::PathExpr = ctx.find_node_at_offset()?;
     let call = path_expr.syntax().parent().and_then(ast::CallExpr::cast)?;
-    let path = path_expr.path()?;
 
+    let path = path_expr.path()?;
     if ctx.sema.resolve_path(&path).is_some() {
         // The function call already resolves, no need to add a function
         return None;
@@ -60,8 +60,8 @@ pub(crate) fn generate_function(acc: &mut Assists, ctx: &AssistContext) -> Optio
     };
 
     let function_builder = FunctionBuilder::from_call(ctx, &call, &path, target_module)?;
-
     let target = call.syntax().text_range();
+
     acc.add(
         AssistId("generate_function", AssistKind::Generate),
         format!("Generate `{}` function", function_builder.fn_name),
@@ -109,6 +109,7 @@ struct FunctionBuilder {
     should_render_snippet: bool,
     file: FileId,
     needs_pub: bool,
+    is_async: bool,
 }
 
 impl FunctionBuilder {
@@ -135,6 +136,9 @@ impl FunctionBuilder {
         let fn_name = fn_name(path)?;
         let (type_params, params) = fn_args(ctx, target_module, call)?;
 
+        let await_expr = call.syntax().parent().and_then(ast::AwaitExpr::cast);
+        let is_async = await_expr.is_some();
+
         // should_render_snippet intends to express a rough level of confidence about
         // the correctness of the return type.
         //
@@ -171,6 +175,7 @@ impl FunctionBuilder {
             should_render_snippet,
             file,
             needs_pub,
+            is_async,
         })
     }
 
@@ -185,6 +190,7 @@ impl FunctionBuilder {
             self.params,
             fn_body,
             Some(self.ret_type),
+            self.is_async,
         );
         let leading_ws;
         let trailing_ws;
@@ -1159,4 +1165,25 @@ impl Foo {
         "#,
         )
     }
+
+    #[test]
+    fn create_function_with_async() {
+        check_assist(
+            generate_function,
+            r"
+fn foo() {
+    $0bar(42).await();
+}
+",
+            r"
+fn foo() {
+    bar(42).await();
+}
+
+async fn bar(arg: i32) ${0:-> ()} {
+    todo!()
+}
+",
+        )
+    }
 }
diff --git a/crates/syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs
index e00ec7f1963..1eaf40f4cbe 100644
--- a/crates/syntax/src/ast/make.rs
+++ b/crates/syntax/src/ast/make.rs
@@ -587,6 +587,7 @@ pub fn fn_(
     params: ast::ParamList,
     body: ast::BlockExpr,
     ret_type: Option<ast::RetType>,
+    is_async: bool,
 ) -> ast::Fn {
     let type_params =
         if let Some(type_params) = type_params { format!("<{}>", type_params) } else { "".into() };
@@ -596,9 +597,11 @@ pub fn fn_(
         Some(it) => format!("{} ", it),
     };
 
+    let async_literal = if is_async { "async " } else { "" };
+
     ast_from_text(&format!(
-        "{}fn {}{}{} {}{}",
-        visibility, fn_name, type_params, params, ret_type, body
+        "{}{}fn {}{}{} {}{}",
+        visibility, async_literal, fn_name, type_params, params, ret_type, body
     ))
 }