Enable generic method support by default

pkg/analyzer/lib/src/generated/engine.dart

Index: pkg/analyzer/lib/src/generated/engine.dart
diff --git a/pkg/analyzer/lib/src/generated/engine.dart b/pkg/analyzer/lib/src/generated/engine.dart
index a33bebabede677541545ddc515459f57dfbc51ec..ef2b9ad9ac934ce09d632ddae2e768837408b186 100644
--- a/pkg/analyzer/lib/src/generated/engine.dart
+++ b/pkg/analyzer/lib/src/generated/engine.dart
@@ -1116,6 +1116,7 @@ abstract class AnalysisOptions {
   /**
    * Return `true` to enable generic methods (DEP 22).
    */
+  @deprecated
   bool get enableGenericMethods => null;
 
   /**
@@ -1259,7 +1260,8 @@ abstract class AnalysisOptions {
  */
 class AnalysisOptionsImpl implements AnalysisOptions {
   /**
-   * DEPRECATED: The maximum number of sources for which data should be kept in the cache.
+   * DEPRECATED: The maximum number of sources for which data should be kept in
+   * the cache.
    *
    * This constant no longer has any effect.
    */
@@ -1267,12 +1269,11 @@ class AnalysisOptionsImpl implements AnalysisOptions {
   static const int DEFAULT_CACHE_SIZE = 64;
 
   static const int ENABLE_ASSERT_FLAG = 0x01;
-  static const int ENABLE_GENERIC_METHODS_FLAG = 0x02;
-  static const int ENABLE_LAZY_ASSIGNMENT_OPERATORS = 0x04;
-  static const int ENABLE_STRICT_CALL_CHECKS_FLAG = 0x08;
-  static const int ENABLE_STRONG_MODE_FLAG = 0x10;
-  static const int ENABLE_STRONG_MODE_HINTS_FLAG = 0x20;
-  static const int ENABLE_SUPER_MIXINS_FLAG = 0x40;
+  static const int ENABLE_LAZY_ASSIGNMENT_OPERATORS = 0x02;
+  static const int ENABLE_STRICT_CALL_CHECKS_FLAG = 0x04;
+  static const int ENABLE_STRONG_MODE_FLAG = 0x08;
+  static const int ENABLE_STRONG_MODE_HINTS_FLAG = 0x10;
+  static const int ENABLE_SUPER_MIXINS_FLAG = 0x20;
 
   /**
    * The default list of non-nullable type names.
@@ -1288,7 +1289,7 @@ class AnalysisOptionsImpl implements AnalysisOptions {
 
   @override
   @deprecated
-  int cacheSize = DEFAULT_CACHE_SIZE;
+  int cacheSize = 64;
 
   @override
   bool dart2jsHint = false;
@@ -1300,9 +1301,6 @@ class AnalysisOptionsImpl implements AnalysisOptions {
   bool enableAssertMessage = false;
 
   @override
-  bool enableGenericMethods = false;
-
-  @override
   bool enableInitializingFormalAccess = false;
 
   @override
@@ -1406,7 +1404,6 @@ class AnalysisOptionsImpl implements AnalysisOptions {
     enableAssertInitializer = options.enableAssertInitializer;
     enableAssertMessage = options.enableAssertMessage;
     enableStrictCallChecks = options.enableStrictCallChecks;
-    enableGenericMethods = options.enableGenericMethods;
     enableInitializingFormalAccess = options.enableInitializingFormalAccess;
     enableLazyAssignmentOperators = options.enableLazyAssignmentOperators;
     enableSuperMixins = options.enableSuperMixins;
@@ -1478,9 +1475,15 @@ class AnalysisOptionsImpl implements AnalysisOptions {
   void set enableConditionalDirectives(_) {}
 
   @override
+  @deprecated
+  bool get enableGenericMethods => true;
+
+  @deprecated
+  void set enableGenericMethods(bool enable) {}
+
+  @override
   List<int> encodeCrossContextOptions() {
     int flags = (enableAssertMessage ? ENABLE_ASSERT_FLAG : 0) |
-        (enableGenericMethods ? ENABLE_GENERIC_METHODS_FLAG : 0) |
         (enableLazyAssignmentOperators ? ENABLE_LAZY_ASSIGNMENT_OPERATORS : 0) |
         (enableStrictCallChecks ? ENABLE_STRICT_CALL_CHECKS_FLAG : 0) |
         (enableSuperMixins ? ENABLE_SUPER_MIXINS_FLAG : 0) |
@@ -1492,7 +1495,6 @@ class AnalysisOptionsImpl implements AnalysisOptions {
   @override
   void setCrossContextOptionsFrom(AnalysisOptions options) {
     enableAssertMessage = options.enableAssertMessage;
-    enableGenericMethods = options.enableGenericMethods;
     enableLazyAssignmentOperators = options.enableLazyAssignmentOperators;
     enableStrictCallChecks = options.enableStrictCallChecks;
     enableSuperMixins = options.enableSuperMixins;
@@ -1514,9 +1516,6 @@ class AnalysisOptionsImpl implements AnalysisOptions {
     if (flags & ENABLE_ASSERT_FLAG > 0) {
       parts.add('assert');
     }
-    if (flags & ENABLE_GENERIC_METHODS_FLAG > 0) {
-      parts.add('genericMethods');
-    }
     if (flags & ENABLE_LAZY_ASSIGNMENT_OPERATORS > 0) {
       parts.add('lazyAssignmentOperators');
     }