Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix crash in goto-def on @override #51016

Merged
merged 8 commits into from Oct 3, 2022
Merged

Fix crash in goto-def on @override #51016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2710ea8
Fix crash in goto-def on `@override`
sandersn Sep 30, 2022
0487e3b
Improve checking
sandersn Sep 30, 2022
13c7008
Experiment with making goto-def on `override` more consistent
sandersn Sep 30, 2022
6ef2904
Unify static/instance node->symbol->type path
sandersn Oct 1, 2022
4c1b031
Make getSymbolAtLocation support class expressions
sandersn Oct 1, 2022
92415cd
Revert "Make getSymbolAtLocation support class expressions"
sandersn Oct 3, 2022
c1babc8
fix semicolon lint
sandersn Oct 3, 2022
2a645a3
Merge branch 'main' into fix-crash-in-goto-def-override
sandersn Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/services/goToDefinition.ts
View file
Open in desktop
Expand Up @@ -171,13 +171,15 @@ namespace ts.GoToDefinition {
if (!baseDeclaration) return;

const baseTypeNode = getEffectiveBaseTypeNode(baseDeclaration);
const baseType = baseTypeNode ? typeChecker.getTypeAtLocation(baseTypeNode) : undefined;
if (!baseType) return;
if (!baseTypeNode) return;
const expression = skipParentheses(baseTypeNode.expression);
const base = isClassExpression(expression) ? expression.symbol : typeChecker.getSymbolAtLocation(expression);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, why are you checking for isClassExpression? Can't you use getDeclaredTypeOfSymbol?

Copy link
Member Author

@sandersn sandersn Oct 3, 2022 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have to follow Node -> Symbol -> Type, and getSymbolAtLocation doesn't support (parenthesised) class expressions right now, which breaks the Node -> Symbol. Previously, the code used getTypeAtLocation, which does support class expressions. I happen to know that class expressions have a symbol, so I can special-case the Node -> Symbol step for now.

I'm going to follow this PR with one that moves the paren/class-expr check into getTypeAtLocation, but it changes lots of our baselines since, apparently, we use it for type baselines.

if (!base) return;

const name = unescapeLeadingUnderscores(getTextOfPropertyName(classElement.name));
const symbol = hasStaticModifier(classElement)
? typeChecker.getPropertyOfType(typeChecker.getTypeOfSymbolAtLocation(baseType.symbol, baseDeclaration), name)
: typeChecker.getPropertyOfType(baseType, name);
? typeChecker.getPropertyOfType(typeChecker.getTypeOfSymbol(base), name)
: typeChecker.getPropertyOfType(typeChecker.getDeclaredTypeOfSymbol(base), name);
if (!symbol) return;

return getDefinitionFromSymbol(typeChecker, symbol, node);
Expand Down
16 changes: 16 additions & 0 deletions tests/cases/fourslash/goToDefinitionOverriddenMember16.ts
View file
Open in desktop
@@ -0,0 +1,16 @@
/// <reference path="fourslash.ts" />
// @Filename: goToDefinitionOverrideJsdoc.ts
// @allowJs: true
// @checkJs: true

//// export class C extends CompletelyUndefined {
//// /**
//// * @override/*1*/
//// * @returns {{}}
//// */
//// static foo() {
//// return {}
//// }
//// }

verify.goToDefinition(['1'], [])