fix: navigate to label directly when perform 'goto-def' on control-fl…

…ow kw See rust-lang/rust-analyzer#17542 (comment)
RalfJung · Jul 19, 2024 · c3a95fa · c3a95fa
1 parent fe353c8
commit c3a95fa
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/tools/rust-analyzer/crates/ide/src/goto_definition.rs b/src/tools/rust-analyzer/crates/ide/src/goto_definition.rs
@@ -351,8 +351,8 @@ fn try_find_loop(
                     if blk.label().is_some() && label_matches(blk.label()) =>
                 {
                     let expr = ast::Expr::BlockExpr(blk.clone());
-                    let lbl_tok = blk.label().unwrap().lifetime()?.lifetime_ident_token()?.into();
-                    let nav = NavigationTarget::from_expr(db, InFile::new(file_id, expr), lbl_tok);
+                    let lbl = blk.label().unwrap().syntax().clone().into();
+                    let nav = NavigationTarget::from_expr(db, InFile::new(file_id, expr), lbl);
                     return Some(nav);
                 }
                 _ => {}
@@ -2618,7 +2618,7 @@ fn main() {
             r#"
 fn main() {
     'a:{
- // ^^
+ // ^^^
         break$0 'a;
     }
 }