Version 3.5.0-235.0.dev

Merge 63d6e6f into dev
dart-lang · Jun 7, 2024 · accb5c2 · accb5c2
2 parents 41acb19 + 63d6e6f
commit accb5c2
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 9 deletions.
diff --git a/pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml b/pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml
@@ -45,8 +45,8 @@
 #
 # Stats:
 # -  42 "needsEvaluation"
-# - 337 "needsFix"
-# - 414 "hasFix"
+# - 336 "needsFix"
+# - 415 "hasFix"
 # - 516 "noFix"
 
 AnalysisOptionsErrorCode.INCLUDED_FILE_PARSE_ERROR:
@@ -3217,9 +3217,7 @@ ParserErrorCode.SETTER_IN_FUNCTION:
 ParserErrorCode.STACK_OVERFLOW:
   status: noFix
 ParserErrorCode.STATIC_CONSTRUCTOR:
-  status: needsFix
-  notes: |-
-    Remove the `static` keyword.
+  status: hasFix
 ParserErrorCode.STATIC_GETTER_WITHOUT_BODY:
   status: needsFix
   notes: |-
@@ -3640,9 +3638,7 @@ WarningCode.NON_CONST_CALL_TO_LITERAL_CONSTRUCTOR:
   notes: |-
     The fix is to add `const` before the constructor invocation.
 WarningCode.NON_CONST_CALL_TO_LITERAL_CONSTRUCTOR_USING_NEW:
-  status: needsFix
-  notes: |-
-    The fix is to replace `new` with `const`.
+  status: hasFix
 WarningCode.NON_NULLABLE_EQUALS_PARAMETER:
   status: needsFix
   notes: |-

diff --git a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
@@ -1469,6 +1469,9 @@ final _builtInNonLintProducers = <ErrorCode, List<ProducerGenerator>>{
   ParserErrorCode.SETTER_CONSTRUCTOR: [
     RemoveLexeme.keyword,
   ],
+  ParserErrorCode.STATIC_CONSTRUCTOR: [
+    RemoveLexeme.keyword,
+  ],
   ParserErrorCode.VAR_AND_TYPE: [
     RemoveTypeAnnotation.fixVarAndType,
     RemoveVar.new,
@@ -1579,6 +1582,9 @@ final _builtInNonLintProducers = <ErrorCode, List<ProducerGenerator>>{
   WarningCode.MUST_CALL_SUPER: [
     AddCallSuper.new,
   ],
+  WarningCode.NON_CONST_CALL_TO_LITERAL_CONSTRUCTOR_USING_NEW: [
+    ReplaceNewWithConst.new,
+  ],
   WarningCode.NULLABLE_TYPE_IN_CATCH_CLAUSE: [
     RemoveQuestionMark.new,
   ],

diff --git a/pkg/analysis_server/test/src/services/correction/fix/remove_lexeme_test.dart b/pkg/analysis_server/test/src/services/correction/fix/remove_lexeme_test.dart
@@ -392,6 +392,19 @@ class C {
 ''');
   }
 
+  Future<void> test_staticConstructor() async {
+    await resolveTestCode('''
+class C {
+  static C.c(){}
+}
+''');
+    await assertHasFix('''
+class C {
+  C.c(){}
+}
+''');
+  }
+
   Future<void> test_staticTopLevelDeclaration_enum() async {
     await resolveTestCode(r'''
 static enum E { v }

diff --git a/pkg/analysis_server/test/src/services/correction/fix/replace_new_with_const_test.dart b/pkg/analysis_server/test/src/services/correction/fix/replace_new_with_const_test.dart
@@ -103,6 +103,12 @@ class ReplaceNewWithConstTest extends FixProcessorLintTest {
   @override
   String get lintCode => LintNames.prefer_const_constructors;
 
+  @override
+  void setUp() {
+    super.setUp();
+    writeTestPackageConfig(meta: true);
+  }
+
   Future<void> test_new() async {
     await resolveTestCode('''
 class C {
@@ -137,4 +143,23 @@ void f() {
     // handled by ADD_CONST
     await assertNoFix();
   }
+
+  Future<void> test_nonConstCallToLiteralConstructorUsingNew() async {
+    await resolveTestCode('''
+import 'package:meta/meta.dart';
+class A {
+  @literal
+  const A();
+}
+var a = new A();
+''');
+    await assertHasFix('''
+import 'package:meta/meta.dart';
+class A {
+  @literal
+  const A();
+}
+var a = const A();
+''');
+  }
 }
diff --git a/tools/VERSION b/tools/VERSION
@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 5
 PATCH 0
-PRERELEASE 234
+PRERELEASE 235
 PRERELEASE_PATCH 0