From: Jeroen Vannevel <jer_vannevel@outlook.com>
Date: Tue, 1 Feb 2022 09:00:30 +0000 (+0000)
Subject: better comparison
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=1811f6330b3a116974aaa2eff13676498767657a;p=rust.git

better comparison
---

diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs
index 3750ac61273..e03f4d3c82a 100644
--- a/crates/ide_assists/src/handlers/extract_function.rs
+++ b/crates/ide_assists/src/handlers/extract_function.rs
@@ -482,9 +482,7 @@ fn from_range(parent: ast::StmtList, selected: TextRange) -> FunctionBody {
         let full_body = parent.syntax().children_with_tokens();
 
         let mut text_range = full_body
-            .filter(|it| {
-                matches!(it.kind().is_punct() || it.kind() == SyntaxKind::WHITESPACE, false)
-            })
+            .filter(|it| ast::Stmt::can_cast(it.kind()) || it.kind() == COMMENT)
             .map(|element| element.text_range())
             .filter(|&range| selected.intersect(range).filter(|it| !it.is_empty()).is_some())
             .reduce(|acc, stmt| acc.cover(stmt));