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

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
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,7 @@ impl ast::Fn {
}
#[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() {
return self.replace_descendant(old, generic_args);
}
@ -485,17 +485,7 @@ impl ast::GenericParamList {
#[must_use]
pub fn append_param(&self, item: ast::GenericParam) -> ast::GenericParamList {
let is_multiline = self.syntax().text().contains_char('\n');
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 space = tokens::single_space();
let mut to_insert: ArrayVec<[SyntaxElement; 4]> = ArrayVec::new();
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() {
Some(it) => after_field!(it),
None => after_l_angle!(),