Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 14:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

move parentheses judge logic into builder

Browse source
This commit is contained in:
Young-Flash 2023-11-22 14:11:00 +08:00
parent be62e0bf08
commit bd5a63b208
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
crates/ide-assists/src/handlers/remove_parentheses.rs
View file

@ -34,27 +34,24 @@ pub(crate) fn remove_parentheses(acc: &mut Assists, ctx: &AssistContext<'_>) ->
return None;
}
// we should use `find_node_at_offset` at `SourceFile` level to get expectant `Between`
let token_at_offset = ctx
.find_node_at_offset::<ast::SourceFile>()?
.syntax()
.token_at_offset(parens.syntax().text_range().start());
let need_to_add_ws = match token_at_offset {
syntax::TokenAtOffset::Between(before, _after) => {
// anyother `SyntaxKind` we missing here?
let tokens = vec![T![&], T![!], T!['('], T!['['], T!['{']];
before.kind() != SyntaxKind::WHITESPACE && !tokens.contains(&before.kind())
}
_ => false,
};
let expr = if need_to_add_ws { format!(" {}", expr) } else { expr.to_string() };
let target = parens.syntax().text_range();
acc.add(
AssistId("remove_parentheses", AssistKind::Refactor),
"Remove redundant parentheses",
target,
|builder| builder.replace(parens.syntax().text_range(), expr),
|builder| {
let prev_token = parens.syntax().first_token().and_then(|it| it.prev_token());
let need_to_add_ws = match prev_token {
Some(it) => {
let tokens = vec![T![&], T![!], T!['('], T!['['], T!['{']];
it.kind() != SyntaxKind::WHITESPACE && !tokens.contains(&it.kind())
}
None => false,
};
let expr = if need_to_add_ws { format!(" {}", expr) } else { expr.to_string() };
builder.replace(parens.syntax().text_range(), expr)
},
)
}