Version 3.12.0-67.0.dev

Merge 7c60da7 into dev

Author: Dart CI

DEPS

@@ -131,7 +131,7 @@ vars = {
   #   and land the review.
   #
   # For more details, see https://github.com/dart-lang/sdk/issues/30164.
-  "dart_style_rev": "bdae98cead73a436920f890626aa81cf3f2f8904", # rolled manually
+  "dart_style_rev": "f624489a5013ec58de469d4fd8793c283f62b5d8", # rolled manually
 
   ### /third_party/pkg dependencies
   # 'tools/rev_sdk_deps.dart' will rev pkg dependencies to their latest; put an

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

@@ -26,6 +26,19 @@ import '../../../utilities/extensions/ast.dart';
 
 typedef _Constructors = Map<ConstructorElement, _Constructor>;
 
+/// This correction producer converts a class to an enum, if possible, by making
+/// the following changes:
+///
+/// * changes the `class` keyword to `enum`,
+/// * removes the `const` keyword from the primary constructor, if there is one,
+/// * converts static fields into enum constant values,
+/// * removes an `int index` field if there is one,
+/// * removes any field formal parameters for the index field from all
+///   constructors,
+/// * removes all arguments for said index field formal parameters,
+/// * removes the singular constructor (primary, or in-body), if there is only
+///   one, and it no longer accepts any arguments (after removing a possible
+///   index parameter), and it has no doc comment nor annotations.
 class ConvertClassToEnum extends ResolvedCorrectionProducer {
   ConvertClassToEnum({required super.context});
 
@@ -160,6 +173,9 @@ class _EnumDescription {
   /// The indexes of members that need to be deleted.
   final List<int> membersToDelete = [];
 
+  /// The primary constructor, if it needs to be deleted.
+  PrimaryConstructorDeclaration? primaryConstructorToDelete;
+
   /// The indexes of primary constructor parameters that need to be deleted.
   final List<int> parametersToDelete = [];
 
@@ -287,6 +303,14 @@ class _EnumDescription {
     // Update the constructors.
     _transformConstructors(builder);
 
+    if (primaryConstructorToDelete case var primaryConstructor?) {
+      if (primaryConstructor.constructorName case var constuctorName?) {
+        builder.addDeletion(range.startEnd(constuctorName, primaryConstructor));
+      } else {
+        builder.addDeletion(range.node(primaryConstructor.formalParameters));
+      }
+    }
+
     // Special case replacing all of the members.
     if (membersToDelete.length == members.length) {
       builder.addSimpleReplacement(
@@ -390,7 +414,7 @@ class _EnumDescription {
           parameters.length - (parameterData == null ? 0 : 1);
       if (updatedParameterCount != 0) return null;
 
-      // TODO(srawlins): Mark `primaryConstructor` as "to be deleted."
+      primaryConstructorToDelete = primaryConstructor;
       return primaryConstructor;
     }
   }

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

@@ -3065,10 +3065,6 @@ missing_star_after_sync:
     Remove the `sync` keyword. Add a `*`.
 missing_statement:
   status: noFix
-missing_terminator_for_parameter_group:
-  status: needsFix
-  notes: |-
-    Add the missing terminator.
 missing_typedef_parameters:
   status: hasFix
 missing_variable_in_for_each:
@@ -3116,8 +3112,6 @@ multiple_representation_fields:
   notes: |-
     Remove extra fields.
     Maybe wrap into a record.
-multiple_variables_in_for_each:
-  status: noFix
 multiple_variance_modifiers:
   status: noFix
 multiple_with_clauses:
@@ -3158,8 +3152,6 @@ non_part_of_directive_in_part:
     Remove the directive. Move the directive to the library.
 non_string_literal_as_uri:
   status: noFix
-non_user_definable_operator:
-  status: noFix
 normal_before_optional_parameters:
   status: needsFix
   notes: |-
@@ -3268,10 +3260,6 @@ typedef_in_class:
   status: needsFix
   notes: |-
     Move the typedef to the top level.
-unexpected_terminator_for_parameter_group:
-  status: needsFix
-  notes: |-
-    Remove the terminator.
 unexpected_token:
   status: noFix
 unexpected_tokens:
@@ -3308,10 +3296,6 @@ wrong_number_of_parameters_for_setter:
   status: needsFix
 wrong_separator_for_positional_parameter:
   status: hasFix
-wrong_terminator_for_parameter_group:
-  status: needsFix
-  notes: |-
-    Replace the terminator with the correct terminator.
 asset_does_not_exist:
   status: noFix
   since: ~2.15
@@ -3390,8 +3374,6 @@ missing_hex_digit:
   status: noFix
 missing_quote:
   status: noFix
-unable_get_content:
-  status: noFix
 unexpected_dollar_in_string:
   status: noFix
 unexpected_separator_in_number:

pkg/analysis_server/test/services/refactoring/legacy/extract_widget_test.dart

@@ -371,7 +371,7 @@ class C {
 }
 
 class MyWidget extends StatelessWidget {
-  C c = C();
+  final C c = C();
 
   @override
   Widget build(BuildContext context) {
@@ -394,7 +394,7 @@ class C {
 }
 
 class MyWidget extends StatelessWidget {
-  C c = C();
+  final C c = C();
 
   @override
   Widget build(BuildContext context) {
@@ -476,7 +476,7 @@ class Test extends StatelessWidget {
 import 'package:flutter/material.dart';
 
 class MyWidget extends StatelessWidget {
-  String foo = '';
+  final String foo = '';
 
   @override
   Widget build(BuildContext context) {
@@ -504,7 +504,7 @@ class MyWidget extends StatelessWidget {
 import 'package:flutter/material.dart';
 
 class MyWidget extends StatelessWidget {
-  String foo = '';
+  final String foo = '';
 
   @override
   Widget build(BuildContext context) {
@@ -720,7 +720,7 @@ class C {
 }
 
 class MyWidget extends StatelessWidget {
-  C c = C();
+  final C c = C();
 
   @override
   Widget build(BuildContext context) {
@@ -738,7 +738,7 @@ class C {
 }
 
 class MyWidget extends StatelessWidget {
-  C c = C();
+  final C c = C();
 
   @override
   Widget build(BuildContext context) {
@@ -806,6 +806,7 @@ class Test extends StatelessWidget {
     await indexTestUnit(r'''
 import 'package:flutter/material.dart';
 
+// ignore: must_be_immutable
 class MyWidget extends StatelessWidget {
   String field;
 
@@ -832,10 +833,12 @@ class MyWidget extends StatelessWidget {
     await indexTestUnit(r'''
 import 'package:flutter/material.dart';
 
+// ignore: must_be_immutable
 abstract class MySuperWidget extends StatelessWidget {
   String field = '';
 }
 
+// ignore: must_be_immutable
 class MyWidget extends MySuperWidget {
   @override
   Widget build(BuildContext context) {
@@ -863,7 +866,7 @@ class C {
 }
 
 class MyWidget extends StatelessWidget {
-  C c = C();
+  final C c = C();
 
   @override
   Widget build(BuildContext context) {
@@ -886,7 +889,7 @@ class C {
 }
 
 class MyWidget extends StatelessWidget {
-  C c = C();
+  final C c = C();
 
   @override
   Widget build(BuildContext context) {

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

@@ -32,7 +32,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
 class W extends Widget {
-  bool ^property = true;
+  final bool ^property = true;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
@@ -44,7 +44,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
 class W extends Widget {
-  bool property = true;
+  final bool property = true;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);

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

@@ -272,12 +272,8 @@ enum _E {
 ''');
   }
 
-  @FailingTest(reason: 'To implement next.')
   Future<void>
   test_index_namedIndex_only_privateClass_primaryConstructor() async {
-    // TODO(srawlins): Test with primary constructor with non-declaring index
-    // parameter.
-    // TODO(srawlins): Test with private primary constructor on a public class.
     await resolveTestCode('''
 class const _^E(final int index) {
   static const _E c0 = _E(0);
@@ -292,6 +288,24 @@ enum _E {
 ''');
   }
 
+  Future<void>
+  test_index_namedIndex_only_privateClass_primaryConstructor_nonDeclaring() async {
+    await resolveTestCode('''
+class const _^E(this.index) {
+  static const _E c0 = _E(0);
+  static const _E c1 = _E(1);
+
+  final int index;
+}
+''');
+    await assertHasAssist('''
+enum _E {
+  c0,
+  c1
+}
+''');
+  }
+
   Future<void> test_index_namedIndex_only_publicClass() async {
     await resolveTestCode('''
 class ^E {
@@ -313,6 +327,22 @@ enum E {
 ''');
   }
 
+  Future<void>
+  test_index_namedIndex_only_publicClass_primaryConstructor() async {
+    await resolveTestCode('''
+class const ^E._(final int index) {
+  static const E c0 = E._(0);
+  static const E c1 = E._(1);
+}
+''');
+    await assertHasAssist('''
+enum E._() {
+  c0._(),
+  c1._()
+}
+''');
+  }
+
   Future<void> test_index_notNamedIndex_privateClass() async {
     await resolveTestCode('''
 class _^E {
@@ -649,6 +679,59 @@ enum _E {
 ''');
   }
 
+  Future<void> test_minimal_privateClass_primaryConstructor() async {
+    await resolveTestCode('''
+class const _^E() {
+  static const _E c = _E();
+}
+''');
+    await assertHasAssist('''
+enum _E {
+  c
+}
+''');
+  }
+
+  Future<void>
+  test_minimal_privateClass_primaryConstructorHasAnnotation() async {
+    await resolveTestCode('''
+class const _^E() {
+  static const _E c = _E();
+
+  @deprecated
+  this;
+}
+''');
+    await assertHasAssist('''
+enum _E() {
+  c;
+
+  @deprecated
+  this;
+}
+''');
+  }
+
+  Future<void>
+  test_minimal_privateClass_primaryConstructorHasDocComment() async {
+    await resolveTestCode('''
+class const _^E() {
+  static const _E c = _E();
+
+  /// Doc comment.
+  this;
+}
+''');
+    await assertHasAssist('''
+enum _E() {
+  c;
+
+  /// Doc comment.
+  this;
+}
+''');
+  }
+
   Future<void> test_minimal_publicClass() async {
     await resolveTestCode('''
 class ^E {

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

@@ -175,6 +175,7 @@ class _MyWidgetState<T> extends State<MyWidget<T>> {
     await resolveTestCode(r'''
 import 'package:flutter/material.dart';
 
+// ignore: must_be_immutable
 class ^MyWidget extends StatelessWidget {
   static String staticField1 = '';
   final String instanceField1;
@@ -210,6 +211,7 @@ class ^MyWidget extends StatelessWidget {
     await assertHasAssist(r'''
 import 'package:flutter/material.dart';
 
+// ignore: must_be_immutable
 class MyWidget extends StatefulWidget {
   static String staticField1 = '';
   final String instanceField1;
@@ -316,7 +318,7 @@ import 'package:flutter/material.dart';
 class ^MyWidget extends StatelessWidget {
   static String staticField = '';
   final String instanceField1;
-  String instanceField2 = '';
+  final String instanceField2 = '';
 
   MyWidget(this.instanceField1);
 
@@ -372,7 +374,7 @@ class MyWidget extends StatefulWidget {
 }
 
 class _MyWidgetState extends State<MyWidget> {
-  String instanceField2 = '';
+  final String instanceField2 = '';
 
   @override
   Widget build(BuildContext context) {