Merge pull request microsoft#25335 from Microsoft/codeFixAddMissingEnumMember_all

mhegazy · web-flow · commit 956f9d0be2e2 · 2018-07-02T15:14:19.000-07:00
Combine code-fix-all for missing class member and missing enum member
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -4470,9 +4470,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/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -5932,7 +5932,6 @@ declare namespace ts {
         Convert_default_export_to_named_export: DiagnosticMessage;
         Convert_named_export_to_default_export: DiagnosticMessage;
         Add_missing_enum_member_0: DiagnosticMessage;
-        Add_all_missing_enum_members: DiagnosticMessage;
     };
 }
 declare namespace ts {
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
`@@ -4470,9 +4470,5 @@`
`4470`	`4470`	`"Add missing enum member '{0}'": {`
`4471`	`4471`	`"category": "Message",`
`4472`	`4472`	`"code": 95063`
`4473`		`- },`
`4474`		`- "Add all missing enum members": {`
`4475`		`- "category": "Message",`
`4476`		`- "code": 95064`
`4477`	`4473`	`}`
`4478`	`4474`	`}`
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);`
Original file line number	Diff line number	Diff line change
`@@ -5932,7 +5932,6 @@ declare namespace ts {`
`5932`	`5932`	`Convert_default_export_to_named_export: DiagnosticMessage;`
`5933`	`5933`	`Convert_named_export_to_default_export: DiagnosticMessage;`
`5934`	`5934`	`Add_missing_enum_member_0: DiagnosticMessage;`
`5935`		`- Add_all_missing_enum_members: DiagnosticMessage;`
`5936`	`5935`	`};`
`5937`	`5936`	`}`
`5938`	`5937`	`declare namespace ts {`