Add assist to reparent list of Flutter widgets

pkg/analysis_server/test/services/correction/assist_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library test.services.correction.assist;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
 import 'package:analysis_server/plugin/edit/assist/assist_dart.dart';
@@ skipping 26 matching lines @@
 class AssistProcessorTest extends AbstractSingleUnitTest {
   int offset;
   int length;
 
   ServerPlugin plugin;
   Assist assist;
   SourceChange change;
   String resultCode;
   LinkedEditGroup linkedPositionGroup;
 
+  String flutterPkgLibPath = '/packages/flutter/lib';
+
+  String get _flutter_framework_code => '''
+class Widget {}
+class RenderObjectWidget extends Widget {}
+class StatelessWidget extends Widget {}
+class SingleChildRenderObjectWidget extends RenderObjectWidget {}
+class Transform extends SingleChildRenderObjectWidget {}
+class ClipRect extends SingleChildRenderObjectWidget { ClipRect.rect(){} }
+class AspectRatio extends SingleChildRenderObjectWidget {}
+class Container extends StatelessWidget { Container({child: null}){}}
+class DefaultTextStyle extends StatelessWidget { DefaultTextStyle({child: null}){}}
+class Row extends Widget { Row({children: null}){}}
+''';
+
   /**
    * Asserts that there is an [Assist] of the given [kind] at [offset] which
    * produces the [expected] code when applied to [testCode].
    */
   assertHasAssist(AssistKind kind, String expected) async {
     assist = await _assertHasAssist(kind);
     change = assist.change;
     // apply to "file"
     List<SourceFileEdit> fileEdits = change.edits;
     expect(fileEdits, hasLength(1));
@@ skipping 3541 matching lines @@
 final int V = 1;
 ''');
     await assertHasAssistAt(
         'int ',
         DartAssistKind.REMOVE_TYPE_ANNOTATION,
         '''
 final V = 1;
 ''');
   }
 
-  test_reparentFlutterWidget_OK_singleLine1() async {
+  test_reparentFlutterList_BAD_multiLine() async {
+    _configureFlutterPkg({
+      'src/widgets/framework.dart': _flutter_framework_code,
+    });
+    await resolveTestUnit('''
+import 'package:flutter/src/widgets/framework.dart';
+build() {
+  return new Container(
+    child: new Row(
+      children: [/*caret*/
+// start
+        new Transform(),
+        new Object(),
+        new AspectRatio(),
+// end
+      ],
+    ),
+  );
+}
+''');
+    _setCaretLocation();
+    await assertNoAssist(DartAssistKind.REPARENT_FLUTTER_LIST);
+  }
+
+  test_reparentFlutterList_BAD_singleLine() async {
     _configureFlutterPkg({
       'src/widgets/framework.dart': _flutter_framework_code,
     });
     await resolveTestUnit('''
 import 'package:flutter/src/widgets/framework.dart';
 class FakeFlutter {
   main() {
+  var obj;
 // start
-    return /*caret*/new Container();
+    return new Row(children: [/*caret*/ new Transform()]);
 // end
   }
 }
 ''');
     _setCaretLocation();
-    await assertHasAssist(
-        DartAssistKind.REPARENT_FLUTTER_WIDGET,
-        '''
-import 'package:flutter/src/widgets/framework.dart';
-class FakeFlutter {
-  main() {
-// start
-    return /*caret*/new widget(child: new Container());
-// end
-  }
-}
-''');
+    await assertNoAssist(DartAssistKind.REPARENT_FLUTTER_LIST);
   }
 
-  test_reparentFlutterWidget_OK_singleLine2() async {
+  test_reparentFlutterList_OK_multiLine() async {
     _configureFlutterPkg({
       'src/widgets/framework.dart': _flutter_framework_code,
     });
     await resolveTestUnit('''
 import 'package:flutter/src/widgets/framework.dart';
-class FakeFlutter {
-  main() {
+build() {
+  return new Container(
+    child: new Row(
 // start
-    return new ClipRect./*caret*/rect();
+      children: [/*caret*/
+        new Transform(),
+        new Transform(),
+        new AspectRatio(),
+      ],
 // end
-  }
+    ),
+  );
 }
 ''');
     _setCaretLocation();
     await assertHasAssist(
-        DartAssistKind.REPARENT_FLUTTER_WIDGET,
+        DartAssistKind.REPARENT_FLUTTER_LIST,
         '''
 import 'package:flutter/src/widgets/framework.dart';
-class FakeFlutter {
-  main() {
+build() {
+  return new Container(
+    child: new Row(
 // start
-    return new widget(child: new ClipRect./*caret*/rect());
+      children: [
+        new widget(
+          children: [/*caret*/
+            new Transform(),
+            new Transform(),
+            new AspectRatio(),
+          ],
+        ),
+      ],
 // end
-  }
+    ),
+  );
 }
 ''');
   }
 
+  test_reparentFlutterWidget_BAD_minimal() async {
+    _configureFlutterPkg({
+      'src/widgets/framework.dart': _flutter_framework_code,
+    });
+    await resolveTestUnit('''
+/*caret*/x(){}
+''');
+    _setCaretLocation();
+    await assertNoAssist(DartAssistKind.REPARENT_FLUTTER_WIDGET);
+  }
+
   test_reparentFlutterWidget_BAD_singleLine() async {
     _configureFlutterPkg({
       'src/widgets/framework.dart': _flutter_framework_code,
     });
     await resolveTestUnit('''
 import 'package:flutter/src/widgets/framework.dart';
 class FakeFlutter {
   main() {
   var obj;
 // start
     return new Container(child: obj.xyz./*caret*/abc);
 // end
   }
 }
 ''');
     _setCaretLocation();
     await assertNoAssist(DartAssistKind.REPARENT_FLUTTER_WIDGET);
   }
 
-  test_reparentFlutterWidget_OK_multiLines1() async {
+  test_reparentFlutterWidget_OK_multiLines() async {
     _configureFlutterPkg({
       'src/widgets/framework.dart': _flutter_framework_code,
     });
     await resolveTestUnit('''
 import 'package:flutter/src/widgets/framework.dart';
 class FakeFlutter {
   main() {
     return new Container(
 // start
       child: new /*caret*/DefaultTextStyle(
@@ skipping 28 matching lines @@
           ),
         ),
       ),
 // end
     );
   }
 }
 ''');
   }
 
+  test_reparentFlutterWidget_OK_singleLine1() async {
+    _configureFlutterPkg({
+      'src/widgets/framework.dart': _flutter_framework_code,
+    });
+    await resolveTestUnit('''
+import 'package:flutter/src/widgets/framework.dart';
+class FakeFlutter {
+  main() {
+// start
+    return /*caret*/new Container();
+// end
+  }
+}
+''');
+    _setCaretLocation();
+    await assertHasAssist(
+        DartAssistKind.REPARENT_FLUTTER_WIDGET,
+        '''
+import 'package:flutter/src/widgets/framework.dart';
+class FakeFlutter {
+  main() {
+// start
+    return /*caret*/new widget(child: new Container());
+// end
+  }
+}
+''');
+  }
+
+  test_reparentFlutterWidget_OK_singleLine2() async {
+    _configureFlutterPkg({
+      'src/widgets/framework.dart': _flutter_framework_code,
+    });
+    await resolveTestUnit('''
+import 'package:flutter/src/widgets/framework.dart';
+class FakeFlutter {
+  main() {
+// start
+    return new ClipRect./*caret*/rect();
+// end
+  }
+}
+''');
+    _setCaretLocation();
+    await assertHasAssist(
+        DartAssistKind.REPARENT_FLUTTER_WIDGET,
+        '''
+import 'package:flutter/src/widgets/framework.dart';
+class FakeFlutter {
+  main() {
+// start
+    return new widget(child: new ClipRect./*caret*/rect());
+// end
+  }
+}
+''');
+  }
+
   test_replaceConditionalWithIfElse_BAD_noEnclosingStatement() async {
     await resolveTestUnit('''
 var v = true ? 111 : 222;
 ''');
     await assertNoAssistAt(
         '? 111', DartAssistKind.REPLACE_CONDITIONAL_WITH_IF_ELSE);
   }
 
   test_replaceConditionalWithIfElse_BAD_notConditional() async {
     await resolveTestUnit('''
@@ skipping 585 matching lines @@
     DartAssistContext assistContext = new _DartAssistContextForValues(
         testUnitElement.source,
         offset,
         length,
         testUnitElement.context,
         testUnit);
     AssistProcessor processor = new AssistProcessor(assistContext);
     return await processor.compute();
   }
 
-  List<Position> _findResultPositions(List<String> searchStrings) {
-    List<Position> positions = <Position>[];
-    for (String search in searchStrings) {
-      int offset = resultCode.indexOf(search);
-      positions.add(new Position(testFile, offset));
-    }
-    return positions;
-  }
-
-  String flutterPkgLibPath = '/packages/flutter/lib';
-
   /**
    * Configures the [SourceFactory] to have the `flutter` package in
    * `/packages/flutter/lib` folder.
    */
   void _configureFlutterPkg(Map<String, String> pathToCode) {
     pathToCode.forEach((path, code) {
       provider.newFile('$flutterPkgLibPath/$path', code);
     });
     // configure SourceFactory
     Folder myPkgFolder = provider.getResource(flutterPkgLibPath);
     UriResolver pkgResolver = new PackageMapUriResolver(provider, {
       'flutter': [myPkgFolder]
     });
     SourceFactory sourceFactory = new SourceFactory(
         [new DartUriResolver(sdk), pkgResolver, resourceResolver]);
     if (enableNewAnalysisDriver) {
       driver.configure(sourceFactory: sourceFactory);
     } else {
       context.sourceFactory = sourceFactory;
     }
     // force 'flutter' resolution
     addSource(
         '/tmp/other.dart',
         pathToCode.keys
             .map((path) => "import 'package:flutter/$path';")
             .join('\n'));
   }
 
-  String get _flutter_framework_code => '''
-class Widget {}
-class RenderObjectWidget extends Widget {}
-class StatelessWidget extends Widget {}
-class SingleChildRenderObjectWidget extends RenderObjectWidget {}
-class Transform extends SingleChildRenderObjectWidget {}
-class ClipRect extends SingleChildRenderObjectWidget { ClipRect.rect(){} }
-class AspectRatio extends SingleChildRenderObjectWidget {}
-class Container extends StatelessWidget { Container({child: null}){}}
-class DefaultTextStyle extends StatelessWidget { DefaultTextStyle({child: null}){}}
-class Row extends Widget { Row({children: null}){}}
-''';
-
-  void _setStartEndSelection() {
-    offset = findOffset('// start\n') + '// start\n'.length;
-    length = findOffset('// end') - offset;
+  List<Position> _findResultPositions(List<String> searchStrings) {
+    List<Position> positions = <Position>[];
+    for (String search in searchStrings) {
+      int offset = resultCode.indexOf(search);
+      positions.add(new Position(testFile, offset));
+    }
+    return positions;
   }
 
   void _setCaretLocation() {
     offset = findOffset('/*caret*/') + '/*caret*/'.length;
     length = 0;
   }
+
+  void _setStartEndSelection() {
+    offset = findOffset('// start\n') + '// start\n'.length;
+    length = findOffset('// end') - offset;
+  }
 }
 
 @reflectiveTest
 class AssistProcessorTest_Driver extends AssistProcessorTest {
   @override
   bool get enableNewAnalysisDriver => true;
 }
 
 class _DartAssistContextForValues implements DartAssistContext {
   @override
   final Source source;
 
   @override
   final int selectionOffset;
 
   @override
   final int selectionLength;
 
   @override
   final AnalysisContext analysisContext;
 
   @override
   final CompilationUnit unit;
 
   _DartAssistContextForValues(this.source, this.selectionOffset,
       this.selectionLength, this.analysisContext, this.unit);
 }