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

Fix insert_whitespaces

Browse source
This commit is contained in:
Edwin Cheng 2019-11-22 02:35:49 +08:00
parent 67a58e4af1
commit 144dc6652c
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
crates/ra_ide_api/src/expand_macro.rs
View file

@ -84,24 +84,19 @@ fn insert_whitespaces(syn: SyntaxNode) -> String {
}; };
res += &match token.kind() { res += &match token.kind() {
k @ _ k @ _ if is_text(k) && is_next(|it| !it.is_punct(), true) => {
if (k.is_keyword() || k.is_literal() || k == IDENT)
&& is_next(|it| !it.is_punct(), true) =>
{
token.text().to_string() + " " token.text().to_string() + " "
} }
L_CURLY if is_next(|it| it != R_CURLY, true) => { L_CURLY if is_next(|it| it != R_CURLY, true) => {
indent += 1; indent += 1;
format!(" {{\n{}", " ".repeat(indent)) let leading_space = if is_last(|it| is_text(it), false) { " " } else { "" };
format!("{}{{\n{}", leading_space, " ".repeat(indent))
} }
R_CURLY if is_last(|it| it != L_CURLY, true) => { R_CURLY if is_last(|it| it != L_CURLY, true) => {
indent = indent.checked_sub(1).unwrap_or(0); indent = indent.checked_sub(1).unwrap_or(0);
format!("\n}}{}", " ".repeat(indent)) format!("\n{}}}", " ".repeat(indent))
}
R_CURLY => {
indent = indent.checked_sub(1).unwrap_or(0);
format!("}}\n{}", " ".repeat(indent))
} }
R_CURLY => format!("}}\n{}", " ".repeat(indent)),
T![;] => format!(";\n{}", " ".repeat(indent)), T![;] => format!(";\n{}", " ".repeat(indent)),
T![->] => " -> ".to_string(), T![->] => " -> ".to_string(),
T![=] => " = ".to_string(), T![=] => " = ".to_string(),
@ -112,7 +107,11 @@ fn insert_whitespaces(syn: SyntaxNode) -> String {
last = Some(token.kind()); last = Some(token.kind());
} }
res return res;
fn is_text(k: SyntaxKind) -> bool {
k.is_keyword() || k.is_literal() || k == IDENT
}
} }
#[cfg(test)] #[cfg(test)]