From 299745cb217c2fc061f75b3735f8420d78b8360a Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Mon, 3 Oct 2022 16:07:57 -0700
Subject: [PATCH] Fix crash in goto-def on `@override` (#51016)

* Fix crash in goto-def on `@override`

When the base type is not defined, getDefinitionFromOverriddenMember
will have its type as errorType, which has no symbol. The error handling
previously only handled the case of no baseType at all -- which I'm not
sure ever actually happens.

* Improve checking

1. getTypeAtLocation never returns undefined, only errorType, so check for that.
2. Return directly after missing baseTypeNode instead of continuing to return later.

* Experiment with making goto-def on `override` more consistent

* Unify static/instance node->symbol->type path

* Make getSymbolAtLocation support class expressions

and parenthesized expressions

* Revert "Make getSymbolAtLocation support class expressions"

This reverts commit 4c1b03135576c9e5d146ce6f38e691c804cbb0dd.

* fix semicolon lint
---
 src/services/goToDefinition.ts                   | 10 ++++++----
 .../goToDefinitionOverriddenMember16.ts          | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 tests/cases/fourslash/goToDefinitionOverriddenMember16.ts

diff --git a/src/services/goToDefinition.ts b/src/services/goToDefinition.ts
index 40cac0a916d41..866588c51b993 100644
--- a/src/services/goToDefinition.ts
+++ b/src/services/goToDefinition.ts
@@ -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);
+        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);
diff --git a/tests/cases/fourslash/goToDefinitionOverriddenMember16.ts b/tests/cases/fourslash/goToDefinitionOverriddenMember16.ts
new file mode 100644
index 0000000000000..96f1467a344c6
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinitionOverriddenMember16.ts
@@ -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'], [])