Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

format

Browse source
This commit is contained in:
jDomantas 2020-08-17 11:36:46 +03:00
parent 38e3088a56
commit a565a42f46
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -119,27 +119,23 @@ impl ast::AssocItemList {
/// Remove extra whitespace between last item and closing curly brace. /// Remove extra whitespace between last item and closing curly brace.
fn fixup_trailing_whitespace(&self) -> Option<ast::AssocItemList> { fn fixup_trailing_whitespace(&self) -> Option<ast::AssocItemList> {
let first_token_after_items = self let first_token_after_items =
.assoc_items() self.assoc_items().last()?.syntax().next_sibling_or_token()?;
.last()? let last_token_before_curly = self.r_curly_token()?.prev_sibling_or_token()?;
.syntax()
.next_sibling_or_token()?;
let last_token_before_curly = self
.r_curly_token()?
.prev_sibling_or_token()?;
if last_token_before_curly != first_token_after_items { if last_token_before_curly != first_token_after_items {
// there is something more between last item and // there is something more between last item and
// right curly than just whitespace - bail out // right curly than just whitespace - bail out
return None; return None;
} }
let whitespace = last_token_before_curly let whitespace =
.clone() last_token_before_curly.clone().into_token().and_then(ast::Whitespace::cast)?;
.into_token()
.and_then(ast::Whitespace::cast)?;
let text = whitespace.syntax().text(); let text = whitespace.syntax().text();
let newline = text.rfind("\n")?; let newline = text.rfind("\n")?;
let keep = tokens::WsBuilder::new(&text[newline..]); let keep = tokens::WsBuilder::new(&text[newline..]);
Some(self.replace_children(first_token_after_items..=last_token_before_curly, std::iter::once(keep.ws().into()))) Some(self.replace_children(
first_token_after_items..=last_token_before_curly,
std::iter::once(keep.ws().into()),
))
} }
} }