From f90462efe568d83f3bf66544c06dd0529c80b49c Mon Sep 17 00:00:00 2001
From: Teddy Katz <teddy.katz@gmail.com>
Date: Mon, 9 Jan 2017 17:08:03 -0500
Subject: [PATCH] Fix: no-extra-label autofix should not remove labels used
 elsewhere (#7885)

---
 lib/rules/no-extra-label.js       |  7 +-----
 tests/lib/rules/no-extra-label.js | 39 +++++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/lib/rules/no-extra-label.js b/lib/rules/no-extra-label.js
index 22afbf405b7..b89267de93d 100644
--- a/lib/rules/no-extra-label.js
+++ b/lib/rules/no-extra-label.js
@@ -110,12 +110,7 @@ module.exports = {
                             node: labelNode,
                             message: "This label '{{name}}' is unnecessary.",
                             data: labelNode,
-                            fix(fixer) {
-                                return fixer.replaceTextRange(
-                                    [info.label.range[0], labelNode.range[1]],
-                                    sourceCode.text.slice(info.label.parent.body.range[0], sourceCode.getFirstToken(node).range[1])
-                                );
-                            }
+                            fix: fixer => fixer.removeRange([sourceCode.getFirstToken(node).range[1], labelNode.range[1]])
                         });
                     }
                     return;
diff --git a/tests/lib/rules/no-extra-label.js b/tests/lib/rules/no-extra-label.js
index b7d08500335..0362a655f0a 100644
--- a/tests/lib/rules/no-extra-label.js
+++ b/tests/lib/rules/no-extra-label.js
@@ -41,54 +41,73 @@ ruleTester.run("no-extra-label", rule, {
     invalid: [
         {
             code: "A: while (a) break A;",
-            output: "while (a) break;",
+            output: "A: while (a) break;",
             errors: ["This label 'A' is unnecessary."]
         },
         {
             code: "A: while (a) { B: { continue A; } }",
-            output: "while (a) { B: { continue; } }",
+            output: "A: while (a) { B: { continue; } }",
             errors: ["This label 'A' is unnecessary."]
         },
         {
             code: "X: while (x) { A: while (a) { B: { break A; break B; continue X; } } }",
-            output: "X: while (x) { while (a) { B: { break; break B; continue X; } } }",
+            output: "X: while (x) { A: while (a) { B: { break; break B; continue X; } } }",
             errors: ["This label 'A' is unnecessary."]
         },
         {
             code: "A: do { break A; } while (a);",
-            output: "do { break; } while (a);",
+            output: "A: do { break; } while (a);",
             errors: ["This label 'A' is unnecessary."]
         },
         {
             code: "A: for (;;) { break A; }",
-            output: "for (;;) { break; }",
+            output: "A: for (;;) { break; }",
             errors: ["This label 'A' is unnecessary."]
         },
         {
             code: "A: for (a in obj) { break A; }",
-            output: "for (a in obj) { break; }",
+            output: "A: for (a in obj) { break; }",
             errors: ["This label 'A' is unnecessary."]
         },
         {
             code: "A: for (a of ary) { break A; }",
-            output: "for (a of ary) { break; }",
+            output: "A: for (a of ary) { break; }",
             errors: ["This label 'A' is unnecessary."],
             parserOptions: { ecmaVersion: 6 }
         },
         {
             code: "A: switch (a) { case 0: break A; }",
-            output: "switch (a) { case 0: break; }",
+            output: "A: switch (a) { case 0: break; }",
             errors: ["This label 'A' is unnecessary."]
         },
         {
             code: "X: while (x) { A: switch (a) { case 0: break A; } }",
-            output: "X: while (x) { switch (a) { case 0: break; } }",
+            output: "X: while (x) { A: switch (a) { case 0: break; } }",
             errors: ["This label 'A' is unnecessary."]
         },
         {
             code: "X: switch (a) { case 0: A: while (b) break A; }",
-            output: "X: switch (a) { case 0: while (b) break; }",
+            output: "X: switch (a) { case 0: A: while (b) break; }",
             errors: ["This label 'A' is unnecessary."]
+        },
+        {
+            code: `\
+                A: while (true) {
+                    break A;
+                    while (true) {
+                        break A;
+                    }
+                }
+            `,
+            output: `\
+                A: while (true) {
+                    break;
+                    while (true) {
+                        break A;
+                    }
+                }
+            `,
+            errors: [{ message: "This label 'A' is unnecessary.", type: "Identifier", line: 2 }]
         }
     ]
 });