Unnamed repository; edit this file 'description' to name the repository.
3 files changed, 5 insertions, 5 deletions
diff --git a/crates/ide-assists/src/handlers/convert_named_struct_to_tuple_struct.rs b/crates/ide-assists/src/handlers/convert_named_struct_to_tuple_struct.rs index 0a23bd6d71..6435cb25f2 100644 --- a/crates/ide-assists/src/handlers/convert_named_struct_to_tuple_struct.rs +++ b/crates/ide-assists/src/handlers/convert_named_struct_to_tuple_struct.rs @@ -9,7 +9,7 @@ use syntax::{ use crate::{ AssistContext, AssistId, Assists, assist_context::SourceChangeBuilder, - utils::find_struct_definition_from_cursor, + utils::get_struct_definition_from_context, }; // Assist: convert_named_struct_to_tuple_struct @@ -59,7 +59,7 @@ pub(crate) fn convert_named_struct_to_tuple_struct( // XXX: We don't currently provide this assist for struct definitions inside macros, but if we // are to lift this limitation, don't forget to make `edit_struct_def()` consider macro files // too. - let strukt = find_struct_definition_from_cursor(ctx)?; + let strukt = get_struct_definition_from_context(ctx)?; let field_list = strukt.as_ref().either(|s| s.field_list(), |v| v.field_list())?; let record_fields = match field_list { ast::FieldList::RecordFieldList(it) => it, diff --git a/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs b/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs index 464309dadb..2f7b1ec8db 100644 --- a/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs +++ b/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs @@ -8,7 +8,7 @@ use syntax::{ use crate::{ AssistContext, AssistId, Assists, assist_context::SourceChangeBuilder, - utils::find_struct_definition_from_cursor, + utils::get_struct_definition_from_context, }; // Assist: convert_tuple_struct_to_named_struct @@ -54,7 +54,7 @@ pub(crate) fn convert_tuple_struct_to_named_struct( acc: &mut Assists, ctx: &AssistContext<'_>, ) -> Option<()> { - let strukt = find_struct_definition_from_cursor(ctx)?; + let strukt = get_struct_definition_from_context(ctx)?; let field_list = strukt.as_ref().either(|s| s.field_list(), |v| v.field_list())?; let tuple_fields = match field_list { ast::FieldList::TupleFieldList(it) => it, diff --git a/crates/ide-assists/src/utils.rs b/crates/ide-assists/src/utils.rs index 5741b15fdc..676937c816 100644 --- a/crates/ide-assists/src/utils.rs +++ b/crates/ide-assists/src/utils.rs @@ -1150,7 +1150,7 @@ pub fn is_body_const(sema: &Semantics<'_, RootDatabase>, expr: &ast::Expr) -> bo } /// Gets the struct definition from a context -pub(crate) fn find_struct_definition_from_cursor( +pub(crate) fn get_struct_definition_from_context( ctx: &AssistContext<'_>, ) -> Option<Either<ast::Struct, ast::Variant>> { ctx.find_node_at_offset::<ast::Name>() |