microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(51222): Go-to-definition on return statements should jump to the containing function declaration (#51227)

Browse Source 
* fix(51222): add go-to-definition return statement to containing function

* add additional tests
This commit is contained in:
Oleksandr T
2022-10-19 21:32:39 +03:00
committed by GitHub
parent 2dff34e8c4
commit 245a02cbed
8 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/goToDefinition.ts
View File

@@ -26,6 +26,12 @@ 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;
return functionDeclaration ? [createDefinitionFromSignatureDeclaration(typeChecker, functionDeclaration)] : undefined;
}
if (isStaticModifier(node) && isClassStaticBlockDeclaration(node.parent)) {
const classDecl = node.parent.parent;
const { symbol, failedAliasResolution } = getSymbol(classDecl, typeChecker, stopAtAlias);