language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-29 19:17:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

use name_generator

Browse source 
Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com>
This commit is contained in:
Hayashi Mikihiro 2025-06-27 18:48:39 +09:00
parent 720f9f12fc
commit cd4fadb4ea
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/ide-assists/src/handlers/generate_new.rs
View file

@ -1,5 +1,6 @@
use ide_db::{ use ide_db::{
imports::import_assets::item_for_path_search, use_trivial_constructor::use_trivial_constructor, imports::import_assets::item_for_path_search, syntax_helpers::suggest_name::NameGenerator,
use_trivial_constructor::use_trivial_constructor,
}; };
use syntax::{ use syntax::{
ast::{self, AstNode, HasName, HasVisibility, StructKind, edit_in_place::Indent, make}, ast::{self, AstNode, HasName, HasVisibility, StructKind, edit_in_place::Indent, make},
@ -39,11 +40,25 @@ pub(crate) fn generate_new(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option
StructKind::Record(named) => { StructKind::Record(named) => {
named.fields().filter_map(|f| Some((f.name()?, f.ty()?))).collect::<Vec<_>>() named.fields().filter_map(|f| Some((f.name()?, f.ty()?))).collect::<Vec<_>>()
} }
StructKind::Tuple(tuple) => tuple StructKind::Tuple(tuple) => {
.fields() let mut name_generator = NameGenerator::default();
.enumerate() tuple
.filter_map(|(i, f)| Some((make::name(&format!("_{}", i)), f.ty()?))) .fields()
.collect::<Vec<_>>(), .enumerate()
.filter_map(|(i, f)| {
let ty = f.ty()?;
let name = match name_generator.for_type(
&ctx.sema.resolve_type(&ty)?,
ctx.db(),
ctx.edition(),
) {
Some(name) => name,
None => name_generator.suggest_name(&format!("_{i}")),
};
Some((make::name(name.as_str()), f.ty()?))
})
.collect::<Vec<_>>()
}
StructKind::Unit => return None, StructKind::Unit => return None,
}; };