Merge pull request microsoft#7144 from Microsoft/super-inside-inner-class-crashes

sandersn · sandersn · commit e46b7b05ab6b · 2016-02-19T08:45:35.000-08:00
Super inside inner class crashes
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -10112,8 +10112,10 @@ namespace ts {
                     // In super call, the candidate signatures are the matching arity signatures of the base constructor function instantiated
                     // with the type arguments specified in the extends clause.
                     const baseTypeNode = getClassExtendsHeritageClauseElement(getContainingClass(node));
-                    const baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
-                    return resolveCall(node, baseConstructors, candidatesOutArray);
+                    if (baseTypeNode) {
+                        const baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
+                        return resolveCall(node, baseConstructors, candidatesOutArray);
+                    }
                 }
                 return resolveUntypedCall(node);
             }
diff --git a/tests/cases/fourslash/superInsideInnerClass.ts b/tests/cases/fourslash/superInsideInnerClass.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts" />
+////class Base {
+////	constructor(n: number) {
+////	}
+////}
+////class Derived extends Base {
+////	constructor() {
+////		class Nested {
+////			[super(/*1*/)] = 11111
+////		}
+////	}
+////}
+
+goTo.marker('1');
+verify.signatureHelpCountIs(0);

Original file line number	Diff line number	Diff line change
`@@ -10112,8 +10112,10 @@ namespace ts {`
`10112`	`10112`	`// In super call, the candidate signatures are the matching arity signatures of the base constructor function instantiated`
`10113`	`10113`	`// with the type arguments specified in the extends clause.`
`10114`	`10114`	`const baseTypeNode = getClassExtendsHeritageClauseElement(getContainingClass(node));`
`10115`		`- const baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);`
`10116`		`- return resolveCall(node, baseConstructors, candidatesOutArray);`
	`10115`	`+ if (baseTypeNode) {`
	`10116`	`+ const baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);`
	`10117`	`+ return resolveCall(node, baseConstructors, candidatesOutArray);`
	`10118`	`+ }`
`10117`	`10119`	`}`
`10118`	`10120`	`return resolveUntypedCall(node);`
`10119`	`10121`	`}`