Handle class expressions

aozgaa · aozgaa · commit d7d4bf6b04ba · 2016-11-15T11:41:23.000-08:00
diff --git a/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts b/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
@@ -8,8 +8,8 @@ namespace ts.codefix {
             const token = getTokenAtPosition(sourceFile, start);
             const checker = context.program.getTypeChecker();
 
-            const classDecl = getAncestor(token, SyntaxKind.ClassDeclaration) as ClassDeclaration;
-            if (!(classDecl && isClassLike(classDecl))) {
+            const classDecl = getContainingClass(token);
+            if (!classDecl) {
                 return undefined;
             }
 
diff --git a/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts b/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts
@@ -6,8 +6,8 @@ namespace ts.codefix {
             const sourceFile = context.sourceFile;
             const start = context.span.start;
             const token = getTokenAtPosition(sourceFile, start);
-            const classDeclNode = getAncestor(token, SyntaxKind.ClassDeclaration) as ClassDeclaration;
-            if (!(token.kind === SyntaxKind.Identifier && classDeclNode && classDeclNode.kind === SyntaxKind.ClassDeclaration)) {
+            const classDeclNode = getContainingClass(token);
+            if (!(token.kind === SyntaxKind.Identifier && isClassLike(classDeclNode))) {
                 return undefined;
             }
 
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -1359,7 +1359,7 @@ namespace ts {
         };
     }
 
-    export function getMissingAbstractMembersInsertion(classDeclaration: ClassDeclaration, resolvedType: ResolvedType, checker: TypeChecker, newlineChar: string): string {
+    export function getMissingAbstractMembersInsertion(classDeclaration: ClassLikeDeclaration, resolvedType: ResolvedType, checker: TypeChecker, newlineChar: string): string {
         const missingMembers = filterMissingMembers(filterAbstract(filterNonPrivate(resolvedType.members)), classDeclaration.symbol.members);
         return getInsertionsForMembers(missingMembers, classDeclaration, checker, newlineChar);
     }
@@ -1368,7 +1368,7 @@ namespace ts {
      * Finds members of the resolved type that are missing in the class pointed to by class decl
      * and generates source code for the missing members.
      */
-    export function getMissingMembersInsertion(classDeclaration: ClassDeclaration, resolvedType: ResolvedType, checker: TypeChecker, newlineChar: string): string {
+    export function getMissingMembersInsertion(classDeclaration: ClassLikeDeclaration, resolvedType: ResolvedType, checker: TypeChecker, newlineChar: string): string {
         const missingMembers = filterMissingMembers(filterNonPrivate(resolvedType.members), classDeclaration.symbol.members);
         return getInsertionsForMembers(missingMembers, classDeclaration, checker, newlineChar);
     }
@@ -1406,7 +1406,7 @@ namespace ts {
         return filterSymbolMapByDeclaration(symbolMap, decl => !(getModifierFlags(decl) & ModifierFlags.Private));
     }
 
-    function getInsertionsForMembers(symbolMap: MapLike<Symbol>, enclosingDeclaration: ClassDeclaration, checker: TypeChecker, newlineChar: string): string {
+    function getInsertionsForMembers(symbolMap: MapLike<Symbol>, enclosingDeclaration: ClassLikeDeclaration, checker: TypeChecker, newlineChar: string): string {
         let insertion = "";
 
         for (const symbolName in symbolMap) {
@@ -1415,7 +1415,7 @@ namespace ts {
         return insertion;
     }
 
-    function getInsertionForMemberSymbol(symbol: Symbol, enclosingDeclaration: ClassDeclaration, checker: TypeChecker, newlineChar: string): string {
+    function getInsertionForMemberSymbol(symbol: Symbol, enclosingDeclaration: ClassLikeDeclaration, checker: TypeChecker, newlineChar: string): string {
         const name = symbol.getName();
         const type = checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration);
         const declarations = symbol.getDeclarations();
diff --git a/tests/cases/fourslash/codeFixUnImplementedInterfaceClassExpression.ts b/tests/cases/fourslash/codeFixUnImplementedInterfaceClassExpression.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts' />
+
+
+//// interface I { x: number; }
+////
+//// new class implements I {[|  |]};
+
+verify.rangeAfterCodeFix(`
+x: number;
+`);

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ namespace ts.codefix {`
`8`	`8`	`const token = getTokenAtPosition(sourceFile, start);`
`9`	`9`	`const checker = context.program.getTypeChecker();`
`10`	`10`
`11`		`- const classDecl = getAncestor(token, SyntaxKind.ClassDeclaration) as ClassDeclaration;`
`12`		`- if (!(classDecl && isClassLike(classDecl))) {`
	`11`	`+ const classDecl = getContainingClass(token);`
	`12`	`+ if (!classDecl) {`
`13`	`13`	`return undefined;`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -1359,7 +1359,7 @@ namespace ts {`
`1359`	`1359`	`};`
`1360`	`1360`	`}`
`1361`	`1361`
`1362`		`- export function getMissingAbstractMembersInsertion(classDeclaration: ClassDeclaration, resolvedType: ResolvedType, checker: TypeChecker, newlineChar: string): string {`
	`1362`	`+ export function getMissingAbstractMembersInsertion(classDeclaration: ClassLikeDeclaration, resolvedType: ResolvedType, checker: TypeChecker, newlineChar: string): string {`
`1363`	`1363`	`const missingMembers = filterMissingMembers(filterAbstract(filterNonPrivate(resolvedType.members)), classDeclaration.symbol.members);`
`1364`	`1364`	`return getInsertionsForMembers(missingMembers, classDeclaration, checker, newlineChar);`
`1365`	`1365`	`}`
`@@ -1368,7 +1368,7 @@ namespace ts {`
`1368`	`1368`	`* Finds members of the resolved type that are missing in the class pointed to by class decl`
`1369`	`1369`	`* and generates source code for the missing members.`
`1370`	`1370`	`*/`
`1371`		`- export function getMissingMembersInsertion(classDeclaration: ClassDeclaration, resolvedType: ResolvedType, checker: TypeChecker, newlineChar: string): string {`
	`1371`	`+ export function getMissingMembersInsertion(classDeclaration: ClassLikeDeclaration, resolvedType: ResolvedType, checker: TypeChecker, newlineChar: string): string {`
`1372`	`1372`	`const missingMembers = filterMissingMembers(filterNonPrivate(resolvedType.members), classDeclaration.symbol.members);`
`1373`	`1373`	`return getInsertionsForMembers(missingMembers, classDeclaration, checker, newlineChar);`
`1374`	`1374`	`}`
`@@ -1406,7 +1406,7 @@ namespace ts {`
`1406`	`1406`	`return filterSymbolMapByDeclaration(symbolMap, decl => !(getModifierFlags(decl) & ModifierFlags.Private));`
`1407`	`1407`	`}`
`1408`	`1408`
`1409`		`- function getInsertionsForMembers(symbolMap: MapLike<Symbol>, enclosingDeclaration: ClassDeclaration, checker: TypeChecker, newlineChar: string): string {`
	`1409`	`+ function getInsertionsForMembers(symbolMap: MapLike<Symbol>, enclosingDeclaration: ClassLikeDeclaration, checker: TypeChecker, newlineChar: string): string {`
`1410`	`1410`	`let insertion = "";`
`1411`	`1411`
`1412`	`1412`	`for (const symbolName in symbolMap) {`
`@@ -1415,7 +1415,7 @@ namespace ts {`
`1415`	`1415`	`return insertion;`
`1416`	`1416`	`}`
`1417`	`1417`
`1418`		`- function getInsertionForMemberSymbol(symbol: Symbol, enclosingDeclaration: ClassDeclaration, checker: TypeChecker, newlineChar: string): string {`
	`1418`	`+ function getInsertionForMemberSymbol(symbol: Symbol, enclosingDeclaration: ClassLikeDeclaration, checker: TypeChecker, newlineChar: string): string {`
`1419`	`1419`	`const name = symbol.getName();`
`1420`	`1420`	`const type = checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration);`
`1421`	`1421`	`const declarations = symbol.getDeclarations();`