Version 3.3.0-153.0.dev

Merge a45fc14 into dev

Author: Dart CI

pkg/_fe_analyzer_shared/lib/src/flow_analysis/flow_analysis.dart

@@ -3215,11 +3215,6 @@ class PromotionModel<Type extends Object> {
       Type declaredType, List<Type>? promotedTypes, Type writtenType) {
     assert(!writeCaptured);
 
-    if (typeOperations.forcePromotion(
-        writtenType, declaredType, this.promotedTypes, promotedTypes)) {
-      return _addToPromotedTypes(promotedTypes, writtenType);
-    }
-
     // Figure out if we have any promotion candidates (types that are a
     // supertype of writtenType and a proper subtype of the currently-promoted
     // type).  If at any point we find an exact match, we take it immediately.
@@ -3360,8 +3355,6 @@ class PromotionModel<Type extends Object> {
     TypeOperations<Type> typeOperations = helper.typeOperations;
     List<Type>? newPromotedTypes = joinPromotedTypes(
         first.promotedTypes, second.promotedTypes, typeOperations);
-    newPromotedTypes = typeOperations.refinePromotedTypes(
-        first.promotedTypes, second.promotedTypes, newPromotedTypes);
     bool newAssigned = first.assigned && second.assigned;
     bool newUnassigned = first.unassigned && second.unassigned;
     bool newWriteCaptured = first.writeCaptured || second.writeCaptured;

pkg/_fe_analyzer_shared/lib/src/type_inference/type_operations.dart

@@ -46,16 +46,6 @@ mixin TypeOperations<Type extends Object> {
   /// consideration by an instance check.
   Type factor(Type from, Type what);
 
-  /// Whether the possible promotion from [from] to [to] should be forced, given
-  /// the current [promotedTypes], and [newPromotedTypes] resulting from
-  /// possible demotion.
-  ///
-  /// It is not expected that any implementation would override this except for
-  /// the migration engine.
-  bool forcePromotion(Type to, Type from, List<Type>? promotedTypes,
-          List<Type>? newPromotedTypes) =>
-      false;
-
   /// Computes the greatest lower bound of [type1] and [type2].
   Type glb(Type type1, Type type2);
 
@@ -119,15 +109,6 @@ mixin TypeOperations<Type extends Object> {
   /// `FutureOr<int?>`), so [type] may be returned even if it is nullable.
   Type /*!*/ promoteToNonNull(Type type);
 
-  /// Performs refinements on the [promotedTypes] chain which resulted in
-  /// intersecting [chain1] and [chain2].
-  ///
-  /// It is not expected that any implementation would override this except for
-  /// the migration engine.
-  List<Type>? refinePromotedTypes(
-          List<Type>? chain1, List<Type>? chain2, List<Type>? promotedTypes) =>
-      promotedTypes;
-
   /// Tries to promote to the first type from the second type, and returns the
   /// promoted type if it succeeds, otherwise null.
   Type? tryPromoteToType(Type to, Type from);

pkg/analysis_server/lib/src/services/completion/dart/type_member_contributor.dart

@@ -74,6 +74,10 @@ class TypeMemberContributor extends DartCompletionContributor {
         // Suggestions provided by StaticMemberContributor.
         return;
       }
+      if (elem is ExtensionElement) {
+        // Suggestions provided by StaticMemberContributor.
+        return;
+      }
       if (elem is PrefixElement) {
         // Suggestions provided by LibraryMemberContributor.
         return;

pkg/analysis_server/lib/src/services/correction/dart/convert_class_to_enum.dart

@@ -194,8 +194,20 @@ class _EnumDescription {
         .sort((first, second) => first.indexValue.compareTo(second.indexValue));
     for (var field in fieldsToConvert) {
       // Compute the declaration of the corresponding enum constant.
+      var documentationComment = field.element.documentationComment;
       if (constantsBuffer.isNotEmpty) {
-        constantsBuffer.write(',$eol$indent');
+        constantsBuffer.write(',$eol');
+        if (documentationComment != null) {
+          // If the current field has a documentation comment and
+          // it's not the first field, add an extra new line.
+          constantsBuffer.write(eol);
+        }
+        constantsBuffer.write(indent);
+      }
+      if (documentationComment != null) {
+        constantsBuffer
+            .write(documentationComment.replaceAll(eol, '$eol$indent'));
+        constantsBuffer.write('$eol$indent');
       }
       constantsBuffer.write(field.name);
       var invocation = field.instanceCreation;

pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml

@@ -1042,8 +1042,6 @@ CompileTimeErrorCode.LATE_FINAL_LOCAL_ALREADY_ASSIGNED:
     Remove `final`.
 CompileTimeErrorCode.LIST_ELEMENT_TYPE_NOT_ASSIGNABLE:
   status: noFix
-CompileTimeErrorCode.MACRO_EXECUTION_EXCEPTION:
-  status: noFix
 CompileTimeErrorCode.MAIN_FIRST_POSITIONAL_PARAMETER_TYPE:
   status: needsFix
   notes: |-
@@ -1821,8 +1819,6 @@ FfiCode.SUBTYPE_OF_STRUCT_CLASS_IN_IMPLEMENTS:
   status: hasFix
 FfiCode.SUBTYPE_OF_STRUCT_CLASS_IN_WITH:
   status: hasFix
-HintCode.CAN_BE_NULL_AFTER_NULL_AWARE:
-  status: hasFix
 HintCode.DEPRECATED_COLON_FOR_DEFAULT_VALUE:
   status: hasFix
 HintCode.DEPRECATED_MEMBER_USE:
@@ -3691,12 +3687,6 @@ WarningCode.NULLABLE_TYPE_IN_CATCH_CLAUSE:
 WarningCode.NULL_ARGUMENT_TO_NON_NULL_TYPE:
   status: noFix
   since: ~2.15
-WarningCode.NULL_AWARE_BEFORE_OPERATOR:
-  status: noFix
-WarningCode.NULL_AWARE_IN_CONDITION:
-  status: noFix
-WarningCode.NULL_AWARE_IN_LOGICAL_OPERATOR:
-  status: noFix
 WarningCode.NULL_CHECK_ALWAYS_FAILS:
   status: needsFix
   notes: |-

pkg/analysis_server/lib/src/services/correction/fix_internal.dart

@@ -1460,9 +1460,6 @@ class FixProcessor extends BaseProcessor {
     FfiCode.SUBTYPE_OF_STRUCT_CLASS_IN_WITH: [
       RemoveNameFromDeclarationClause.new,
     ],
-    HintCode.CAN_BE_NULL_AFTER_NULL_AWARE: [
-      ReplaceWithNullAware.inChain,
-    ],
     HintCode.DEPRECATED_COLON_FOR_DEFAULT_VALUE: [
       ReplaceColonWithEquals.new,
     ],

pkg/analysis_server/test/services/completion/dart/declaration/extension_member_test.dart

@@ -486,6 +486,28 @@ suggestions
     }
   }
 
+  Future<void> test_staticMemberAccess_none() async {
+    allowedIdentifiers = {
+      'hashCode',
+      'noSuchMethod',
+      'runtimeType',
+      'toString'
+    };
+    await computeSuggestions('''
+extension E on int {
+  void a0() {}
+}
+void f() {
+  E.^
+}
+''');
+    // The purpose of this test is to verify that Type instance members
+    // are not suggested when accessing static members of an extension.
+    assertResponse(r'''
+suggestions
+''');
+  }
+
   Future<void> test_staticMemberAccess_none_partial() async {
     await computeSuggestions('''
 extension E on int {

pkg/analysis_server/test/src/services/correction/assist/convert_class_to_enum_test.dart

@@ -19,6 +19,95 @@ class ConvertClassToEnumTest extends AssistProcessorTest {
   @override
   AssistKind get kind => DartAssistKind.CONVERT_CLASS_TO_ENUM;
 
+  Future<void> test_documentationComments_mix() async {
+    await resolveTestCode('''
+class E {
+  /// AAA
+  static const E a = E._('a');
+  static const E b = E._('b');
+
+  /// CCC
+  static const E c = E._('c');
+
+  final String name;
+
+  const E._(this.name);
+}
+''');
+    await assertHasAssistAt('E {', '''
+enum E {
+  /// AAA
+  a._('a'),
+  b._('b'),
+
+  /// CCC
+  c._('c');
+
+  final String name;
+
+  const E._(this.name);
+}
+''');
+  }
+
+  Future<void> test_documentationComments_multiple() async {
+    await resolveTestCode('''
+class E {
+  /// AAA
+  static const E a = E._('a');
+
+  /// BBB
+  /// BBB
+  static const E b = E._('b');
+
+  /// Name.
+  final String name;
+
+  const E._(this.name);
+}
+''');
+    await assertHasAssistAt('E {', '''
+enum E {
+  /// AAA
+  a._('a'),
+
+  /// BBB
+  /// BBB
+  b._('b');
+
+  /// Name.
+  final String name;
+
+  const E._(this.name);
+}
+''');
+  }
+
+  Future<void> test_documentationComments_single() async {
+    await resolveTestCode('''
+class E {
+  /// AAA
+  static const E a = E._('a');
+
+  /// Name.
+  final String name;
+
+  const E._(this.name);
+}
+''');
+    await assertHasAssistAt('E {', '''
+enum E {
+  /// AAA
+  a._('a');
+
+  /// Name.
+  final String name;
+
+  const E._(this.name);
+}
+''');
+  }
+
   Future<void> test_extends_object_privateClass() async {
     await resolveTestCode('''
 class _E extends Object {

pkg/analysis_server/test/src/services/correction/fix/add_missing_required_argument_test.dart

@@ -3,8 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analysis_server/src/services/correction/fix.dart';
-import 'package:analyzer/src/error/codes.dart';
-import 'package:analyzer/src/utilities/legacy.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -257,66 +255,6 @@ void f() {
 ''');
   }
 
-  Future<void> test_constructor_single_closure_nnbd_from_legacy() async {
-    newFile('$testPackageLibPath/a.dart', r'''
-// @dart = 2.8
-import 'package:meta/meta.dart';
-
-typedef int Callback(int a);
-
-class A {
-  A({@required Callback callback}) {}
-}
-''');
-    await resolveTestCode('''
-import 'package:test/a.dart';
-
-void f() {
-  A a = new A();
-  print(a);
-}
-''');
-    await assertHasFix('''
-import 'package:test/a.dart';
-
-void f() {
-  A a = new A(callback: (int a) {  });
-  print(a);
-}
-''',
-        errorFilter: (error) =>
-            error.errorCode == WarningCode.MISSING_REQUIRED_PARAM);
-  }
-
-  Future<void> test_constructor_single_closure_nnbd_into_legacy() async {
-    noSoundNullSafety = false;
-    newFile('$testPackageLibPath/a.dart', r'''
-typedef int Callback(int? a);
-
-class A {
-  A({required Callback callback}) {}
-}
-''');
-    await resolveTestCode('''
-// @dart = 2.8
-import 'package:test/a.dart';
-
-void f() {
-  A a = new A();
-  print(a);
-}
-''');
-    await assertHasFix('''
-// @dart = 2.8
-import 'package:test/a.dart';
-
-void f() {
-  A a = new A(callback: (int a) {  });
-  print(a);
-}
-''');
-  }
-
   Future<void> test_constructor_single_list() async {
     newFile('$testPackageLibPath/a.dart', r'''
 class A {

pkg/analysis_server/test/src/services/correction/fix/convert_class_to_enum_test.dart

@@ -75,6 +75,35 @@ class ConvertClassToEnumTest extends FixProcessorLintTest {
   @override
   String get lintCode => LintNames.use_enums;
 
+  Future<void> test_minimal_documentationComments() async {
+    await resolveTestCode('''
+class E {
+  /// C0.
+  static const E c0 = E._(0);
+
+  /// C1.
+  static const E c1 = E._(1);
+
+  final int value;
+
+  const E._(this.value);
+}
+''');
+    await assertHasFix('''
+enum E {
+  /// C0.
+  c0._(0),
+
+  /// C1.
+  c1._(1);
+
+  final int value;
+
+  const E._(this.value);
+}
+''');
+  }
+
   Future<void> test_minimal_intField_privateClass() async {
     await resolveTestCode('''
 class _E {