From 50c913c733de6aabae9d9770187093ac00cafbaf Mon Sep 17 00:00:00 2001
From: Jeroen Vannevel <jer_vannevel@outlook.com>
Date: Wed, 19 Jan 2022 23:26:30 +0000
Subject: [PATCH] don't remove the comment token if it's last

---
 crates/ide_assists/src/handlers/extract_function.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs
index 8f9d305b4d..41aafecd00 100644
--- a/crates/ide_assists/src/handlers/extract_function.rs
+++ b/crates/ide_assists/src/handlers/extract_function.rs
@@ -1467,6 +1467,7 @@ fn make_body(
                 .filter(|it| text_range.contains_range(it.text_range()))
                 .map(|it| match it {
                     syntax::NodeOrToken::Node(n) => {
+                        println!("Found node: {:?}", n);
                         return syntax::NodeOrToken::try_from(rewrite_body_segment(
                             ctx,
                             &fun.params,
@@ -1476,6 +1477,7 @@ fn make_body(
                         .unwrap()
                     }
                     syntax::NodeOrToken::Token(t) => {
+                        println!("Found token: {:?}", t);
                         return syntax::NodeOrToken::try_from(t).unwrap()
                     }
                 })
@@ -1487,7 +1489,11 @@ fn make_body(
                         elements.push(node);
                         None
                     })
-                }
+                },
+                Some(token) if token.as_token().is_some() && token.as_token().unwrap().kind() == COMMENT => {
+                    elements.push(token);
+                    None
+                },
                 _ => None,
             };