rust-analyzer

Unnamed repository; edit this file 'description' to name the repository.

Clone

HTTPS

SSH

Diffstat (limited to 'crates/ide-assists/src/handlers/generate_delegate_methods.rs')

-rw-r--r--

1 files changed, 4 insertions, 1 deletions

diff --git a/crates/ide-assists/src/handlers/generate_delegate_methods.rs b/crates/ide-assists/src/handlers/generate_delegate_methods.rs
index 2150003bc1..081e36b4ff 100644
--- a/crates/ide-assists/src/handlers/generate_delegate_methods.rs
+++ b/crates/ide-assists/src/handlers/generate_delegate_methods.rs

@@ -51,6 +51,7 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'

let strukt = ctx.find_node_at_offset::<ast::Struct>()?;

let strukt_name = strukt.name()?;

let current_module = ctx.sema.scope(strukt.syntax())?.module();

+ let current_edition = current_module.krate().edition(ctx.db());

let (field_name, field_ty, target) = match ctx.find_node_at_offset::<ast::RecordField>() {

Some(field) => {

@@ -89,7 +90,7 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'

methods.sort_by(|(a, _), (b, _)| a.cmp(b));

for (name, method) in methods {

let adt = ast::Adt::Struct(strukt.clone());

- let name = name.display(ctx.db()).to_string();

+ let name = name.display(ctx.db(), current_edition).to_string();

// if `find_struct_impl` returns None, that means that a function named `name` already exists.

let Some(impl_def) = find_struct_impl(ctx, &adt, std::slice::from_ref(&name)) else {

continue;

@@ -121,6 +122,7 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'

let is_async = method_source.async_token().is_some();

let is_const = method_source.const_token().is_some();

let is_unsafe = method_source.unsafe_token().is_some();

+ let is_gen = method_source.gen_token().is_some();

let fn_name = make::name(&name);

@@ -153,6 +155,7 @@ pub(crate) fn generate_delegate_methods(acc: &mut Assists, ctx: &AssistContext<'

is_async,

is_const,

is_unsafe,

+ is_gen,

)

.clone_for_update();