fix(51225): Go-to-definition on case or default should jump to the co…

…ntaining switch statement if available.
microsoft · Oct 21, 2022 · b9dbe02 · b9dbe02
1 parent 8ac4652
commit b9dbe02
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 4 deletions.
diff --git a/src/services/goToDefinition.ts b/src/services/goToDefinition.ts
@@ -26,10 +26,22 @@ namespace ts.GoToDefinition {
             return label ? [createDefinitionInfoFromName(typeChecker, label, ScriptElementKind.label, node.text, /*containerName*/ undefined!)] : undefined; // TODO: GH#18217
         }
 
-        if (node.kind === SyntaxKind.ReturnKeyword) {
-            const functionDeclaration = findAncestor(node.parent, n =>
-                isClassStaticBlockDeclaration(n) ? "quit" : isFunctionLikeDeclaration(n)) as FunctionLikeDeclaration | undefined;
-            return functionDeclaration ? [createDefinitionFromSignatureDeclaration(typeChecker, functionDeclaration)] : undefined;
+        switch (node.kind) {
+            case SyntaxKind.ReturnKeyword:
+                const functionDeclaration = findAncestor(node.parent, n =>
+                  isClassStaticBlockDeclaration(n) ? "quit" : isFunctionLikeDeclaration(n)) as FunctionLikeDeclaration | undefined;
+                return functionDeclaration ? [createDefinitionFromSignatureDeclaration(typeChecker, functionDeclaration)] : undefined;
+            case SyntaxKind.DefaultKeyword:
+                if (!isDefaultClause(node.parent)) {
+                    break;
+                }
+                // falls through
+            case SyntaxKind.CaseKeyword:
+                const switchStatement = findAncestor(node.parent, isSwitchStatement);
+                if (switchStatement) {
+                    return [createDefinitionInfoFromNode(switchStatement, "switch")];
+                }
+                break;
         }
 
         if (isStaticModifier(node) && isClassStaticBlockDeclaration(node.parent)) {
@@ -510,4 +522,21 @@ namespace ts.GoToDefinition {
                 return false;
         }
     }
+
+    function createDefinitionInfoFromNode(node: Node, name: string): DefinitionInfo {
+        const sourceFile = node.getSourceFile();
+        return {
+            fileName: sourceFile.fileName,
+            textSpan: createTextSpanFromNode(node, sourceFile),
+            kind: ScriptElementKind.label,
+            name,
+            containerKind: ScriptElementKind.unknown,
+            containerName: "",
+            contextSpan: createTextSpanFromNode(node, sourceFile),
+            isLocal: false,
+            isAmbient: false,
+            unverified: false,
+            failedAliasResolution: undefined,
+        };
+    }
 }
diff --git a/tests/cases/fourslash/goToDefinitionSwitchCase1.ts b/tests/cases/fourslash/goToDefinitionSwitchCase1.ts
diff --git a/tests/cases/fourslash/goToDefinitionSwitchCase2.ts b/tests/cases/fourslash/goToDefinitionSwitchCase2.ts
diff --git a/tests/cases/fourslash/goToDefinitionSwitchCase3.ts b/tests/cases/fourslash/goToDefinitionSwitchCase3.ts
diff --git a/tests/cases/fourslash/goToDefinitionSwitchCase4.ts b/tests/cases/fourslash/goToDefinitionSwitchCase4.ts
diff --git a/tests/cases/fourslash/goToDefinitionSwitchCase5.ts b/tests/cases/fourslash/goToDefinitionSwitchCase5.ts
diff --git a/tests/cases/fourslash/goToDefinitionSwitchCase6.ts b/tests/cases/fourslash/goToDefinitionSwitchCase6.ts
diff --git a/tests/cases/fourslash/goToDefinitionSwitchCase7.ts b/tests/cases/fourslash/goToDefinitionSwitchCase7.ts