dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Quick fixes that create constructors use new-style syntax when primary_constructors is enabled

Browse Source 
Closes https://github.com/dart-lang/sdk/pull/63534

GitOrigin-RevId: 345471bc33c002bbca9cea9c6626a05f481f70e3
Change-Id: If8d533ab0bbb4e6dff51a4256101fb8cb0490fb4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/509680
Commit-Queue: Samuel Rawlins <srawlins@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Samuel Rawlins <srawlins@google.com>
This commit is contained in:
Varad Raj Agrawal
2026-06-09 10:57:01 -07:00
committed by dart-scoped@luci-project-accounts.iam.gserviceaccount.com
parent 68c13971f6
commit 6a678d1f49
17 changed files with 256 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/analysis_server/lib/src/services/correction/dart/create_constructor_for_final_fields.dart
+20 -4
View File
@@ -177,7 +177,11 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
// TODO(srawlins): Replace this block with `writeConstructorDeclaration`
// and `parameterWriter`.
builder.write('const ');
builder.write(fixContext.containerName);
if (isEnabled(Feature.primary_constructors)) {
builder.write('new');
} else {
builder.write(fixContext.containerName);
}
builder.write('({');
if (!requiredNamedParametersFirst) {
builder.writeType(
@@ -227,7 +231,11 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
// TODO(srawlins): Replace this block with `writeConstructorDeclaration`
// and `parameterWriter`.
builder.write('const ');
builder.write(fixContext.containerName);
if (isEnabled(Feature.primary_constructors)) {
builder.write('new');
} else {
builder.write(fixContext.containerName);
}
builder.write('({');
if (!requiredNamedParametersFirst) {
builder.write('super.key');
@@ -276,7 +284,11 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
if (isConst) {
builder.write('const ');
}
builder.write(fixContext.containerName);
if (isEnabled(Feature.primary_constructors)) {
builder.write('new');
} else {
builder.write(fixContext.containerName);
}
builder.write('({');
var parameters = <_FieldRecord>[];
var buffer = StringBuffer();
@@ -336,7 +348,11 @@ class CreateConstructorForFinalFields extends ResolvedCorrectionProducer {
if (isConst) {
builder.write('const ');
}
builder.write(fixContext.containerName);
if (isEnabled(Feature.primary_constructors)) {
builder.write('new');
} else {
builder.write(fixContext.containerName);
}
builder.write('(');
var hasWritten = false;
for (var field in fields) {
pkg/analysis_server/lib/src/services/correction/dart/create_constructor_super.dart
+24 -8
View File
@@ -156,10 +156,18 @@ class _CreateConstructor extends ResolvedCorrectionProducer {
}
}
builder.write(_targetClass.namePart.typeName.lexeme);
if (constructorName != null && constructorName != 'new') {
builder.write('.');
builder.addSimpleLinkedEdit('NAME', constructorName);
if (isEnabled(Feature.primary_constructors)) {
builder.write('new');
if (constructorName != null && constructorName != 'new') {
builder.write(' ');
builder.addSimpleLinkedEdit('NAME', constructorName);
}
} else {
builder.write(_targetClass.namePart.typeName.lexeme);
if (constructorName != null && constructorName != 'new') {
builder.write('.');
builder.addSimpleLinkedEdit('NAME', constructorName);
}
}
builder.write('(');
writeParameters(true);
@@ -202,10 +210,18 @@ class _CreateConstructor extends ResolvedCorrectionProducer {
builder.write(parameterName);
}
builder.write(_targetClass.namePart.typeName.lexeme);
if (constructorName != null && constructorName != 'new') {
builder.write('.');
builder.addSimpleLinkedEdit('NAME', constructorName);
if (isEnabled(Feature.primary_constructors)) {
builder.write('new');
if (constructorName != null && constructorName != 'new') {
builder.write(' ');
builder.addSimpleLinkedEdit('NAME', constructorName);
}
} else {
builder.write(_targetClass.namePart.typeName.lexeme);
if (constructorName != null && constructorName != 'new') {
builder.write('.');
builder.addSimpleLinkedEdit('NAME', constructorName);
}
}
builder.write('(');
pkg/analysis_server/test/edit/refactoring_test.dart
+1 -1
View File
@@ -2269,7 +2269,7 @@ enum E {
enum E {
v1.newName(), v2.newName();
const E.newName();
const new newName();
}
''',
feedbackValidator: (feedback) {
pkg/analysis_server/test/lsp/completion_dart_test.dart
+6 -6
View File
@@ -5497,7 +5497,7 @@ import 'package:flutter/widgets.dart';
class A {}
class \${1:MyWidget} extends StatefulWidget {
const \${1:MyWidget}$expectedWidgetConstructorParams;
const new$expectedWidgetConstructorParams;
@override
State<\${1:MyWidget}> createState() => _\${1:MyWidget}State();
@@ -5540,7 +5540,7 @@ import 'package:flutter/widgets.dart';
class A {}
class \${1:MyWidget} extends StatefulWidget {
const \${1:MyWidget}$expectedWidgetConstructorParams;
const new$expectedWidgetConstructorParams;
@override
State<\${1:MyWidget}> createState() => _\${1:MyWidget}State();
@@ -5598,7 +5598,7 @@ import 'package:flutter/widgets.dart';
class A {}
class \${1:MyWidget} extends StatelessWidget {
const \${1:MyWidget}$expectedWidgetConstructorParams;
const new$expectedWidgetConstructorParams;
@override
Widget build(BuildContext context) {
@@ -5634,7 +5634,7 @@ $expectedImports
class A {}
class \${1:MyWidget} extends StatelessWidget {
const \${1:MyWidget}$expectedWidgetConstructorParams;
const new$expectedWidgetConstructorParams;
@override
Widget build(BuildContext context) {
@@ -5664,7 +5664,7 @@ stless^
$expectedImports
class \${1:MyWidget} extends StatelessWidget {
const \${1:MyWidget}$expectedWidgetConstructorParams;
const new$expectedWidgetConstructorParams;
@override
Widget build(BuildContext context) {
@@ -5692,7 +5692,7 @@ class \${1:MyWidget} extends StatelessWidget {
$expectedImports
class \${1:MyWidget} extends StatelessWidget {
const \${1:MyWidget}$expectedWidgetConstructorParams;
const new$expectedWidgetConstructorParams;
@override
Widget build(BuildContext context) {
pkg/analysis_server/test/services/refactoring/legacy/extract_widget_test.dart
+20 -20
View File
@@ -127,7 +127,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
});
@@ -178,7 +178,7 @@ Widget f() {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
});
@@ -214,7 +214,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
});
@@ -247,7 +247,7 @@ Widget f() {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
});
@@ -300,7 +300,7 @@ Widget f() {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
});
@@ -403,7 +403,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
required this.c,
});
@@ -455,7 +455,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
});
@@ -519,7 +519,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
required this.foo,
required this.p1,
@@ -574,7 +574,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
required this.n,
this.i,
@@ -623,7 +623,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
this.value,
});
@@ -688,7 +688,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
required this.foo,
required this.p1,
@@ -747,7 +747,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
required this.c,
});
@@ -790,7 +790,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
});
@@ -898,7 +898,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
required this.c,
});
@@ -962,7 +962,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
required this.local,
});
@@ -1032,7 +1032,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
required this._field,
});
@@ -1081,7 +1081,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
required this.field,
required String field2,
@@ -1186,7 +1186,7 @@ class MyWidget extends StatelessWidget {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
required this.field,
required this.local,
@@ -1251,7 +1251,7 @@ Widget f() {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
required this.index,
required this.a,
@@ -1416,7 +1416,7 @@ class _MyWidgetState extends State<MyWidget> {
}
class Test extends StatelessWidget {
const Test({
const new({
super.key,
required this.widget,
});
pkg/analysis_server/test/services/refactoring/legacy/rename_constructor_test.dart
+7 -7
View File
@@ -170,7 +170,7 @@ void f() {
class A {
int field = 0;
A.newName();
new newName();
}
class B extends A {
B() : super.newName() {}
@@ -468,7 +468,7 @@ void f() {
refactoring.newName = 'newName';
return assertSuccessfulRefactoring('''
class A {
A.newName();
new newName();
int field = 0;
}
@@ -752,7 +752,7 @@ enum E {
factory E.other() => throw 0;
const E.newName();
const new newName();
}
''');
}
@@ -780,7 +780,7 @@ enum E {
final int foo = 0;
const E.newName();
const new newName();
}
''');
}
@@ -806,7 +806,7 @@ enum E {
enum E {
v1.newName(), v2.newName(), v3.newName();
const E.newName();
const new newName();
void foo() {}
}
@@ -832,7 +832,7 @@ enum E {
enum E {
v1.newName(), v2.newName(), v3.newName();
const E.newName();
const new newName();
}
''');
}
@@ -856,7 +856,7 @@ enum E {
enum E {
v1.newName(), v2.newName(), v3.newName();
const E.newName();
const new newName();
}
''');
}
pkg/analysis_server/test/services/snippets/dart/flutter_stateful_widget_test.dart
+3 -3
View File
@@ -61,13 +61,13 @@ class _/*4*/MyWidgetState extends State</*5*/MyWidget> {
import 'package:flutter/widgets.dart';
class /*0*/MyWidget extends StatefulWidget {
const /*1*/MyWidget({super.key});
const new({super.key});
@override
State</*2*/MyWidget> createState() => _/*3*/MyWidgetState();
State</*1*/MyWidget> createState() => _/*2*/MyWidgetState();
}
class _/*4*/MyWidgetState extends State</*5*/MyWidget> {
class _/*3*/MyWidgetState extends State</*4*/MyWidget> {
@override
Widget build(BuildContext context) {
return /*[0*/const Placeholder()/*0]*/;
pkg/analysis_server/test/services/snippets/dart/flutter_stateful_widget_with_animation_controller_test.dart
+3 -3
View File
@@ -77,13 +77,13 @@ class _/*4*/MyWidgetState extends State</*5*/MyWidget>
import 'package:flutter/widgets.dart';
class /*0*/MyWidget extends StatefulWidget {
const /*1*/MyWidget({super.key});
const new({super.key});
@override
State</*2*/MyWidget> createState() => _/*3*/MyWidgetState();
State</*1*/MyWidget> createState() => _/*2*/MyWidgetState();
}
class _/*4*/MyWidgetState extends State</*5*/MyWidget>
class _/*3*/MyWidgetState extends State</*4*/MyWidget>
with SingleTickerProviderStateMixin {
late AnimationController _controller;
pkg/analysis_server/test/services/snippets/dart/flutter_stateless_widget_test.dart
+1 -1
View File
@@ -56,7 +56,7 @@ class /*0*/MyWidget extends StatelessWidget {
import 'package:flutter/widgets.dart';
class /*0*/MyWidget extends StatelessWidget {
const /*1*/MyWidget({super.key});
const new({super.key});
@override
Widget build(BuildContext context) {
pkg/analysis_server/test/shared/shared_code_actions_refactor_tests.dart
+1 -1
View File
@@ -673,7 +673,7 @@ mixin SharedExtractWidgetRefactorCodeActionsTests
final extractWidgetTitle = 'Extract Widget';
String get expectedNewWidgetConstructorDeclaration => '''
const NewWidget({
const new({
super.key,
});
''';
pkg/analysis_server/test/src/cider/rename_test.dart
+4 -4
View File
@@ -446,7 +446,7 @@ void f() {
class A {
int field = 0;
A.newName();
new newName();
}
class B extends A {
B() : super.newName() {}
@@ -740,7 +740,7 @@ enum E {
factory E.other() => throw 0;
const E.newName();
const new newName();
}
''', result!.replaceMatches.first.matches);
}
@@ -763,7 +763,7 @@ enum E {
final int foo = 0;
const E.newName();
const new newName();
}
''', result!.replaceMatches.first.matches);
}
@@ -784,7 +784,7 @@ enum E {
enum E {
v1.newName(), v2.newName(), v3.newName();
const E.newName();
const new newName();
void foo() {}
}
pkg/analysis_server/test/src/services/correction/fix/create_class_test.dart
+4 -8
View File
@@ -292,14 +292,10 @@ void f() {}
void f() {}
class Test {
const Test(String s);
const new(String s);
}
''');
assertLinkedGroup(change.linkedEditGroups[0], [
"Test('",
'Test {',
'Test(S',
]);
assertLinkedGroup(change.linkedEditGroups[0], ["Test('", 'Test {']);
}
Future<void> test_class_instanceMember() async {
@@ -437,7 +433,7 @@ void f() {
}
class Test {
const Test();
const new();
}
''');
}
@@ -468,7 +464,7 @@ const v = Test();
const v = Test();
class Test {
const Test();
const new();
}
''',
filter: (e) {
pkg/analysis_server/test/src/services/correction/fix/create_constructor_for_final_fields_test.dart
+70 -18
View File
@@ -39,7 +39,7 @@ class Test {
final int a;
late final int b;
Test({required this.a});
new({required this.a});
}
''');
}
@@ -60,7 +60,7 @@ import 'package:flutter/widgets.dart';
class Test extends StatelessWidget {
final int _a;
const Test({super.key, required this._a});
const new({super.key, required this._a});
}
''',
filter: (error) {
@@ -88,7 +88,7 @@ import 'package:flutter/widgets.dart';
class Test extends StatelessWidget {
final int _a;
const Test({required this._a, super.key});
const new({required this._a, super.key});
}
''',
filter: (error) {
@@ -127,7 +127,7 @@ class Base extends StatelessWidget {
class Test extends Base {
final int other;
Test({required this.other, super.key, super.a});
new({required this.other, super.key, super.a});
}
''');
}
@@ -159,7 +159,7 @@ class B extends A {
final int f21;
final int f22;
B({super.f11, super.f12, required this.f21, required this.f22});
new({super.f11, super.f12, required this.f21, required this.f22});
}
''',
filter: (error) {
@@ -195,7 +195,7 @@ class B extends A {
final int f21;
final int f22;
B({required super.f11, required super.f12, required this.f21, required this.f22});
new({required super.f11, required super.f12, required this.f21, required this.f22});
}
''',
filter: (error) {
@@ -234,7 +234,7 @@ class B extends A {
final int? f21;
int? f22;
B({required super.f12, required this.f21, super.f11});
new({required super.f12, required this.f21, super.f11});
}
''',
filter: (error) {
@@ -255,7 +255,7 @@ class Test {
await assertHasFix(
'''
class Test {
Test({required this.a, required this.c});
new({required this.a, required this.c});
final int a;
final int b = 2;
@@ -283,7 +283,7 @@ class Test {
final int b = 2;
final int c;
Test({required this.a, required this.c});
new({required this.a, required this.c});
}
''',
filter: (error) {
@@ -307,7 +307,7 @@ class Test {
final int _b;
final int c;
Test({required this._a, required this._b, required this.c});
new({required this._a, required this._b, required this.c});
}
''',
filter: (error) {
@@ -360,6 +360,32 @@ class Test {
);
}
Future<void> test_class_noSuperClass_withoutPrimaryConstructors() async {
await resolveTestCode('''
// @dart=3.10
class Test {
final int a;
final int b = 2;
final int c;
}
''');
await assertHasFix(
'''
// @dart=3.10
class Test {
final int a;
final int b = 2;
final int c;
Test({required this.a, required this.c});
}
''',
filter: (error) {
return error.message.contains("'a'");
},
);
}
Future<void> test_enum() async {
await resolveTestCode('''
enum E {
@@ -377,7 +403,7 @@ enum E {
final int b = 1;
final int c;
const E({required this.a, required this.c});
const new({required this.a, required this.c});
}
''',
filter: (error) {
@@ -405,7 +431,7 @@ class Test {
final int a;
late final int b;
Test(this.a);
new(this.a);
}
''');
}
@@ -430,7 +456,7 @@ class MyWidget extends StatelessWidget {
final int b = 2;
final int? c;
const MyWidget({super.key, required this.a, this.c});
const new({super.key, required this.a, this.c});
}
''',
filter: (error) {
@@ -459,7 +485,7 @@ class MyWidget extends StatelessWidget {
final Widget child;
final int? b;
const MyWidget({super.key, required this.a, this.b, required this.child});
const new({super.key, required this.a, this.b, required this.child});
}
''',
filter: (error) {
@@ -488,7 +514,7 @@ class MyWidget extends StatelessWidget {
final List<Widget> children;
final int? b;
const MyWidget({super.key, required this.a, this.b, required this.children});
const new({super.key, required this.a, this.b, required this.children});
}
''',
filter: (error) {
@@ -512,7 +538,7 @@ class Test {
final int _b;
final int c;
Test(this.a, this._b, this.c);
new(this.a, this._b, this.c);
}
''',
filter: (error) {
@@ -543,7 +569,7 @@ class Test {
await assertHasFix(
'''
class Test {
Test(this.a, this.c);
new(this.a, this.c);
final int a;
final int b = 2;
@@ -571,6 +597,32 @@ class Test {
final int b = 2;
final int c;
new(this.a, this.c);
}
''',
filter: (error) {
return error.message.contains("'a'");
},
);
}
Future<void> test_class_simple_withoutPrimaryConstructors() async {
await resolveTestCode('''
// @dart=3.10
class Test {
final int a;
final int b = 2;
final int c;
}
''');
await assertHasFix(
'''
// @dart=3.10
class Test {
final int a;
final int b = 2;
final int c;
Test(this.a, this.c);
}
''',
@@ -597,7 +649,7 @@ enum E {
final int b = 1;
final int c;
const E(this.a, this.c);
const new(this.a, this.c);
}
''',
filter: (error) {
pkg/analysis_server/test/src/services/correction/fix/create_constructor_super_test.dart
+66 -10
View File
@@ -30,7 +30,7 @@ class B extends A {}
class A(final int field) {}
class B extends A {
B(super.field);
new(super.field);
}
''', matchFixMessage: 'Create constructor to call super.');
}
@@ -45,7 +45,7 @@ class B extends A;
class A(final int field);
class B extends A {
B(super.field);
new(super.field);
}
''', matchFixMessage: 'Create constructor to call super.');
}
@@ -72,6 +72,37 @@ class A {
class B extends A {
int existingField = 0;
new(super.field);
void existingMethod() {}
}
''', matchFixMessage: 'Create constructor to call super.');
}
Future<void> test_fieldInitializer_withoutPrimaryConstructors() async {
await resolveTestCode('''
// @dart=3.10
class A {
int _field;
A(this._field);
int get field => _field;
}
class B extends A {
int existingField = 0;
void existingMethod() {}
}
''');
await assertHasFix('''
// @dart=3.10
class A {
int _field;
A(this._field);
int get field => _field;
}
class B extends A {
int existingField = 0;
B(super.field);
void existingMethod() {}
@@ -100,7 +131,7 @@ class C extends B {
import 'package:test/b.dart';
class C extends B {
C(super.a);
new(super.a);
}
''');
}
@@ -125,7 +156,7 @@ class A {
int field;
}
class B extends A {
B(super.field);
new(super.field);
int existingField = 0;
void existingMethod() {}
@@ -151,7 +182,32 @@ class A {
class B extends A {
int existingField = 0;
B.named(super.p1, super.p2) : super.named();
new named(super.p1, super.p2) : super.named();
void existingMethod() {}
}
''', matchFixMessage: 'Create constructor to call super.named()');
}
Future<void> test_namedConstructor_withPrimaryConstructors() async {
await resolveTestCode('''
class A {
A.named(int p1);
}
class B extends A {
int existingField = 0;
void existingMethod() {}
}
''');
await assertHasFix('''
class A {
A.named(int p1);
}
class B extends A {
int existingField = 0;
new named(super.p1) : super.named();
void existingMethod() {}
}
@@ -176,7 +232,7 @@ class A {
class B extends A {
int existingField = 0;
B(super.p1, super.p2, super.p3);
new(super.p1, super.p2, super.p3);
void existingMethod() {}
}
@@ -201,7 +257,7 @@ class A {
class B extends A {
int existingField = 0;
B(super.p1, super.p2, super.p3, {required super.p4, required super.p5});
new(super.p1, super.p2, super.p3, {required super.p4, required super.p5});
void existingMethod() {}
}
@@ -226,7 +282,7 @@ class A {
class B extends A {
int existingField = 0;
B(super.p1, super.p2, super.p3);
new(super.p1, super.p2, super.p3);
void existingMethod() {}
}
@@ -259,7 +315,7 @@ class C<T> {
C(this.x);
}
class D extends C<int> {
D(super.x);
new(super.x);
}
''');
}
@@ -286,7 +342,7 @@ class A {
class B extends A {
int existingField = 0;
B(super._);
new(super._);
void existingMethod() {}
}
pkg/analysis_server/test/src/services/correction/fix/create_constructor_test.dart
+14 -14
View File
@@ -54,7 +54,7 @@ void f() {
await assertHasFix('''
/// $_text200
class A {
A(int i, double d);
new(int i, double d);
}
''', target: a);
}
@@ -74,7 +74,7 @@ A f() {
await assertHasFix('''
/// $_text200
class A {
A(int i, double d);
new(int i, double d);
}
''', target: a);
}
@@ -94,7 +94,7 @@ void f() {
await assertHasFix('''
/// $_text200
class A {
A.named(int i, double d);
new named(int i, double d);
}
''', target: a);
}
@@ -114,7 +114,7 @@ A f() {
await assertHasFix('''
/// $_text200
class A {
A.named(int i, double d);
new named(int i, double d);
}
''', target: a);
}
@@ -147,7 +147,7 @@ void f() {
class A {
int field = 0;
A(int i, double d);
new(int i, double d);
method() {}
}
@@ -172,7 +172,7 @@ A f() {
class A {
int field = 0;
A(int i, double d);
new(int i, double d);
method() {}
}
@@ -204,7 +204,7 @@ void f() {
''');
await assertHasFix('''
class A {
A.named(int i, double d);
new named(int i, double d);
method() {}
}
@@ -226,7 +226,7 @@ A f() {
''');
await assertHasFix('''
class A {
A.named(int i, double d);
new named(int i, double d);
method() {}
}
@@ -246,7 +246,7 @@ void f() {
''');
await assertHasFix('''
class A {
A.named(int i);
new named(int i);
}
void f() {
new A.named(1);
@@ -264,7 +264,7 @@ A f() {
''');
await assertHasFix('''
class A {
A.named(int i);
new named(int i);
}
A f() {
return .named(1);
@@ -285,7 +285,7 @@ enum E {
c.x();
const E.y();
const E.x();
const new x();
}
''', matchFixMessage: "Create constructor 'E.x'");
}
@@ -302,7 +302,7 @@ enum E {
c;
const E.x();
const E();
const new();
}
''', matchFixMessage: "Create constructor 'E'");
}
@@ -319,7 +319,7 @@ enum E {
c(1);
const E.x();
const E(int i);
const new(int i);
}
''');
}
@@ -335,7 +335,7 @@ A f() {
''');
await assertHasFix('''
class A {
A(int i);
new(int i);
method() {}
}
pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart
+8 -2
View File
@@ -178,13 +178,19 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
write(Keyword.CONST.lexeme);
write(' ');
}
if (classNameGroupName == null) {
if (_featureSet.isEnabled(Feature.primary_constructors)) {
write('new');
} else if (classNameGroupName == null) {
write(className);
} else {
addSimpleLinkedEdit(classNameGroupName, className);
}
if (constructorName != null) {
write('.');
if (_featureSet.isEnabled(Feature.primary_constructors)) {
write(' ');
} else {
write('.');
}
if (constructorNameGroupName == null) {
write(constructorName);
} else {
pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
+4 -4
View File
@@ -548,7 +548,7 @@ class DartEditBuilderImplTest extends AbstractContextTest
});
});
var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A() { print(42); }'));
expect(edit.replacement, equalsIgnoringWhitespace('new() { print(42); }'));
}
Future<void> test_writeConstructorDeclaration_fieldNames() async {
@@ -567,7 +567,7 @@ class C {
});
});
var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A(this.a, this.bb);'));
expect(edit.replacement, equalsIgnoringWhitespace('new(this.a, this.bb);'));
}
Future<void> test_writeConstructorDeclaration_initializerWriter() async {
@@ -586,7 +586,7 @@ class C {
});
});
var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A() : super();'));
expect(edit.replacement, equalsIgnoringWhitespace('new() : super();'));
}
Future<void> test_writeConstructorDeclaration_parameterWriter() async {
@@ -605,7 +605,7 @@ class C {
});
});
var edit = getEdit(builder);
expect(edit.replacement, equalsIgnoringWhitespace('A(int a, {this.b});'));
expect(edit.replacement, equalsIgnoringWhitespace('new(int a, {this.b});'));
}
Future<void> test_writeFieldDeclaration_initializerWriter() async {