-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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 #15752 - Young-Flash:replace_is_method_with_if_let_meth…
…od, r=HKalbasi feat: add replace_is_ok_with_if_let_ok assist following rust-lang/rust-analyzer#15743
- Loading branch information
Showing
3 changed files
with
126 additions
and
92 deletions.
There are no files selected for viewing
124 changes: 124 additions & 0 deletions
124
crates/ide-assists/src/handlers/replace_is_method_with_if_let_method.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,124 @@ | ||
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` or `if x.is_ok()` with `if let Ok(_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_method_with_if_let_method( | ||
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()?; | ||
match name_ref.text().as_str() { | ||
"is_some" | "is_ok" => { | ||
let receiver = call_expr.receiver()?; | ||
let target = call_expr.syntax().text_range(); | ||
|
||
let (assist_id, message, text) = if name_ref.text() == "is_some" { | ||
("replace_is_some_with_if_let_some", "Replace `is_some` with `if let Some`", "Some") | ||
} else { | ||
("replace_is_ok_with_if_let_ok", "Replace `is_ok` with `if let Ok`", "Ok") | ||
}; | ||
|
||
acc.add(AssistId(assist_id, AssistKind::RefactorRewrite), message, target, |edit| { | ||
let replacement = format!("let {}(_tmp) = {}", text, receiver); | ||
edit.replace(target, replacement); | ||
}) | ||
} | ||
_ => return None, | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use crate::tests::{check_assist, check_assist_not_applicable}; | ||
|
||
use super::replace_is_method_with_if_let_method; | ||
|
||
#[test] | ||
fn replace_is_some_with_if_let_some_works() { | ||
check_assist( | ||
replace_is_method_with_if_let_method, | ||
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_method_with_if_let_method, | ||
r#" | ||
fn main() { | ||
let x = Some(1); | ||
if x.is_non$0e() {} | ||
} | ||
"#, | ||
); | ||
} | ||
|
||
#[test] | ||
fn replace_is_ok_with_if_let_ok_works() { | ||
check_assist( | ||
replace_is_method_with_if_let_method, | ||
r#" | ||
fn main() { | ||
let x = Ok(1); | ||
if x.is_o$0k() {} | ||
} | ||
"#, | ||
r#" | ||
fn main() { | ||
let x = Ok(1); | ||
if let Ok(_tmp) = x {} | ||
} | ||
"#, | ||
); | ||
} | ||
|
||
#[test] | ||
fn replace_is_ok_with_if_let_ok_not_applicable() { | ||
check_assist_not_applicable( | ||
replace_is_method_with_if_let_method, | ||
r#" | ||
fn main() { | ||
let x = Ok(1); | ||
if x.is_e$0rr() {} | ||
} | ||
"#, | ||
); | ||
} | ||
} |
90 changes: 0 additions & 90 deletions
90
crates/ide-assists/src/handlers/replace_is_some_with_if_let_some.rs
This file was deleted.
Oops, something went wrong.
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