fix(51224): Go-to-definition on continue and break should jump around(?) corresponding statement

src/services/goToDefinition.ts

@@ -39,7 +39,25 @@ namespace ts.GoToDefinition {
             case SyntaxKind.CaseKeyword:
                 const switchStatement = findAncestor(node.parent, isSwitchStatement);
                 if (switchStatement) {
-                    return [createDefinitionInfoFromNode(switchStatement, "switch")];
+                    return [createDefinitionInfoFromNode(switchStatement)];
+                }
+                break;
+            case SyntaxKind.BreakKeyword:
+            case SyntaxKind.ContinueKeyword:
+                const breakStatement = node.parent as BreakStatement | ContinueStatement;
+                const { label } = breakStatement;
+                if (label) {
+                    const labelStatement = findAncestor(node.parent, n => isLabeledStatement(n) && n.label.text === label.text);
+                    if (labelStatement) {
+                        return [createDefinitionInfoFromNode(labelStatement)];
+                    }
+                } else {
+                    const statement = node.kind === SyntaxKind.BreakKeyword
+                        ? findAncestor(node.parent, n => isSwitchStatement(n) || isLoopStatement(n))
+                        : findAncestor(node.parent, isLoopStatement);
+                    if (statement) {
+                        return [createDefinitionInfoFromNode(statement)];
+                    }
                 }
                 break;
         }
@@ -523,7 +541,16 @@ namespace ts.GoToDefinition {
         }
     }
 
