itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7662

Browse Source 
7662: Group generate getter/setter assist r=Veykril a=Veykril

bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-02-13 18:59:52 +00:00 committed by GitHub
commit 3fdc556632
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/assists/src/handlers/generate_getter.rs
View File

@ -1,10 +1,9 @@
use stdx::{format_to, to_lower_snake_case}; use stdx::{format_to, to_lower_snake_case};
use syntax::ast::VisibilityOwner; use syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
use syntax::ast::{self, AstNode, NameOwner};
use crate::{ use crate::{
utils::{find_impl_block_end, find_struct_impl, generate_impl_text}, utils::{find_impl_block_end, find_struct_impl, generate_impl_text},
AssistContext, AssistId, AssistKind, Assists, AssistContext, AssistId, AssistKind, Assists, GroupLabel,
}; };
// Assist: generate_getter // Assist: generate_getter
@ -42,7 +41,8 @@ pub(crate) fn generate_getter(acc: &mut Assists, ctx: &AssistContext) -> Option<
let impl_def = find_struct_impl(&ctx, &ast::Adt::Struct(strukt.clone()), fn_name.as_str())?; let impl_def = find_struct_impl(&ctx, &ast::Adt::Struct(strukt.clone()), fn_name.as_str())?;
let target = field.syntax().text_range(); let target = field.syntax().text_range();
acc.add( acc.add_group(
&GroupLabel("Generate getter/setter".to_owned()),
AssistId("generate_getter", AssistKind::Generate), AssistId("generate_getter", AssistKind::Generate),
"Generate a getter method", "Generate a getter method",
target, target,

8
crates/assists/src/handlers/generate_getter_mut.rs
View File

@ -1,10 +1,9 @@
use stdx::{format_to, to_lower_snake_case}; use stdx::{format_to, to_lower_snake_case};
use syntax::ast::VisibilityOwner; use syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
use syntax::ast::{self, AstNode, NameOwner};
use crate::{ use crate::{
utils::{find_impl_block_end, find_struct_impl, generate_impl_text}, utils::{find_impl_block_end, find_struct_impl, generate_impl_text},
AssistContext, AssistId, AssistKind, Assists, AssistContext, AssistId, AssistKind, Assists, GroupLabel,
}; };
// Assist: generate_getter_mut // Assist: generate_getter_mut
@ -46,7 +45,8 @@ pub(crate) fn generate_getter_mut(acc: &mut Assists, ctx: &AssistContext) -> Opt
)?; )?;
let target = field.syntax().text_range(); let target = field.syntax().text_range();
acc.add( acc.add_group(
&GroupLabel("Generate getter/setter".to_owned()),
AssistId("generate_getter_mut", AssistKind::Generate), AssistId("generate_getter_mut", AssistKind::Generate),
"Generate a mut getter method", "Generate a mut getter method",
target, target,

8
crates/assists/src/handlers/generate_setter.rs
View File

@ -1,10 +1,9 @@
use stdx::{format_to, to_lower_snake_case}; use stdx::{format_to, to_lower_snake_case};
use syntax::ast::VisibilityOwner; use syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
use syntax::ast::{self, AstNode, NameOwner};
use crate::{ use crate::{
utils::{find_impl_block_end, find_struct_impl, generate_impl_text}, utils::{find_impl_block_end, find_struct_impl, generate_impl_text},
AssistContext, AssistId, AssistKind, Assists, AssistContext, AssistId, AssistKind, Assists, GroupLabel,
}; };
// Assist: generate_setter // Assist: generate_setter
@ -46,7 +45,8 @@ pub(crate) fn generate_setter(acc: &mut Assists, ctx: &AssistContext) -> Option<
)?; )?;
let target = field.syntax().text_range(); let target = field.syntax().text_range();
acc.add( acc.add_group(
&GroupLabel("Generate getter/setter".to_owned()),
AssistId("generate_setter", AssistKind::Generate), AssistId("generate_setter", AssistKind::Generate),
"Generate a setter method", "Generate a setter method",
target, target,