From fac4d280129518d921a85ee40a56358801864cc7 Mon Sep 17 00:00:00 2001 From: XFFXFF <1247714429@qq.com> Date: Mon, 6 Jun 2022 19:20:01 +0800 Subject: [PATCH] change 'loop to 'l, as 'loop is not a valid label name --- .../src/handlers/add_label_to_loop.rs | 36 +++++++++---------- crates/ide-assists/src/tests/generated.rs | 6 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/crates/ide-assists/src/handlers/add_label_to_loop.rs b/crates/ide-assists/src/handlers/add_label_to_loop.rs index 5d7774af5bc..2b32d6c1059 100644 --- a/crates/ide-assists/src/handlers/add_label_to_loop.rs +++ b/crates/ide-assists/src/handlers/add_label_to_loop.rs @@ -18,9 +18,9 @@ use crate::{AssistContext, AssistId, AssistKind, Assists}; // -> // ``` // fn main() { -// 'loop: loop { -// break 'loop; -// continue 'loop; +// 'l: loop { +// break 'l; +// continue 'l; // } // } // ``` @@ -47,17 +47,17 @@ pub(crate) fn add_label_to_loop(acc: &mut Assists, ctx: &AssistContext) -> Optio match expr { ast::Expr::BreakExpr(break_expr) => { if let Some(break_token) = break_expr.break_token() { - builder.insert(break_token.text_range().end(), " 'loop") + builder.insert(break_token.text_range().end(), " 'l") } } ast::Expr::ContinueExpr(continue_expr) => { if let Some(continue_token) = continue_expr.continue_token() { - builder.insert(continue_token.text_range().end(), " 'loop") + builder.insert(continue_token.text_range().end(), " 'l") } } ast::Expr::LoopExpr(loop_expr) => { if let Some(loop_token) = loop_expr.loop_token() { - builder.insert(loop_token.text_range().start(), "'loop: ") + builder.insert(loop_token.text_range().start(), "'l: ") } } _ => {} @@ -86,9 +86,9 @@ fn main() { }"#, r#" fn main() { - 'loop: loop { - break 'loop; - continue 'loop; + 'l: loop { + break 'l; + continue 'l; } }"#, ); @@ -111,9 +111,9 @@ fn main() { }"#, r#" fn main() { - 'loop: loop { - break 'loop; - continue 'loop; + 'l: loop { + break 'l; + continue 'l; loop { break; continue; @@ -143,9 +143,9 @@ fn main() { loop { break; continue; - 'loop: loop { - break 'loop; - continue 'loop; + 'l: loop { + break 'l; + continue 'l; } } }"#, @@ -158,9 +158,9 @@ fn main() { add_label_to_loop, r#" fn main() { - 'loop: loop$0 { - break 'loop; - continue 'loop; + 'l: loop$0 { + break 'l; + continue 'l; } }"#, ); diff --git a/crates/ide-assists/src/tests/generated.rs b/crates/ide-assists/src/tests/generated.rs index a519c9b8253..e8d48607be0 100644 --- a/crates/ide-assists/src/tests/generated.rs +++ b/crates/ide-assists/src/tests/generated.rs @@ -116,9 +116,9 @@ fn main() { "#####, r#####" fn main() { - 'loop: loop { - break 'loop; - continue 'loop; + 'l: loop { + break 'l; + continue 'l; } } "#####,