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

typo fix

Browse source
This commit is contained in:
Alex Vasilev 2023-01-21 00:30:38 +05:30
parent 69ffbe25a1
commit ddb2f8760b
1 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
crates/ide-assists/src/handlers/add_braces.rs
View file

@ -5,36 +5,9 @@ use syntax::{
use crate::{AssistContext, AssistId, AssistKind, Assists};
enum ParentType {
MatchArmExpr,
ClosureExpr,
}
fn get_replacement_node(ctx: &AssistContext<'_>) -> Option<(ParentType, ast::Expr)> {
if let Some(match_arm) = ctx.find_node_at_offset::<ast::MatchArm>() {
let match_arm_expr = match_arm.syntax().children().find_map(ast::Expr::cast)?;
if matches!(match_arm_expr, ast::Expr::BlockExpr(_)) {
return None;
}
return Some((ParentType::MatchArmExpr, match_arm_expr));
} else if let Some(closure_expr) = ctx.find_node_at_offset::<ast::ClosureExpr>() {
let body = closure_expr.body()?;
if matches!(body, ast::Expr::BlockExpr(_)) {
return None;
}
return Some((ParentType::ClosureExpr, body));
}
None
}
// Assist: add_braces
//
// Adds braces to lamda and match arm expressions
// Adds braces to lambda and match arm expressions.
//
// ```
// fn foo(n: i32) -> i32 {
@ -61,7 +34,7 @@ pub(crate) fn add_braces(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<(
acc.add(
AssistId("wrap_with_braces", AssistKind::RefactorRewrite),
match expr_type {
ParentType::ClosureExpr => "Add braces to lamda expression",
ParentType::ClosureExpr => "Add braces to lambda expression",
ParentType::MatchArmExpr => "Add braces to arm expression",
},
expr.syntax().text_range(),
@ -78,6 +51,33 @@ pub(crate) fn add_braces(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<(
Some(())
}
enum ParentType {
MatchArmExpr,
ClosureExpr,
}
fn get_replacement_node(ctx: &AssistContext<'_>) -> Option<(ParentType, ast::Expr)> {
if let Some(match_arm) = ctx.find_node_at_offset::<ast::MatchArm>() {
let match_arm_expr = match_arm.syntax().children().find_map(ast::Expr::cast)?;
if matches!(match_arm_expr, ast::Expr::BlockExpr(_)) {
return None;
}
return Some((ParentType::MatchArmExpr, match_arm_expr));
} else if let Some(closure_expr) = ctx.find_node_at_offset::<ast::ClosureExpr>() {
let body = closure_expr.body()?;
if matches!(body, ast::Expr::BlockExpr(_)) {
return None;
}
return Some((ParentType::ClosureExpr, body));
}
None
}
#[cfg(test)]
mod tests {
use crate::tests::{check_assist, check_assist_not_applicable};