Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 20:43:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix nitpicks

Browse source
This commit is contained in:
Aleksei Sidorov 2020-09-04 15:24:36 +03:00
parent 7259cc82f3
commit 477fa75cfb
2 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/assists/src/handlers/replace_impl_trait_with_generic.rs
View file

@ -5,13 +5,21 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
// Assist: replace_impl_trait_with_generic // Assist: replace_impl_trait_with_generic
// //
// Replaces `impl Trait` function argument with the named generic. // Replaces `impl Trait` function argument with the named generic.
//
// ```
// fn foo<G>(bar: <|>impl Bar) {}
// ```
// ->
// ```
// fn foo<B: Bar>(bar: B) {}
// ```
pub(crate) fn replace_impl_trait_with_generic( pub(crate) fn replace_impl_trait_with_generic(
acc: &mut Assists, acc: &mut Assists,
ctx: &AssistContext, ctx: &AssistContext,
) -> Option<()> { ) -> Option<()> {
let type_impl_trait = ctx.find_node_at_offset::<ast::ImplTraitType>()?; let type_impl_trait = ctx.find_node_at_offset::<ast::ImplTraitType>()?;
let type_param = type_impl_trait.syntax().parent().and_then(ast::Param::cast)?; let type_param = type_impl_trait.syntax().parent().and_then(ast::Param::cast)?;
let type_fn = type_param.syntax().ancestors().nth(2).and_then(ast::Fn::cast)?; let type_fn = type_param.syntax().ancestors().find_map(ast::Fn::cast)?;
let impl_trait_ty = type_impl_trait let impl_trait_ty = type_impl_trait
.syntax() .syntax()
@ -27,7 +35,7 @@ pub(crate) fn replace_impl_trait_with_generic(
"Replace impl trait with generic", "Replace impl trait with generic",
target, target,
|edit| { |edit| {
let generic_letter = impl_trait_ty[..1].to_string(); let generic_letter = impl_trait_ty.chars().next().unwrap().to_string();
let generic_param_list = type_fn let generic_param_list = type_fn
.generic_param_list() .generic_param_list()
@ -36,7 +44,7 @@ pub(crate) fn replace_impl_trait_with_generic(
let new_type_fn = type_fn let new_type_fn = type_fn
.replace_descendant::<ast::Type>(type_impl_trait.into(), make::ty(&generic_letter)) .replace_descendant::<ast::Type>(type_impl_trait.into(), make::ty(&generic_letter))
.with_generic_params(generic_param_list); .with_generic_param_list(generic_param_list);
edit.replace_ast(type_fn.clone(), new_type_fn); edit.replace_ast(type_fn.clone(), new_type_fn);
}, },
@ -103,8 +111,6 @@ mod tests {
#[test] #[test]
fn replace_impl_trait_with_empty_multiline_generic_params() { fn replace_impl_trait_with_empty_multiline_generic_params() {
// FIXME: It would be more correct to place the generic parameter
// on the next line after the left angle.
check_assist( check_assist(
replace_impl_trait_with_generic, replace_impl_trait_with_generic,
r#" r#"
@ -147,8 +153,7 @@ mod tests {
fn foo< fn foo<
G: Foo, G: Foo,
F, F,
H, H, B: Bar,
B: Bar,
>(bar: B) {} >(bar: B) {}
"#, "#,
); );

19
crates/syntax/src/ast/edit.rs
View file

@ -48,7 +48,7 @@ impl ast::Fn {
} }
#[must_use] #[must_use]
pub fn with_generic_params(&self, generic_args: ast::GenericParamList) -> ast::Fn { pub fn with_generic_param_list(&self, generic_args: ast::GenericParamList) -> ast::Fn {
if let Some(old) = self.generic_param_list() { if let Some(old) = self.generic_param_list() {
return self.replace_descendant(old, generic_args); return self.replace_descendant(old, generic_args);
} }
@ -485,17 +485,7 @@ impl ast::GenericParamList {
#[must_use] #[must_use]
pub fn append_param(&self, item: ast::GenericParam) -> ast::GenericParamList { pub fn append_param(&self, item: ast::GenericParam) -> ast::GenericParamList {
let is_multiline = self.syntax().text().contains_char('\n'); let space = tokens::single_space();
let ws;
let space = if is_multiline {
ws = tokens::WsBuilder::new(&format!(
"\n{} ",
leading_indent(self.syntax()).unwrap_or_default()
));
ws.ws()
} else {
tokens::single_space()
};
let mut to_insert: ArrayVec<[SyntaxElement; 4]> = ArrayVec::new(); let mut to_insert: ArrayVec<[SyntaxElement; 4]> = ArrayVec::new();
if self.generic_params().next().is_some() { if self.generic_params().next().is_some() {
@ -529,11 +519,6 @@ impl ast::GenericParamList {
}; };
}; };
if !is_multiline {
// don't insert comma before angle
to_insert.pop();
}
let position = match self.generic_params().last() { let position = match self.generic_params().last() {
Some(it) => after_field!(it), Some(it) => after_field!(it),
None => after_l_angle!(), None => after_l_angle!(),