nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 15:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #13869 - Veykril:exit-points, r=Veykril

Browse Source 
Improve exit point highlighting for non-loop loops in tail position
This commit is contained in:
bors 2022-12-31 11:08:54 +00:00
commit f5e7bf2ea5
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/ide-db/src/syntax_helpers/node_ext.rs
View File

@ -252,6 +252,11 @@ pub fn is_pattern_cond(expr: ast::Expr) -> bool {
/// Note that modifying the tree while iterating it will cause undefined iteration which might
/// potentially results in an out of bounds panic.
pub fn for_each_tail_expr(expr: &ast::Expr, cb: &mut dyn FnMut(&ast::Expr)) {
let walk_loop = |cb: &mut dyn FnMut(&ast::Expr), label, body: Option<ast::BlockExpr>| {
for_each_break_expr(label, body.and_then(|it| it.stmt_list()), &mut |b| {
cb(&ast::Expr::BreakExpr(b))
})
};
match expr {
ast::Expr::BlockExpr(b) => {
match b.modifier() {
@ -291,11 +296,9 @@ pub fn for_each_tail_expr(expr: &ast::Expr, cb: &mut dyn FnMut(&ast::Expr)) {
}
}
}
ast::Expr::LoopExpr(l) => {
for_each_break_expr(l.label(), l.loop_body().and_then(|it| it.stmt_list()), &mut |b| {
cb(&ast::Expr::BreakExpr(b))
})
}
ast::Expr::LoopExpr(l) => walk_loop(cb, l.label(), l.loop_body()),
ast::Expr::WhileExpr(w) => walk_loop(cb, w.label(), w.loop_body()),
ast::Expr::ForExpr(f) => walk_loop(cb, f.label(), f.loop_body()),
ast::Expr::MatchExpr(m) => {
if let Some(arms) = m.match_arm_list() {
arms.arms().filter_map(|arm| arm.expr()).for_each(|e| for_each_tail_expr(&e, cb));
@ -311,7 +314,6 @@ pub fn for_each_tail_expr(expr: &ast::Expr, cb: &mut dyn FnMut(&ast::Expr)) {
| ast::Expr::ClosureExpr(_)
| ast::Expr::ContinueExpr(_)
| ast::Expr::FieldExpr(_)
| ast::Expr::ForExpr(_)
| ast::Expr::IndexExpr(_)
| ast::Expr::Literal(_)
| ast::Expr::MacroExpr(_)
@ -325,7 +327,6 @@ pub fn for_each_tail_expr(expr: &ast::Expr, cb: &mut dyn FnMut(&ast::Expr)) {
| ast::Expr::ReturnExpr(_)
| ast::Expr::TryExpr(_)
| ast::Expr::TupleExpr(_)
| ast::Expr::WhileExpr(_)
| ast::Expr::LetExpr(_)
| ast::Expr::UnderscoreExpr(_)
| ast::Expr::YieldExpr(_)

17
crates/ide/src/highlight_related.rs
View File

@ -765,6 +765,23 @@ fn foo() ->$0 u32 {
);
}
#[test]
fn test_hl_inner_tail_exit_points_loops() {
check(
r#"
fn foo() ->$0 u32 {
'foo: while { return 0; true } {
// ^^^^^^
break 'foo 0;
// ^^^^^
return 0;
// ^^^^^^
}
}
"#,
);
}
#[test]
fn test_hl_break_loop() {
check(