Revert "Add NormalFormalParameter.covariantKeyword setter and factory parameter."

pkg/analyzer/lib/dart/ast/ast_factory.dart

Index: pkg/analyzer/lib/dart/ast/ast_factory.dart
diff --git a/pkg/analyzer/lib/dart/ast/ast_factory.dart b/pkg/analyzer/lib/dart/ast/ast_factory.dart
index 6de19da1f6dc662080200c704ad195548a382d08..48b918d8fb72d107b8c08dc39f1a9027df84b37c 100644
--- a/pkg/analyzer/lib/dart/ast/ast_factory.dart
+++ b/pkg/analyzer/lib/dart/ast/ast_factory.dart
@@ -304,8 +304,8 @@ abstract class AstFactory {
    * Returns a documentation comment consisting of the given [tokens] and having
    * the given [references] (if supplied) embedded within it.
    */
-  Comment documentationComment(List<Token> tokens,
-      [List<CommentReference> references]);
+  Comment documentationComment(
+      List<Token> tokens, [List<CommentReference> references]);
 
   /**
    * Returns a newly created do loop.
@@ -422,7 +422,6 @@ abstract class AstFactory {
   FieldFormalParameter fieldFormalParameter(
       Comment comment,
       List<Annotation> metadata,
-      Token covariantKeyword,
       Token keyword,
       TypeAnnotation type,
       Token thisKeyword,
@@ -552,7 +551,6 @@ abstract class AstFactory {
   FunctionTypedFormalParameter functionTypedFormalParameter(
       Comment comment,
       List<Annotation> metadata,
-      Token covariantKeyword,
       TypeAnnotation returnType,
       SimpleIdentifier identifier,
       TypeParameterList typeParameters,
@@ -560,31 +558,6 @@ abstract class AstFactory {
       {Token question: null});
 
   /**
-   * Initialize a newly created generic function type.
-   */
-  GenericFunctionType genericFunctionType(
-      TypeAnnotation returnType,
-      Token functionKeyword,
-      TypeParameterList typeParameters,
-      FormalParameterList _parameters);
-
-  /**
-   * Returns a newly created generic type alias. Either or both of the
-   * [comment] and [metadata] can be `null` if the variable list does not have
-   * the corresponding attribute. The [typeParameters] can be `null` if there
-   * are no type parameters.
-   */
-  GenericTypeAlias genericTypeAlias(
-      Comment comment,
-      List<Annotation> metadata,
-      Token typedefKeyword,
-      SimpleIdentifier name,
-      TypeParameterList typeParameters,
-      Token equals,
-      GenericFunctionType functionType,
-      Token semicolon);
-
-  /**
    * Returns a newly created import show combinator.
    */
   HideCombinator hideCombinator(
@@ -875,7 +848,6 @@ abstract class AstFactory {
   SimpleFormalParameter simpleFormalParameter(
       Comment comment,
       List<Annotation> metadata,
-      Token covariantKeyword,
       Token keyword,
       TypeAnnotation type,
       SimpleIdentifier identifier);
@@ -925,7 +897,6 @@ abstract class AstFactory {
    */
   SwitchDefault switchDefault(List<Label> labels, Token keyword, Token colon,
       List<Statement> statements);
-
   /**
    * Returns a newly created switch statement. The list of [members] can be
    * `null` if there are no switch members.
@@ -1022,6 +993,19 @@ abstract class AstFactory {
       List<VariableDeclaration> variables);
 
   /**
+   * Returns a newly created generic type alias. Either or both of the
+   * [comment] and [metadata] can be `null` if the variable list does not have
+   * the corresponding attribute. The [typeParameters] can be `null` if there
+   * are no type parameters.
+   */
+  GenericTypeAlias genericTypeAlias(Comment comment, List<Annotation> metadata, Token typedefKeyword, SimpleIdentifier name, TypeParameterList typeParameters, Token equals, GenericFunctionType functionType, Token semicolon);
+
+  /**
+   * Initialize a newly created generic function type.
+   */
+  GenericFunctionType genericFunctionType(TypeAnnotation returnType, Token functionKeyword, TypeParameterList typeParameters, FormalParameterList _parameters);
+
+  /**
    * Returns a newly created variable declaration statement.
    */
   VariableDeclarationStatement variableDeclarationStatement(