-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #15743 - Young-Flash:replace_is_some_with_if_let_some, …
…r=HKalbasi add replace_is_some_with_if_let_some assist This is a basic impl, if it is ok, `if my_result.is_ok()`-> `if let Ok(_x) = my_result `will be add next. close rust-lang/rust-analyzer#12977
- Loading branch information
Showing
3 changed files
with
111 additions
and
0 deletions.
There are no files selected for viewing
90 changes: 90 additions & 0 deletions
90
crates/ide-assists/src/handlers/replace_is_some_with_if_let_some.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
use syntax::ast::{self, AstNode}; | ||
|
||
use crate::{AssistContext, AssistId, AssistKind, Assists}; | ||
|
||
// Assist: replace_is_some_with_if_let_some | ||
// | ||
// Replace `if x.is_some()` with `if let Some(_tmp) = x`. | ||
// | ||
// ``` | ||
// fn main() { | ||
// let x = Some(1); | ||
// if x.is_som$0e() {} | ||
// } | ||
// ``` | ||
// -> | ||
// ``` | ||
// fn main() { | ||
// let x = Some(1); | ||
// if let Some(_tmp) = x {} | ||
// } | ||
// ``` | ||
pub(crate) fn replace_is_some_with_if_let_some( | ||
acc: &mut Assists, | ||
ctx: &AssistContext<'_>, | ||
) -> Option<()> { | ||
let if_expr = ctx.find_node_at_offset::<ast::IfExpr>()?; | ||
|
||
let cond = if_expr.condition()?; | ||
let call_expr = match cond { | ||
ast::Expr::MethodCallExpr(call) => call, | ||
_ => return None, | ||
}; | ||
|
||
let name_ref = call_expr.name_ref()?; | ||
if name_ref.text() != "is_some" { | ||
return None; | ||
} | ||
|
||
let receiver = call_expr.receiver()?; | ||
let target = call_expr.syntax().text_range(); | ||
|
||
acc.add( | ||
AssistId("replace_is_some_with_if_let_some", AssistKind::RefactorRewrite), | ||
"Replace `is_some` with `if let Some`", | ||
target, | ||
|edit| { | ||
let replacement = format!("let Some(_tmp) = {}", receiver); | ||
edit.replace(target, replacement); | ||
}, | ||
) | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use crate::tests::{check_assist, check_assist_not_applicable}; | ||
|
||
use super::replace_is_some_with_if_let_some; | ||
|
||
#[test] | ||
fn replace_is_some_with_if_let_some_works() { | ||
check_assist( | ||
replace_is_some_with_if_let_some, | ||
r#" | ||
fn main() { | ||
let x = Some(1); | ||
if x.is_som$0e() {} | ||
} | ||
"#, | ||
r#" | ||
fn main() { | ||
let x = Some(1); | ||
if let Some(_tmp) = x {} | ||
} | ||
"#, | ||
); | ||
} | ||
|
||
#[test] | ||
fn replace_is_some_with_if_let_some_not_applicable() { | ||
check_assist_not_applicable( | ||
replace_is_some_with_if_let_some, | ||
r#" | ||
fn main() { | ||
let x = Some(1); | ||
if x.is_non$0e() {} | ||
} | ||
"#, | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters