Unnamed repository; edit this file 'description' to name the repository.
minor: Group `extract_function` with other extraction assists
Giga Bowser 2024-12-12
parent 0cad614 · commit 21782b9
-rw-r--r--crates/ide-assists/src/handlers/extract_function.rs4
-rw-r--r--crates/ide-assists/src/tests.rs27
2 files changed, 23 insertions, 8 deletions
diff --git a/crates/ide-assists/src/handlers/extract_function.rs b/crates/ide-assists/src/handlers/extract_function.rs
index 6937d33ebc..2e363b0b62 100644
--- a/crates/ide-assists/src/handlers/extract_function.rs
+++ b/crates/ide-assists/src/handlers/extract_function.rs
@@ -7,6 +7,7 @@ use hir::{
TypeInfo, TypeParam,
};
use ide_db::{
+ assists::GroupLabel,
defs::{Definition, NameRefClass},
famous_defs::FamousDefs,
helpers::mod_path_to_ast,
@@ -104,7 +105,8 @@ pub(crate) fn extract_function(acc: &mut Assists, ctx: &AssistContext<'_>) -> Op
let scope = ImportScope::find_insert_use_container(&node, &ctx.sema)?;
- acc.add(
+ acc.add_group(
+ &GroupLabel("Extract into...".to_owned()),
AssistId("extract_function", crate::AssistKind::RefactorExtract),
"Extract into function",
target_range,
diff --git a/crates/ide-assists/src/tests.rs b/crates/ide-assists/src/tests.rs
index e517dd4682..0b1ff87c5c 100644
--- a/crates/ide-assists/src/tests.rs
+++ b/crates/ide-assists/src/tests.rs
@@ -363,7 +363,6 @@ pub fn test_some_range(a: int) -> bool {
expect![[r#"
Convert integer base
Extract into...
- Extract into function
Replace if let with match
"#]]
.assert_eq(&expected);
@@ -392,7 +391,6 @@ pub fn test_some_range(a: int) -> bool {
expect![[r#"
Convert integer base
Extract into...
- Extract into function
Replace if let with match
"#]]
.assert_eq(&expected);
@@ -406,7 +404,6 @@ pub fn test_some_range(a: int) -> bool {
expect![[r#"
Extract into...
- Extract into function
"#]]
.assert_eq(&expected);
}
@@ -511,7 +508,11 @@ pub fn test_some_range(a: int) -> bool {
RefactorExtract,
),
label: "Extract into function",
- group: None,
+ group: Some(
+ GroupLabel(
+ "Extract into...",
+ ),
+ ),
target: 59..60,
source_change: None,
command: None,
@@ -601,7 +602,11 @@ pub fn test_some_range(a: int) -> bool {
RefactorExtract,
),
label: "Extract into function",
- group: None,
+ group: Some(
+ GroupLabel(
+ "Extract into...",
+ ),
+ ),
target: 59..60,
source_change: None,
command: None,
@@ -734,7 +739,11 @@ pub fn test_some_range(a: int) -> bool {
RefactorExtract,
),
label: "Extract into function",
- group: None,
+ group: Some(
+ GroupLabel(
+ "Extract into...",
+ ),
+ ),
target: 59..60,
source_change: None,
command: None,
@@ -953,7 +962,11 @@ pub fn test_some_range(a: int) -> bool {
RefactorExtract,
),
label: "Extract into function",
- group: None,
+ group: Some(
+ GroupLabel(
+ "Extract into...",
+ ),
+ ),
target: 59..60,
source_change: Some(
SourceChange {