-    function createDefinitionInfoFromNode(node: Node, name: string): DefinitionInfo {
+    const kindNames: Partial<Record<SyntaxKind, string>> = {
+        [SyntaxKind.LabeledStatement]: 'label',
+        [SyntaxKind.SwitchStatement]: 'switch',
+        [SyntaxKind.ForStatement]: 'for',
+        [SyntaxKind.ForInStatement]: 'for-in',
+        [SyntaxKind.ForOfStatement]: 'for-of',
+        [SyntaxKind.WhileStatement]: 'while',
+    }
+
+    function createDefinitionInfoFromNode(node: Node, name: string = kindNames[node.kind] || ''): DefinitionInfo {
         const sourceFile = node.getSourceFile();
         return {
             fileName: sourceFile.fileName,
@@ -539,4 +566,8 @@ namespace ts.GoToDefinition {
             failedAliasResolution: undefined,
         };
     }
+
+    function isLoopStatement(node: Node): node is WhileStatement | ForStatement | ForInStatement | ForOfStatement {
+        return isWhileStatement(node) || isForStatement(node) || isForInStatement(node) || isForOfStatement(node);
+    }
 }

tests/cases/fourslash/goToDefinitionForBreak1.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/for (;;) {
+////  [|/*start*/break|];
+////}
+
+verify.goToDefinition("start", `end`);

tests/cases/fourslash/goToDefinitionForBreak2.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////for (;;) {
+////  [|/*start*/break|] test;
+////}
+
+verify.goToDefinition("start", []);

tests/cases/fourslash/goToDefinitionForBreak3.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////test: /*end*/for (;;) {
+////  [|/*start*/break|];
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForBreak4.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/test: for (;;) {
+////  [|/*start*/break|] test;
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForBreak5.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////label: for (;;) {
+////  [|/*start*/break|] test;
+////}
+
+verify.goToDefinition("start", []);

tests/cases/fourslash/goToDefinitionForBreak6.ts

@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/label: for (;;) {
+////  test: for (;;) {
+////    [|/*start*/break|] label;
+////  }
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForBreak7.ts

@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+
+////for (;;) {
+////  /*end*/for (;;) {
+////    [|/*start*/break|];
+////  }
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForContinue1.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/for (;;) {
+////  [|/*start*/continue|];
+////}
+
+verify.goToDefinition("start", `end`);

tests/cases/fourslash/goToDefinitionForContinue2.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////for (;;) {
+////  [|/*start*/continue|] test;
+////}
+
+verify.goToDefinition("start", []);

tests/cases/fourslash/goToDefinitionForContinue3.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////test: /*end*/for (;;) {
+////  [|/*start*/continue|];
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForContinue4.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/test: for (;;) {
+////  [|/*start*/continue|] test;
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForContinue5.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////label: for (;;) {
+////  [|/*start*/continue|] test;
+////}
+
+verify.goToDefinition("start", []);

tests/cases/fourslash/goToDefinitionForContinue6.ts

@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/label: for (;;) {
+////  test: for (;;) {
+////    [|/*start*/continue|] label;
+////  }
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForContinue7.ts

@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+
+////for (;;) {
+////  /*end*/for (;;) {
+////    [|/*start*/continue|];
+////  }
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForInBreak1.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/for (let a in obj) {
+////  [|/*start*/break|];
+////}
+
+verify.goToDefinition("start", `end`);

tests/cases/fourslash/goToDefinitionForInBreak2.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////for (let a in obj) {
+////  [|/*start*/break|] test;
+////}
+
+verify.goToDefinition("start", []);

tests/cases/fourslash/goToDefinitionForInBreak3.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////test: /*end*/for (let a in obj) {
+////  [|/*start*/break|];
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForInBreak4.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/test: for (let a in obj) {
+////  [|/*start*/break|] test;
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForInBreak5.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////label: for (let a in obj) {
+////  [|/*start*/break|] test;
+////}
+
+verify.goToDefinition("start", []);

tests/cases/fourslash/goToDefinitionForInBreak6.ts

@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/label: for (let a in obj) {
+////  test: for (let a in obj) {
+////    [|/*start*/break|] label;
+////  }
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForInBreak7.ts

@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+
+////for (let a in obj) {
+////  /*end*/for (let a in obj) {
+////    [|/*start*/break|];
+////  }
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForInContinue1.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/for (let a in obj) {
+////  [|/*start*/continue|];
+////}
+
+verify.goToDefinition("start", `end`);

tests/cases/fourslash/goToDefinitionForInContinue2.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////for (let a in obj) {
+////  [|/*start*/continue|] test;
+////}
+
+verify.goToDefinition("start", []);

tests/cases/fourslash/goToDefinitionForInContinue3.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////test: /*end*/for (let a in obj) {
+////  [|/*start*/continue|];
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForInContinue4.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/test: for (let a in obj) {
+////  [|/*start*/continue|] test;
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForInContinue5.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////label: for (let a in obj) {
+////  [|/*start*/continue|] test;
+////}
+
+verify.goToDefinition("start", []);

tests/cases/fourslash/goToDefinitionForInContinue6.ts

@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/label: for (let a in obj) {
+////  test: for (let a in obj) {
+////    [|/*start*/continue|] label;
+////  }
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForInContinue7.ts

@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+
+////for (let a in obj) {
+////  /*end*/for (let a in obj) {
+////    [|/*start*/continue|];
+////  }
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForOfBreak1.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/for (let a of obj) {
+////  [|/*start*/break|];
+////}
+
+verify.goToDefinition("start", `end`);

tests/cases/fourslash/goToDefinitionForOfBreak2.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////for (let a of obj) {
+////  [|/*start*/break|] test;
+////}
+
+verify.goToDefinition("start", []);

tests/cases/fourslash/goToDefinitionForOfBreak3.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////test: /*end*/for (let a of obj) {
+////  [|/*start*/break|];
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForOfBreak4.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/test: for (let a of obj) {
+////  [|/*start*/break|] test;
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForOfBreak5.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////label: for (let a of obj) {
+////  [|/*start*/break|] test;
+////}
+
+verify.goToDefinition("start", []);

tests/cases/fourslash/goToDefinitionForOfBreak6.ts

@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/label: for (let a of obj) {
+////  test: for (let a of obj) {
+////    [|/*start*/break|] label;
+////  }
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForOfBreak7.ts

@@ -0,0 +1,9 @@
+/// <reference path="fourslash.ts" />
+
+////for (let a of obj) {
+////  /*end*/for (let a of obj) {
+////    [|/*start*/break|];
+////  }
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForOfContinue1.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/for (let a of obj) {
+////  [|/*start*/continue|];
+////}
+
+verify.goToDefinition("start", `end`);

tests/cases/fourslash/goToDefinitionForOfContinue2.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////for (let a of obj) {
+////  [|/*start*/continue|] test;
+////}
+
+verify.goToDefinition("start", []);

tests/cases/fourslash/goToDefinitionForOfContinue3.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////test: /*end*/for (let a of obj) {
+////  [|/*start*/continue|];
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForOfContinue4.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+/////*end*/test: for (let a of obj) {
+////  [|/*start*/continue|] test;
+////}
+
+verify.goToDefinition("start", "end");

tests/cases/fourslash/goToDefinitionForOfContinue5.ts

@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts" />
+
+////label: for (let a of obj) {
+////  [|/*start*/continue|] test;
+////}
+
+verify.goToDefinition("start", []);