Combine code-fix-all for missing class member and missing enum member

Andy Hanson · Andy Hanson · commit 2fa27ffdf709 · 2018-06-29T19:39:19.000-07:00
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -4450,9 +4450,5 @@
     "Add missing enum member '{0}'": {
         "category": "Message",
         "code": 95063
-    },
-    "Add all missing enum members": {
-        "category": "Message",
-        "code": 95064
     }
 }
diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
@@ -15,7 +15,7 @@ namespace ts.codefix {
             if (info.kind === InfoKind.enum) {
                 const { token, enumDeclaration } = info;
                 const changes = textChanges.ChangeTracker.with(context, t => addEnumMemberDeclaration(t, context.program.getTypeChecker(), token, enumDeclaration));
-                return singleElementArray(createCodeFixAction(fixName, changes, [Diagnostics.Add_missing_enum_member_0, token.text], fixId, Diagnostics.Add_all_missing_enum_members));
+                return [createCodeFixAction(fixName, changes, [Diagnostics.Add_missing_enum_member_0, token.text], fixId, Diagnostics.Add_all_missing_members)];
             }
             const { classDeclaration, classDeclarationSourceFile, inJs, makeStatic, token, call } = info;
             const methodCodeAction = call && getActionForMethodDeclaration(context, classDeclarationSourceFile, classDeclaration, token, call, makeStatic, inJs, context.preferences);
diff --git a/tests/cases/fourslash/codeFixAddMissingMember_all.ts b/tests/cases/fourslash/codeFixAddMissingMember_all.ts
@@ -7,6 +7,9 @@
 ////        this.x = "";
 ////    }
 ////}
+////
+////enum E {}
+////E.A;
 
 verify.codeFixAll({
     fixId: "addMissingMember",
@@ -22,5 +25,10 @@ verify.codeFixAll({
     y(): any {
         throw new Error("Method not implemented.");
     }
-}`,
+}
+
+enum E {
+    A
+}
+E.A;`,
 });

Original file line number	Diff line number	Diff line change
`@@ -4450,9 +4450,5 @@`
`4450`	`4450`	`"Add missing enum member '{0}'": {`
`4451`	`4451`	`"category": "Message",`
`4452`	`4452`	`"code": 95063`
`4453`		`- },`
`4454`		`- "Add all missing enum members": {`
`4455`		`- "category": "Message",`
`4456`		`- "code": 95064`
`4457`	`4453`	`}`
`4458`	`4454`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace ts.codefix {`
`15`	`15`	`if (info.kind === InfoKind.enum) {`
`16`	`16`	`const { token, enumDeclaration } = info;`
`17`	`17`	`const changes = textChanges.ChangeTracker.with(context, t => addEnumMemberDeclaration(t, context.program.getTypeChecker(), token, enumDeclaration));`
`18`		`- return singleElementArray(createCodeFixAction(fixName, changes, [Diagnostics.Add_missing_enum_member_0, token.text], fixId, Diagnostics.Add_all_missing_enum_members));`
	`18`	`+ return [createCodeFixAction(fixName, changes, [Diagnostics.Add_missing_enum_member_0, token.text], fixId, Diagnostics.Add_all_missing_members)];`
`19`	`19`	`}`
`20`	`20`	`const { classDeclaration, classDeclarationSourceFile, inJs, makeStatic, token, call } = info;`
`21`	`21`	`const methodCodeAction = call && getActionForMethodDeclaration(context, classDeclarationSourceFile, classDeclaration, token, call, makeStatic, inJs, context.preferences);`