Fix handling of default class

aozgaa · aozgaa · commit 6400d53394de · 2016-11-14T15:43:24.000-08:00
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -1801,7 +1801,7 @@ namespace ts {
         }
     }
 
-    export function getAncestor(node: Node, kind: SyntaxKind): Node {
+    export function getAncestor(node: Node | undefined, kind: SyntaxKind): Node {
         while (node) {
             if (node.kind === kind) {
                 return node;
diff --git a/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts b/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
@@ -8,10 +8,11 @@ namespace ts.codefix {
             const token = getTokenAtPosition(sourceFile, start);
             const checker = context.program.getTypeChecker();
 
-            if (!(token.kind === SyntaxKind.Identifier && isClassLike(token.parent))) {
+            const classDecl = getAncestor(token, SyntaxKind.ClassDeclaration) as ClassDeclaration;
+            if (!(classDecl && isClassLike(classDecl))) {
                 return undefined;
             }
-            const classDecl = <ClassDeclaration>token.parent;
+
             const startPos: number = classDecl.members.pos;
 
             const implementedTypeNodes = getClassImplementsHeritageClauseElements(classDecl);
diff --git a/tests/cases/fourslash/codeFixUnImplementedDefaultClass.ts b/tests/cases/fourslash/codeFixUnImplementedDefaultClass.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts' />
+
+//// interface I { x: number; }
+////
+//// export default class implements I {[| |]}
+
+verify.rangeAfterCodeFix(`
+x: number;
+`);

Original file line number	Diff line number	Diff line change
`@@ -1801,7 +1801,7 @@ namespace ts {`
`1801`	`1801`	`}`
`1802`	`1802`	`}`
`1803`	`1803`
`1804`		`- export function getAncestor(node: Node, kind: SyntaxKind): Node {`
	`1804`	`+ export function getAncestor(node: Node \| undefined, kind: SyntaxKind): Node {`
`1805`	`1805`	`while (node) {`
`1806`	`1806`	`if (node.kind === kind) {`
`1807`	`1807`	`return node;`