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

Simplify remove_parentheses's implementation

Browse source
This commit is contained in:
Maybe Waffle 2022-12-08 18:54:08 +00:00
parent 8d42439a7d
commit ba6f0befc8
1 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
use syntax::{ast, AstNode, SyntaxKind, TextRange}; use syntax::{ast, AstNode};
use crate::{AssistContext, AssistId, AssistKind, Assists}; use crate::{AssistContext, AssistId, AssistKind, Assists};
@ -19,43 +19,28 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
// ``` // ```
pub(crate) fn remove_parentheses(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { pub(crate) fn remove_parentheses(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
let parens = ctx.find_node_at_offset::<ast::ParenExpr>()?; let parens = ctx.find_node_at_offset::<ast::ParenExpr>()?;
let l_paren = parens.l_paren_token()?;
let r_paren = parens.r_paren_token()?;
let cursor_in_range = l_paren.text_range().contains_range(ctx.selection_trimmed()) let cursor_in_range =
|| r_paren.text_range().contains_range(ctx.selection_trimmed()); parens.l_paren_token()?.text_range().contains_range(ctx.selection_trimmed())
|| parens.r_paren_token()?.text_range().contains_range(ctx.selection_trimmed());
if !cursor_in_range { if !cursor_in_range {
return None; return None;
} }
let expr = parens.expr()?; let expr = parens.expr()?;
let parent = ast::Expr::cast(parens.syntax().parent()?); let parent = ast::Expr::cast(parens.syntax().parent()?);
let is_ok_to_remove = expr.precedence() >= parent.as_ref().and_then(ast::Expr::precedence); let is_ok_to_remove = expr.precedence() >= parent.as_ref().and_then(ast::Expr::precedence);
if !is_ok_to_remove { if !is_ok_to_remove {
return None; return None;
} }
let delete_from_l = l_paren.text_range().start();
let delete_to_l = match l_paren.next_token() {
Some(it) if it.kind() == SyntaxKind::WHITESPACE => it.text_range().end(),
_ => l_paren.text_range().end(),
};
let delete_from_r = match r_paren.prev_token() {
Some(it) if it.kind() == SyntaxKind::WHITESPACE => it.text_range().start(),
_ => r_paren.text_range().start(),
};
let delete_to_r = r_paren.text_range().end();
let target = parens.syntax().text_range(); let target = parens.syntax().text_range();
acc.add( acc.add(
AssistId("remove_parentheses", AssistKind::Refactor), AssistId("remove_parentheses", AssistKind::Refactor),
"Remove redundant parentheses", "Remove redundant parentheses",
target, target,
|builder| { |builder| builder.replace_ast(parens.into(), expr),
builder.delete(TextRange::new(delete_from_l, delete_to_l));
builder.delete(TextRange::new(delete_from_r, delete_to_r));
},
) )
} }