From 406d96c7d4c3a78d42b58a91ba633333ec37d487 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 28 Feb 2021 21:11:41 +0300 Subject: [PATCH] Use consistent naming for assist --- ...h.rs => replace_for_loop_with_for_each.rs} | 18 ++++---- crates/ide_assists/src/lib.rs | 12 ++--- crates/ide_assists/src/tests.rs | 2 +- crates/ide_assists/src/tests/generated.rs | 46 +++++++++---------- 4 files changed, 39 insertions(+), 39 deletions(-) rename crates/ide_assists/src/handlers/{convert_for_to_iter_for_each.rs => replace_for_loop_with_for_each.rs} (93%) diff --git a/crates/ide_assists/src/handlers/convert_for_to_iter_for_each.rs b/crates/ide_assists/src/handlers/replace_for_loop_with_for_each.rs similarity index 93% rename from crates/ide_assists/src/handlers/convert_for_to_iter_for_each.rs rename to crates/ide_assists/src/handlers/replace_for_loop_with_for_each.rs index 011df1c1859..27da28bc0aa 100644 --- a/crates/ide_assists/src/handlers/convert_for_to_iter_for_each.rs +++ b/crates/ide_assists/src/handlers/replace_for_loop_with_for_each.rs @@ -7,7 +7,7 @@ use test_utils::mark; use crate::{AssistContext, AssistId, AssistKind, Assists}; -// Assist: convert_for_to_iter_for_each +// Assist: replace_for_loop_with_for_each // // Converts a for loop into a for_each loop on the Iterator. // @@ -28,7 +28,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists}; // }); // } // ``` -pub(crate) fn convert_for_to_iter_for_each(acc: &mut Assists, ctx: &AssistContext) -> Option<()> { +pub(crate) fn replace_for_loop_with_for_each(acc: &mut Assists, ctx: &AssistContext) -> Option<()> { let for_loop = ctx.find_node_at_offset::()?; let iterable = for_loop.iterable()?; let pat = for_loop.pat()?; @@ -39,8 +39,8 @@ pub(crate) fn convert_for_to_iter_for_each(acc: &mut Assists, ctx: &AssistContex } acc.add( - AssistId("convert_for_to_iter_for_each", AssistKind::RefactorRewrite), - "Convert a for loop into an Iterator::for_each", + AssistId("replace_for_loop_with_for_each", AssistKind::RefactorRewrite), + "Replace this for loop with `Iterator::for_each`", for_loop.syntax().text_range(), |builder| { let mut buf = String::new(); @@ -150,13 +150,13 @@ pub struct NoIterMethod; FamousDefs::FIXTURE, EMPTY_ITER_FIXTURE ); - check_assist(convert_for_to_iter_for_each, before, after); + check_assist(replace_for_loop_with_for_each, before, after); } #[test] fn test_not_for() { check_assist_not_applicable( - convert_for_to_iter_for_each, + replace_for_loop_with_for_each, r" let mut x = vec![1, 2, 3]; x.iter_mut().$0for_each(|v| *v *= 2); @@ -167,7 +167,7 @@ x.iter_mut().$0for_each(|v| *v *= 2); #[test] fn test_simple_for() { check_assist( - convert_for_to_iter_for_each, + replace_for_loop_with_for_each, r" fn main() { let x = vec![1, 2, 3]; @@ -189,7 +189,7 @@ fn main() { fn not_available_in_body() { mark::check!(not_available_in_body); check_assist_not_applicable( - convert_for_to_iter_for_each, + replace_for_loop_with_for_each, r" fn main() { let x = vec![1, 2, 3]; @@ -275,7 +275,7 @@ fn main() { #[test] fn test_for_borrowed_mut_behind_var() { check_assist( - convert_for_to_iter_for_each, + replace_for_loop_with_for_each, r" fn main() { let x = vec![1, 2, 3]; diff --git a/crates/ide_assists/src/lib.rs b/crates/ide_assists/src/lib.rs index 4c067d45113..53542d43347 100644 --- a/crates/ide_assists/src/lib.rs +++ b/crates/ide_assists/src/lib.rs @@ -114,7 +114,6 @@ mod handlers { mod apply_demorgan; mod auto_import; mod change_visibility; - mod convert_for_to_iter_for_each; mod convert_integer_literal; mod early_return; mod expand_glob_import; @@ -132,8 +131,8 @@ mod handlers { mod generate_enum_projection_method; mod generate_from_impl_for_enum; mod generate_function; - mod generate_getter; mod generate_getter_mut; + mod generate_getter; mod generate_impl; mod generate_new; mod generate_setter; @@ -156,6 +155,7 @@ mod handlers { mod reorder_fields; mod reorder_impl; mod replace_derive_with_manual_impl; + mod replace_for_loop_with_for_each; mod replace_if_let_with_match; mod replace_impl_trait_with_generic; mod replace_let_with_if_let; @@ -177,11 +177,9 @@ mod handlers { apply_demorgan::apply_demorgan, auto_import::auto_import, change_visibility::change_visibility, - convert_for_to_iter_for_each::convert_for_to_iter_for_each, convert_integer_literal::convert_integer_literal, early_return::convert_to_guarded_return, expand_glob_import::expand_glob_import, - move_module_to_file::move_module_to_file, extract_struct_from_enum_variant::extract_struct_from_enum_variant, fill_match_arms::fill_match_arms, fix_visibility::fix_visibility, @@ -191,12 +189,12 @@ mod handlers { generate_default_from_enum_variant::generate_default_from_enum_variant, generate_derive::generate_derive, generate_enum_is_method::generate_enum_is_method, - generate_enum_projection_method::generate_enum_try_into_method, generate_enum_projection_method::generate_enum_as_method, + generate_enum_projection_method::generate_enum_try_into_method, generate_from_impl_for_enum::generate_from_impl_for_enum, generate_function::generate_function, - generate_getter::generate_getter, generate_getter_mut::generate_getter_mut, + generate_getter::generate_getter, generate_impl::generate_impl, generate_new::generate_new, generate_setter::generate_setter, @@ -210,6 +208,7 @@ mod handlers { move_bounds::move_bounds_to_where_clause, move_guard::move_arm_cond_to_match_guard, move_guard::move_guard_to_arm_body, + move_module_to_file::move_module_to_file, pull_assignment_up::pull_assignment_up, qualify_path::qualify_path, raw_string::add_hash, @@ -221,6 +220,7 @@ mod handlers { reorder_fields::reorder_fields, reorder_impl::reorder_impl, replace_derive_with_manual_impl::replace_derive_with_manual_impl, + replace_for_loop_with_for_each::replace_for_loop_with_for_each, replace_if_let_with_match::replace_if_let_with_match, replace_if_let_with_match::replace_match_with_if_let, replace_impl_trait_with_generic::replace_impl_trait_with_generic, diff --git a/crates/ide_assists/src/tests.rs b/crates/ide_assists/src/tests.rs index 384eb7eeea2..b7f6167607a 100644 --- a/crates/ide_assists/src/tests.rs +++ b/crates/ide_assists/src/tests.rs @@ -190,8 +190,8 @@ fn assist_order_field_struct() { let mut assists = assists.iter(); assert_eq!(assists.next().expect("expected assist").label, "Change visibility to pub(crate)"); - assert_eq!(assists.next().expect("expected assist").label, "Generate a getter method"); assert_eq!(assists.next().expect("expected assist").label, "Generate a mut getter method"); + assert_eq!(assists.next().expect("expected assist").label, "Generate a getter method"); assert_eq!(assists.next().expect("expected assist").label, "Generate a setter method"); assert_eq!(assists.next().expect("expected assist").label, "Add `#[derive]`"); } diff --git a/crates/ide_assists/src/tests/generated.rs b/crates/ide_assists/src/tests/generated.rs index 7f6dbbccf20..4f007aa48bb 100644 --- a/crates/ide_assists/src/tests/generated.rs +++ b/crates/ide_assists/src/tests/generated.rs @@ -192,29 +192,6 @@ pub(crate) fn frobnicate() {} ) } -#[test] -fn doctest_convert_for_to_iter_for_each() { - check_doc_test( - "convert_for_to_iter_for_each", - r#####" -fn main() { - let x = vec![1, 2, 3]; - for $0v in x { - let y = v * 2; - } -} -"#####, - r#####" -fn main() { - let x = vec![1, 2, 3]; - x.into_iter().for_each(|v| { - let y = v * 2; - }); -} -"#####, - ) -} - #[test] fn doctest_convert_integer_literal() { check_doc_test( @@ -1179,6 +1156,29 @@ impl Debug for S { ) } +#[test] +fn doctest_replace_for_loop_with_for_each() { + check_doc_test( + "replace_for_loop_with_for_each", + r#####" +fn main() { + let x = vec![1, 2, 3]; + for$0 v in x { + let y = v * 2; + } +} +"#####, + r#####" +fn main() { + let x = vec![1, 2, 3]; + x.into_iter().for_each(|v| { + let y = v * 2; + }); +} +"#####, + ) +} + #[test] fn doctest_replace_if_let_with_match() { check_doc_test(