Codefix for implementing interfaces

src/services/codefixes/interfaceFixes.ts

@@ -1,46 +1,5 @@
 /* @internal */
 namespace ts.codefix {
-    registerCodeFix({
-        errorCodes: [Diagnostics.Type_0_is_not_assignable_to_type_1.code],
-        getCodeActions: (context: CodeFixContext) => {
-            const sourceFile = context.sourceFile;
-            const start = context.span.start;
-            const token = getTokenAtPosition(sourceFile, start);
-            const checker = context.program.getTypeChecker();
-            let textChanges: TextChange[] = [];
-
-            if (token.kind === SyntaxKind.Identifier && token.parent.kind === SyntaxKind.VariableDeclaration) {
-                const variableDeclaration = <VariableDeclaration>token.parent;
-                const membersAndStartPosObject = getMembersAndStartPosFromReference(variableDeclaration);
-                const variableMembers = membersAndStartPosObject.members;
-                const trackingAddedMembers: string[] = [];
-                const startPos: number = membersAndStartPosObject.startPos;
-
-                if (variableDeclaration.type.kind === SyntaxKind.TypeReference) {
-                    textChanges = textChanges.concat(getChanges(variableDeclaration.type, variableMembers, startPos, checker, /*reference*/ true, trackingAddedMembers, context.newLineCharacter));
-                }
-                else if (variableDeclaration.type.kind === SyntaxKind.UnionType) {
-                    const types = (<UnionTypeNode>variableDeclaration.type).types;
-                    ts.forEach(types, t => {
-                        textChanges = textChanges.concat(getChanges(t, variableMembers, startPos, checker, /*reference*/ true, trackingAddedMembers, context.newLineCharacter));
-                    });
-                }
-            }
-
-            if (textChanges.length > 0) {
-                return [{
-                    description: getLocaleSpecificMessage(Diagnostics.Implement_interface_on_reference),
-                    changes: [{
-                        fileName: sourceFile.fileName,
-                        textChanges: textChanges
-                    }]
-                }];
-            }
-
-            return undefined;
-        }
-    });
-
     registerCodeFix({
         errorCodes: [Diagnostics.Class_0_incorrectly_implements_interface_1.code],
         getCodeActions: (context: CodeFixContext) => {
@@ -49,28 +8,29 @@ namespace ts.codefix {
             const token = getTokenAtPosition(sourceFile, start);
             const checker = context.program.getTypeChecker();
 
-            let textChanges: TextChange[] = [];
-
-            if (token.kind === SyntaxKind.Identifier && token.parent.kind === SyntaxKind.ClassDeclaration) {
+            if (token.kind === SyntaxKind.Identifier && isClassLike(token.parent)) {
                 const classDeclaration = <ClassDeclaration>token.parent;
                 const startPos: number = classDeclaration.members.pos;
-                const classMembers = getClassMembers(classDeclaration);
+                const classMembers = ts.map(getNamedClassMemberDeclarations(classDeclaration), member => member.name.getText());
                 const trackingAddedMembers: string[] = [];
                 const interfaceClauses = ts.getClassImplementsHeritageClauseElements(classDeclaration);
 
+                let textChanges: TextChange[] = undefined;
+
                 for (let i = 0; interfaceClauses && i < interfaceClauses.length; i++) {
-                    textChanges = textChanges.concat(getChanges(interfaceClauses[i], classMembers, startPos, checker, /*reference*/ false, trackingAddedMembers, context.newLineCharacter));
+                    let newChanges = getChanges(interfaceClauses[i], classMembers, startPos, checker, /*reference*/ false, trackingAddedMembers, context.newLineCharacter);
+                    textChanges = textChanges ? textChanges.concat(newChanges) : newChanges;
                 }
-            }
 
-            if (textChanges.length > 0) {
-                return [{
-                    description: getLocaleSpecificMessage(Diagnostics.Implement_interface_on_class),
-                    changes: [{
-                        fileName: sourceFile.fileName,
-                        textChanges: textChanges
-                    }]
-                }];
+                if (textChanges && textChanges.length > 0) {
+                    return [{
+                        description: getLocaleSpecificMessage(Diagnostics.Implement_interface_on_class),
+                        changes: [{
+                            fileName: sourceFile.fileName,
+                            textChanges: textChanges
+                        }]
+                    }];
+                }
             }
 
             return undefined;
@@ -87,13 +47,13 @@ namespace ts.codefix {
 
             let textChanges: TextChange[] = [];
 
-            if (token.kind === SyntaxKind.Identifier && token.parent.kind === SyntaxKind.ClassDeclaration) {
+            if (token.kind === SyntaxKind.Identifier &&  isClassLike(token.parent)) {
                 const classDeclaration = <ClassDeclaration>token.parent;
                 const startPos = classDeclaration.members.pos;
-                const classMembers = getClassMembers(classDeclaration);
+                const abstractClassMembers = ts.map(getNamedClassAbstractMemberDeclarations(classDeclaration), member => member.name.getText());
                 const trackingAddedMembers: string[] = [];
                 const extendsClause = ts.getClassExtendsHeritageClauseElement(classDeclaration);
-                textChanges = textChanges.concat(getChanges(extendsClause, classMembers, startPos, checker, /*reference*/ false, trackingAddedMembers, context.newLineCharacter));
+                textChanges = textChanges.concat(getChanges(extendsClause, abstractClassMembers, startPos, checker, /*reference*/ false, trackingAddedMembers, context.newLineCharacter));
             }
 
             if (textChanges.length > 0) {
@@ -116,10 +76,10 @@ namespace ts.codefix {
 
         if (type && type.symbol && type.symbol.declarations) {
             const interfaceMembers = getMembers(<InterfaceDeclaration>type.symbol.declarations[0], checker);
-            for (let j = 0; interfaceMembers && j < interfaceMembers.length; j++) {
-                if (interfaceMembers[j].name && existingMembers.indexOf(interfaceMembers[j].name.getText()) === -1) {
-                    if (interfaceMembers[j].kind === SyntaxKind.PropertySignature) {
-                        const interfaceProperty = <PropertySignature>interfaceMembers[j];
+            for(let interfaceMember of interfaceMembers){
+                if (interfaceMember.name && existingMembers.indexOf(interfaceMember.name.getText()) === -1) {
+                    if (interfaceMember.kind === SyntaxKind.PropertySignature) {
+                        const interfaceProperty = <PropertySignature>interfaceMember;
                         if (trackingAddedMembers.indexOf(interfaceProperty.name.getText()) === -1) {
                             let propertyText = "";
                             if (reference) {
@@ -134,8 +94,8 @@ namespace ts.codefix {
                             trackingAddedMembers.push(interfaceProperty.name.getText());
                         }
                     }
-                    else if (interfaceMembers[j].kind === SyntaxKind.MethodSignature || interfaceMembers[j].kind === SyntaxKind.MethodDeclaration) {
-                        const interfaceMethod = <MethodSignature>interfaceMembers[j];
+                    else if (interfaceMember.kind === SyntaxKind.MethodSignature || interfaceMember.kind === SyntaxKind.MethodDeclaration) {
+                        const interfaceMethod = <MethodSignature>interfaceMember;
                         handleMethods(interfaceMethod, startPos, reference, trackingAddedMembers, changesArray, newLineCharacter);
                     }
                 }
@@ -168,14 +128,12 @@ namespace ts.codefix {
         return result;
     }
 
-    function getClassMembers(classDeclaration: ClassDeclaration): string[] {
-        const classMembers: string[] = [];
-        for (let i = 0; classDeclaration.members && i < classDeclaration.members.length; i++) {
-            if (classDeclaration.members[i].name) {
-                classMembers.push(classDeclaration.members[i].name.getText());
-            }
-        }
-        return classMembers;
+    function getNamedClassMemberDeclarations(classDeclaration: ClassDeclaration): ClassElement[] {
+        return classDeclaration.members.filter(member => member.name);
+    }
+
+    function getNamedClassAbstractMemberDeclarations(classDeclaration: ClassDeclaration): ClassElement[] {
+        return getNamedClassMemberDeclarations(classDeclaration).filter(member => getModifierFlags(member) & ModifierFlags.Abstract);
     }
 
     function getMembersAndStartPosFromReference(variableDeclaration: VariableDeclaration): { startPos: number, members: string[] } {

tests/cases/fourslash/unImplementedInterface14.ts

@@ -10,7 +10,8 @@
 ////     |]f2() {}
 //// }
 
-verify.codeFixAtPosition(`f1(){
-    throw new Error('Method not Implemented');
-},
-`);
+verify.not.codeFixAvailable();
+// verify.codeFixAtPosition(`f1(){
+//     throw new Error('Method not Implemented');
+// },
+// `);

tests/cases/fourslash/unImplementedInterface15.ts

@@ -8,8 +8,9 @@
 ////
 //// |]}
 
-verify.codeFixAtPosition(`
-f1(){
-    throw new Error('Method not Implemented');
-}
-`);
+verify.not.codeFixAvailable();
+// verify.codeFixAtPosition(`
+// f1(){
+//     throw new Error('Method not Implemented');
+// }
+// `);

tests/cases/fourslash/unImplementedInterface16.ts

@@ -8,5 +8,6 @@
 //// var x: I1 ={[|
 //// |]}
 
-verify.codeFixAtPosition(`x : "" 
-`);
+verify.not.codeFixAvailable();
+// verify.codeFixAtPosition(`x : "" 
+// `);

tests/cases/fourslash/unImplementedInterface17.ts

@@ -7,5 +7,6 @@
 //// var x: I1 ={[|
 //// |]}
 
-verify.codeFixAtPosition(`x : 0 
-`);
+verify.not.codeFixAvailable();
+// verify.codeFixAtPosition(`x : 0 
+// `);

tests/cases/fourslash/unImplementedInterface18.ts

@@ -8,5 +8,6 @@
 ////
 //// |]}
 
-verify.codeFixAtPosition(`x : false 
-`);
+verify.not.codeFixAvailable();
+// verify.codeFixAtPosition(`x : false 
+// `);

tests/cases/fourslash/unImplementedInterface19.ts

@@ -9,5 +9,6 @@
 ////     |]f1(){}
 //// }
 
-verify.codeFixAtPosition(`x : "",
-`);
+verify.not.codeFixAvailable();
+// verify.codeFixAtPosition(`x : "",
+// `);

tests/cases/fourslash/unImplementedInterface20.ts

@@ -10,5 +10,6 @@
 ////     |]f1(){}
 //// }
 
-verify.codeFixAtPosition(`x : 0,
-`);
+verify.not.codeFixAvailable();
+// verify.codeFixAtPosition(`x : 0,
+// `);

tests/cases/fourslash/unImplementedInterface21.ts

@@ -10,5 +10,6 @@
 ////     |]f1(){}
 //// }
 
-verify.codeFixAtPosition(`x : false,
-`);
+verify.not.codeFixAvailable();
+// verify.codeFixAtPosition(`x : false,
+// `);

tests/cases/fourslash/unImplementedInterface22.ts

@@ -8,5 +8,6 @@
 //// var x: I1 ={[|
 //// |]}
 
-verify.codeFixAtPosition(`x : null 
-`);
+verify.not.codeFixAvailable();
+// verify.codeFixAtPosition(`x : null 
+// `);