|
1 | 1 | use std::iter::once; |
2 | 2 |
|
3 | | -use hir::Semantics; |
4 | 3 | use either::Either; |
| 4 | +use hir::{Semantics, TypeInfo}; |
5 | 5 | use ide_db::{RootDatabase, ty_filter::TryEnum}; |
6 | 6 | use syntax::{ |
7 | 7 | AstNode, |
8 | | - SyntaxKind::{FN, FOR_EXPR, LOOP_EXPR, WHILE_EXPR, WHITESPACE}, |
| 8 | + SyntaxKind::{CLOSURE_EXPR, FN, FOR_EXPR, LOOP_EXPR, WHILE_EXPR, WHITESPACE}, |
9 | 9 | SyntaxNode, T, |
10 | 10 | ast::{ |
11 | 11 | self, |
@@ -228,16 +228,26 @@ fn early_expression( |
228 | 228 | parent_container: SyntaxNode, |
229 | 229 | sema: &Semantics<'_, RootDatabase>, |
230 | 230 | ) -> Option<ast::Expr> { |
| 231 | + let return_none_expr = || { |
| 232 | + let none_expr = make::expr_path(make::ext::ident_path("None")); |
| 233 | + make::expr_return(Some(none_expr)) |
| 234 | + }; |
231 | 235 | if let Some(fn_) = ast::Fn::cast(parent_container.clone()) |
232 | 236 | && let Some(fn_def) = sema.to_def(&fn_) |
233 | 237 | && let Some(TryEnum::Option) = TryEnum::from_ty(sema, &fn_def.ret_type(sema.db)) |
234 | 238 | { |
235 | | - let none_expr = make::expr_path(make::ext::ident_path("None")); |
236 | | - return Some(make::expr_return(Some(none_expr))); |
| 239 | + return Some(return_none_expr()); |
| 240 | + } |
| 241 | + if let Some(body) = ast::ClosureExpr::cast(parent_container.clone()).and_then(|it| it.body()) |
| 242 | + && let Some(ret_ty) = sema.type_of_expr(&body).map(TypeInfo::original) |
| 243 | + && let Some(TryEnum::Option) = TryEnum::from_ty(sema, &ret_ty) |
| 244 | + { |
| 245 | + return Some(return_none_expr()); |
237 | 246 | } |
| 247 | + |
238 | 248 | Some(match parent_container.kind() { |
239 | 249 | WHILE_EXPR | LOOP_EXPR | FOR_EXPR => make::expr_continue(None), |
240 | | - FN => make::expr_return(None), |
| 250 | + FN | CLOSURE_EXPR => make::expr_return(None), |
241 | 251 | _ => return None, |
242 | 252 | }) |
243 | 253 | } |
@@ -329,6 +339,40 @@ fn ret_option() -> Option<()> { |
329 | 339 | ); |
330 | 340 | } |
331 | 341 |
|
| 342 | + #[test] |
| 343 | + fn convert_inside_closure() { |
| 344 | + check_assist( |
| 345 | + convert_to_guarded_return, |
| 346 | + r#" |
| 347 | +fn main() { |
| 348 | + let _f = || { |
| 349 | + bar(); |
| 350 | + if$0 true { |
| 351 | + foo(); |
| 352 | +
|
| 353 | + // comment |
| 354 | + bar(); |
| 355 | + } |
| 356 | + } |
| 357 | +} |
| 358 | +"#, |
| 359 | + r#" |
| 360 | +fn main() { |
| 361 | + let _f = || { |
| 362 | + bar(); |
| 363 | + if false { |
| 364 | + return; |
| 365 | + } |
| 366 | + foo(); |
| 367 | +
|
| 368 | + // comment |
| 369 | + bar(); |
| 370 | + } |
| 371 | +} |
| 372 | +"#, |
| 373 | + ); |
| 374 | + } |
| 375 | + |
332 | 376 | #[test] |
333 | 377 | fn convert_let_inside_fn() { |
334 | 378 | check_assist( |
|
0 commit comments