Mutate Aling(...) and Padding(...) into Container().

scheglov · commit-bot@chromium.org · commit 1e04ff86b0fd · 2019-07-22T20:09:47.000Z
R=brianwilkerson@google.com Change-Id: I5d15b93f3262cafe6915c5681c4baede87e7699a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/109940 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/lib/src/services/flutter/property.dart b/pkg/analysis_server/lib/src/services/flutter/property.dart
@@ -243,22 +243,71 @@ class PropertyDescription {
     String parameterName,
     void writeArgumentValue(DartEditBuilder builder),
   ) {
-    builder.addInsertion(
-      virtualContainer.widgetCreation.offset,
-      (builder) {
-        builder.writeReference(virtualContainer.containerElement);
-        builder.write('(');
-
-        builder.write(parameterName);
-        builder.write(': ');
-        writeArgumentValue(builder);
-        builder.write(', ');
-        // TODO(scheglov) move parent creation attribute, sorted
-
-        builder.write('child: ');
-      },
-    );
-    builder.addSimpleInsertion(virtualContainer.widgetCreation.end, ',)');
+    if (virtualContainer._parentCreation != null) {
+      // `new Padding(...)` -> `Container(...)`
+      builder.addReplacement(
+        range.startEnd(
+          virtualContainer._parentCreation,
+          virtualContainer._parentCreation.constructorName,
+        ),
+        (builder) {
+          builder.writeReference(virtualContainer.containerElement);
+        },
+      );
+
+      var existingArgument = virtualContainer._parentArgumentToMove;
+      var existingName = existingArgument.name.label.name;
+
+      int parameterOffset;
+      var leadingComma = false;
+      var trailingComma = false;
+      if (existingName.compareTo(parameterName) > 0) {
+        // `Container(padding: ..., child: ...)`
+        //    ->
+        // `Container(alignment: ..., padding: ..., child: ...)`
+        parameterOffset = existingArgument.offset;
+        trailingComma = true;
+      } else {
+        // `Container(alignment: ..., child: ...)`
+        //    ->
+        // `Container(alignment: ..., padding: ..., child: ...)`
+        parameterOffset = existingArgument.end;
+        leadingComma = true;
+      }
+
+      builder.addInsertion(
+        parameterOffset,
+        (builder) {
+          if (leadingComma) {
+            builder.write(', ');
+          }
+
+          builder.write(parameterName);
+          builder.write(': ');
+          writeArgumentValue(builder);
+
+          if (trailingComma) {
+            builder.write(', ');
+          }
+        },
+      );
+    } else {
+      builder.addInsertion(
+        virtualContainer.widgetCreation.offset,
+        (builder) {
+          builder.writeReference(virtualContainer.containerElement);
+          builder.write('(');
+
+          builder.write(parameterName);
+          builder.write(': ');
+          writeArgumentValue(builder);
+          builder.write(', ');
+
+          builder.write('child: ');
+        },
+      );
+      builder.addSimpleInsertion(virtualContainer.widgetCreation.end, ',)');
+    }
   }
 
   FunctionBody _enclosingFunctionBody() {
diff --git a/pkg/analysis_server/test/src/services/flutter/container_properties_test.dart b/pkg/analysis_server/test/src/services/flutter/container_properties_test.dart
@@ -347,6 +347,39 @@ void main() {
 ''');
   }
 
+  test_write_hasPadding_add() async {
+    await resolveTestUnit('''
+import 'package:flutter/material.dart';
+
+void main() {
+  Padding(
+    padding: EdgeInsets.only(left: 1, right: 3),
+    child: Text(''),
+  );
+}
+''');
+    var alignmentProperty = await _alignmentProperty('Text(');
+
+    var result = await descriptions.setPropertyValue(
+      alignmentProperty.id,
+      protocol.FlutterWidgetPropertyValue(
+        enumValue: _alignmentValue('bottomLeft'),
+      ),
+    );
+
+    assertExpectedChange(result, r'''
+import 'package:flutter/material.dart';
+
+void main() {
+  Container(
+    alignment: Alignment.bottomLeft,
+    padding: EdgeInsets.only(left: 1, right: 3),
+    child: Text(''),
+  );
+}
+''');
+  }
+
   test_write_noContainer_add() async {
     await resolveTestUnit('''
 import 'package:flutter/material.dart';
@@ -778,6 +811,40 @@ void main() {
 ''');
   }
 
+  test_write_hasAlign_add_only() async {
+    await resolveTestUnit('''
+import 'package:flutter/material.dart';
+
+void main() {
+  Align(
+    alignment: Alignment.centerRight,
+    child: Text(''),
+  );
+}
+''');
+    var paddingProperty = await _paddingProperty('Text(');
+    var leftProperty = getNestedProperty(paddingProperty, 'left');
+
+    var result = await descriptions.setPropertyValue(
+      leftProperty.id,
+      protocol.FlutterWidgetPropertyValue(
+        doubleValue: 1,
+      ),
+    );
+
+    assertExpectedChange(result, r'''
+import 'package:flutter/material.dart';
+
+void main() {
+  Container(
+    alignment: Alignment.centerRight,
+    padding: EdgeInsets.only(left: 1),
+    child: Text(''),
+  );
+}
+''');
+  }
+
   test_write_hasContainer_add_only() async {
     await resolveTestUnit('''
 import 'package:flutter/material.dart';
