Use '=' for default values of named parameters.

scheglov · commit-bot@chromium.org · commit 758e5ea5025a · 2018-08-02T19:34:52.000Z
R=brianwilkerson@google.com Change-Id: I694c9e411fc125ae7b716d0f8b9e78c5cac57e34 Reviewed-on: https://dart-review.googlesource.com/68180 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/test/services/correction/fix_test.dart b/pkg/analysis_server/test/services/correction/fix_test.dart
@@ -3852,7 +3852,7 @@ abstract class A {
   String m3(int p1, double p2, Map<int, List<String>> p3);
   String m4(p1, p2);
   String m5(p1, [int p2 = 2, int p3, p4 = 4]);
-  String m6(p1, {int p2: 2, int p3, p4: 4});
+  String m6(p1, {int p2 = 2, int p3, p4: 4});
 }
 
 class B extends A {
@@ -3865,7 +3865,7 @@ abstract class A {
   String m3(int p1, double p2, Map<int, List<String>> p3);
   String m4(p1, p2);
   String m5(p1, [int p2 = 2, int p3, p4 = 4]);
-  String m6(p1, {int p2: 2, int p3, p4: 4});
+  String m6(p1, {int p2 = 2, int p3, p4: 4});
 }
 
 class B extends A {
@@ -3895,7 +3895,7 @@ class B extends A {
   }
 
   @override
-  String m6(p1, {int p2: 2, int p3, p4: 4}) {
+  String m6(p1, {int p2 = 2, int p3, p4 = 4}) {
     // TODO: implement m6
   }
 }
diff --git a/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart b/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart
@@ -573,11 +573,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
       // default value
       String defaultCode = parameter.defaultValueCode;
       if (defaultCode != null) {
-        if (sawPositional) {
-          write(' = ');
-        } else {
-          write(': ');
-        }
+        write(' = ');
         write(defaultCode);
       }
     }
diff --git a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
@@ -1514,7 +1514,7 @@ class A {}
 
   test_writeParameters_named() async {
     String path = provider.convertPath('/test.dart');
-    String content = 'f(int i, {String s}) {}';
+    String content = 'f(int a, {bool b = false, String c}) {}';
     addSource(path, content);
 
     CompilationUnit unit = (await driver.getResult(path))?.unit;
@@ -1530,12 +1530,13 @@ class A {}
       });
     });
     SourceEdit edit = getEdit(builder);
-    expect(edit.replacement, equalsIgnoringWhitespace('(int i, {String s})'));
+    expect(edit.replacement,
+        equalsIgnoringWhitespace('(int a, {bool b = false, String c})'));
   }
 
   test_writeParameters_positional() async {
     String path = provider.convertPath('/test.dart');
-    String content = 'f(int i, [String s]) {}';
+    String content = 'f(int a, [bool b = false, String c]) {}';
     addSource(path, content);
     CompilationUnit unit = (await driver.getResult(path))?.unit;
     FunctionDeclaration f = unit.declarations[0];
@@ -1550,7 +1551,8 @@ class A {}
       });
     });
     SourceEdit edit = getEdit(builder);
-    expect(edit.replacement, equalsIgnoringWhitespace('(int i, [String s])'));
+    expect(edit.replacement,
+        equalsIgnoringWhitespace('(int a, [bool b = false, String c])'));
   }
 
   test_writeParameters_required() async {

Original file line number	Diff line number	Diff line change
`@@ -3852,7 +3852,7 @@ abstract class A {`
`3852`	`3852`	`String m3(int p1, double p2, Map<int, List<String>> p3);`
`3853`	`3853`	`String m4(p1, p2);`
`3854`	`3854`	`String m5(p1, [int p2 = 2, int p3, p4 = 4]);`
`3855`		`- String m6(p1, {int p2: 2, int p3, p4: 4});`
	`3855`	`+ String m6(p1, {int p2 = 2, int p3, p4: 4});`
`3856`	`3856`	`}`
`3857`	`3857`
`3858`	`3858`	`class B extends A {`
`@@ -3865,7 +3865,7 @@ abstract class A {`
`3865`	`3865`	`String m3(int p1, double p2, Map<int, List<String>> p3);`
`3866`	`3866`	`String m4(p1, p2);`
`3867`	`3867`	`String m5(p1, [int p2 = 2, int p3, p4 = 4]);`
`3868`		`- String m6(p1, {int p2: 2, int p3, p4: 4});`
	`3868`	`+ String m6(p1, {int p2 = 2, int p3, p4: 4});`
`3869`	`3869`	`}`
`3870`	`3870`
`3871`	`3871`	`class B extends A {`
`@@ -3895,7 +3895,7 @@ class B extends A {`
`3895`	`3895`	`}`
`3896`	`3896`
`3897`	`3897`	`@override`
`3898`		`- String m6(p1, {int p2: 2, int p3, p4: 4}) {`
	`3898`	`+ String m6(p1, {int p2 = 2, int p3, p4 = 4}) {`
`3899`	`3899`	`// TODO: implement m6`
`3900`	`3900`	`}`
`3901`	`3901`	`}`
Original file line number	Diff line number	Diff line change
`@@ -573,11 +573,7 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {`
`573`	`573`	`// default value`
`574`	`574`	`String defaultCode = parameter.defaultValueCode;`
`575`	`575`	`if (defaultCode != null) {`
`576`		`- if (sawPositional) {`
`577`		`- write(' = ');`
`578`		`- } else {`
`579`		`- write(': ');`
`580`		`- }`
	`576`	`+ write(' = ');`
`581`	`577`	`write(defaultCode);`
`582`	`578`	`}`
`583`	`579`	`}`