From e72ed9230a06d5bf89fe5ca465b9d1377a53fc3e Mon Sep 17 00:00:00 2001
From: Jeroen Vannevel <jer_vannevel@outlook.com>
Date: Tue, 1 Feb 2022 00:21:35 +0000
Subject: [PATCH] no longer support comments on their own

---
 .../src/handlers/extract_function.rs          | 50 ++++++-------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs
index ac8f9f33f7a..640c3554096 100644
--- a/crates/ide_assists/src/handlers/extract_function.rs
+++ b/crates/ide_assists/src/handlers/extract_function.rs
@@ -22,8 +22,9 @@ use syntax::{
         edit::{AstNodeEdit, IndentLevel},
         AstNode,
     },
-    match_ast, ted, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize,
-    TokenAtOffset, WalkEvent, T,
+    match_ast, ted, SyntaxElement,
+    SyntaxKind::{self, COMMENT},
+    SyntaxNode, SyntaxToken, TextRange, TextSize, TokenAtOffset, WalkEvent, T,
 };
 
 use crate::{
@@ -64,7 +65,13 @@ pub(crate) fn extract_function(acc: &mut Assists, ctx: &AssistContext) -> Option
         return None;
     }
 
-    let node = match ctx.covering_element() {
+    let node = ctx.covering_element();
+    if node.kind() == COMMENT {
+        cov_mark::hit!(extract_function_in_comment_is_not_applicable);
+        return None;
+    }
+
+    let node = match node {
         syntax::NodeOrToken::Node(n) => n,
         syntax::NodeOrToken::Token(t) => t.parent()?,
     };
@@ -2202,6 +2209,12 @@ fn $0fun_name(n: u32) -> u32 {
         )
     }
 
+    #[test]
+    fn in_comment_is_not_applicable() {
+        cov_mark::check!(extract_function_in_comment_is_not_applicable);
+        check_assist_not_applicable(extract_function, r"fn main() { 1 + /* $0comment$0 */ 1; }");
+    }
+
     #[test]
     fn part_of_expr_stmt() {
         check_assist(
@@ -4590,37 +4603,6 @@ fn $0fun_name() {
     */
     let x = 0;
 }
-"#,
-        );
-    }
-
-    #[test]
-    fn extract_function_long_form_comment_multiline_alone() {
-        check_assist(
-            extract_function,
-            r#"
-fn func() {
-    let i = 0;
-    $0/*
-    a
-    comment
-    */
-    $0let x = 0;
-}
-"#,
-            r#"
-fn func() {
-    let i = 0;
-    fun_name();
-    let x = 0;
-}
-
-fn $0fun_name() {
-    /*
-    a
-    comment
-    */
-}
 "#,
         );
     }