mirror of
				https://github.com/rust-lang/rust-analyzer.git
				synced 2025-10-31 03:54:42 +00:00 
			
		
		
		
	Add applicable in closure for convert_to_guarded_return
Example
---
```rust
fn main() {
    let _f = || {
        bar();
        if$0 true {
            foo();
            // comment
            bar();
        }
    }
}
```
->
```rust
fn main() {
    let _f = || {
        bar();
        if false {
            return;
        }
        foo();
        // comment
        bar();
    }
}
```
			
			
This commit is contained in:
		
							parent
							
								
									4e3b6b38dd
								
							
						
					
					
						commit
						3964af7bf6
					
				
					 1 changed files with 49 additions and 5 deletions
				
			
		|  | @ -1,11 +1,11 @@ | |||
| use std::iter::once; | ||||
| 
 | ||||
| use hir::Semantics; | ||||
| use either::Either; | ||||
| use hir::{Semantics, TypeInfo}; | ||||
| use ide_db::{RootDatabase, ty_filter::TryEnum}; | ||||
| use syntax::{ | ||||
|     AstNode, | ||||
|     SyntaxKind::{FN, FOR_EXPR, LOOP_EXPR, WHILE_EXPR, WHITESPACE}, | ||||
|     SyntaxKind::{CLOSURE_EXPR, FN, FOR_EXPR, LOOP_EXPR, WHILE_EXPR, WHITESPACE}, | ||||
|     SyntaxNode, T, | ||||
|     ast::{ | ||||
|         self, | ||||
|  | @ -228,16 +228,26 @@ fn early_expression( | |||
|     parent_container: SyntaxNode, | ||||
|     sema: &Semantics<'_, RootDatabase>, | ||||
| ) -> Option<ast::Expr> { | ||||
|     let return_none_expr = || { | ||||
|         let none_expr = make::expr_path(make::ext::ident_path("None")); | ||||
|         make::expr_return(Some(none_expr)) | ||||
|     }; | ||||
|     if let Some(fn_) = ast::Fn::cast(parent_container.clone()) | ||||
|         && let Some(fn_def) = sema.to_def(&fn_) | ||||
|         && let Some(TryEnum::Option) = TryEnum::from_ty(sema, &fn_def.ret_type(sema.db)) | ||||
|     { | ||||
|         let none_expr = make::expr_path(make::ext::ident_path("None")); | ||||
|         return Some(make::expr_return(Some(none_expr))); | ||||
|         return Some(return_none_expr()); | ||||
|     } | ||||
|     if let Some(body) = ast::ClosureExpr::cast(parent_container.clone()).and_then(|it| it.body()) | ||||
|         && let Some(ret_ty) = sema.type_of_expr(&body).map(TypeInfo::original) | ||||
|         && let Some(TryEnum::Option) = TryEnum::from_ty(sema, &ret_ty) | ||||
|     { | ||||
|         return Some(return_none_expr()); | ||||
|     } | ||||
| 
 | ||||
|     Some(match parent_container.kind() { | ||||
|         WHILE_EXPR | LOOP_EXPR | FOR_EXPR => make::expr_continue(None), | ||||
|         FN => make::expr_return(None), | ||||
|         FN | CLOSURE_EXPR => make::expr_return(None), | ||||
|         _ => return None, | ||||
|     }) | ||||
| } | ||||
|  | @ -329,6 +339,40 @@ fn ret_option() -> Option<()> { | |||
|         ); | ||||
|     } | ||||
| 
 | ||||
|     #[test] | ||||
|     fn convert_inside_closure() { | ||||
|         check_assist( | ||||
|             convert_to_guarded_return, | ||||
|             r#" | ||||
| fn main() { | ||||
|     let _f = || { | ||||
|         bar(); | ||||
|         if$0 true { | ||||
|             foo(); | ||||
| 
 | ||||
|             // comment
 | ||||
|             bar(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| "#,
 | ||||
|             r#" | ||||
| fn main() { | ||||
|     let _f = || { | ||||
|         bar(); | ||||
|         if false { | ||||
|             return; | ||||
|         } | ||||
|         foo(); | ||||
| 
 | ||||
|         // comment
 | ||||
|         bar(); | ||||
|     } | ||||
| } | ||||
| "#,
 | ||||
|         ); | ||||
|     } | ||||
| 
 | ||||
|     #[test] | ||||
|     fn convert_let_inside_fn() { | ||||
|         check_assist( | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 A4-Tacks
						A4-Tacks