about summary refs log tree commit diff
diff options
context:
space:
mode:
authorXFFXFF <1247714429@qq.com>2022-06-06 19:20:01 +0800
committerXFFXFF <1247714429@qq.com>2022-06-11 07:11:56 +0800
commitfac4d280129518d921a85ee40a56358801864cc7 (patch)
tree58ffb636bebc15b1db9e15d37ae37bb34c2ed9ce
parent0121cc1e2977c215d7f5222b33a3aa1def664226 (diff)
downloadrust-fac4d280129518d921a85ee40a56358801864cc7.tar.gz
rust-fac4d280129518d921a85ee40a56358801864cc7.zip
change 'loop to 'l, as 'loop is not a valid label name
-rw-r--r--crates/ide-assists/src/handlers/add_label_to_loop.rs36
-rw-r--r--crates/ide-assists/src/tests/generated.rs6
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;
     }
 }
 "#####,