Order suggested Quick Fix imports: direct, export, non-API.

pkg/analysis_server/test/services/correction/fix_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.fix;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/edit/fix/fix_core.dart';
 import 'package:analysis_server/plugin/edit/fix/fix_dart.dart';
@@ skipping 134 matching lines @@
     DartFixContext dartContext = new DartFixContextImpl(
         new FixContextImpl(provider, context, error), testUnit);
     FixProcessor processor = new FixProcessor(dartContext);
     return processor.compute();
   }
 
   /**
    * Configures the [SourceFactory] to have the `my_pkg` package in
    * `/packages/my_pkg/lib` folder.
    */
-  void _configureMyPkg(String myLibCode) {
-    provider.newFile('/packages/my_pkg/lib/my_lib.dart', myLibCode);
+  void _configureMyPkg(Map<String, String> pathToCode) {
+    pathToCode.forEach((path, code) {
+      provider.newFile('/packages/my_pkg/lib/$path', code);
+    });
     // configure SourceFactory
     Folder myPkgFolder = provider.getResource('/packages/my_pkg/lib');
     UriResolver pkgResolver = new PackageMapUriResolver(provider, {
       'my_pkg': [myPkgFolder]
     });
     context.sourceFactory = new SourceFactory(
         [AbstractContextTest.SDK_RESOLVER, pkgResolver, resourceResolver]);
     // force 'my_pkg' resolution
-    addSource('/tmp/other.dart', "import 'package:my_pkg/my_lib.dart';");
+    addSource(
+        '/tmp/other.dart',
+        pathToCode.keys
+            .map((path) => "import 'package:my_pkg/$path';")
+            .join('\n'));
   }
 
   AnalysisError _findErrorToFix() {
     List<AnalysisError> errors = context.computeErrors(testSource);
     if (errorFilter != null) {
       errors = errors.where(errorFilter).toList();
     }
     expect(errors, hasLength(1));
     return errors[0];
   }
@@ skipping 2899 matching lines @@
 ''');
     await assertHasFix(
         DartFixKind.REPLACE_RETURN_TYPE_FUTURE,
         '''
 import 'dart:async';
 Future main() async {
 }
 ''');
   }
 
-  test_importLibraryPackage_withClass() async {
-    _configureMyPkg('''
-library my_lib;
-class Test {}
-''');
-    // try to find a fix
+  test_importLibraryPackage_preferDirectOverExport() async {
+    _configureMyPkg({'b.dart': 'class Test {}', 'a.dart': "export 'b.dart';"});
     resolveTestUnit('''
 main() {
   Test test = null;
+}
+''');
+    performAllAnalysisTasks();
+    await assertHasFix(
+        DartFixKind.IMPORT_LIBRARY_PROJECT1,
+        '''
+import 'package:my_pkg/b.dart';
+
+main() {
+  Test test = null;
+}
+''');
+    await assertHasFix(
+        DartFixKind.IMPORT_LIBRARY_PROJECT2,
+        '''
+import 'package:my_pkg/a.dart';
+
+main() {
+  Test test = null;
+}
+''');
+  }
+
+  test_importLibraryPackage_preferPublicOverPrivate() async {
+    _configureMyPkg(
+        {'src/a.dart': 'class Test {}', 'b.dart': "export 'src/a.dart';"});
+    resolveTestUnit('''
+main() {
+  Test test = null;
 }
 ''');
     performAllAnalysisTasks();
     await assertHasFix(
-        DartFixKind.IMPORT_LIBRARY_PROJECT,
+        DartFixKind.IMPORT_LIBRARY_PROJECT2,
         '''
-import 'package:my_pkg/my_lib.dart';
+import 'package:my_pkg/b.dart';
 
 main() {
   Test test = null;
+}
+''');
+    await assertHasFix(
+        DartFixKind.IMPORT_LIBRARY_PROJECT3,
+        '''
+import 'package:my_pkg/src/a.dart';
+
+main() {
+  Test test = null;
 }
 ''');
   }
 
   test_importLibraryProject_withClass_annotation() async {
     addSource(
         '/lib.dart',
         '''
 library lib;
 class Test {
   const Test(int p);
 }
 ''');
     resolveTestUnit('''
 @Test(0)
 main() {
 }
 ''');
     performAllAnalysisTasks();
     await assertHasFix(
-        DartFixKind.IMPORT_LIBRARY_PROJECT,
+        DartFixKind.IMPORT_LIBRARY_PROJECT1,
         '''
 import 'lib.dart';
 
 @Test(0)
 main() {
 }
 ''');
   }
 
   test_importLibraryProject_withClass_hasOtherLibraryWithPrefix() async {
@@ skipping 13 matching lines @@
 ''');
     resolveTestUnit('''
 import 'b.dart' show Two;
 main () {
   new Two();
   new One();
 }
 ''');
     performAllAnalysisTasks();
     await assertHasFix(
-        DartFixKind.IMPORT_LIBRARY_PROJECT,
+        DartFixKind.IMPORT_LIBRARY_PROJECT1,
         '''
 import 'a.dart';
 import 'b.dart' show Two;
 main () {
   new Two();
   new One();
 }
 ''');
   }
 
   test_importLibraryProject_withClass_inParentFolder() async {
     testFile = '/project/bin/test.dart';
     addSource(
         '/project/lib.dart',
         '''
 library lib;
 class Test {}
 ''');
     resolveTestUnit('''
 main() {
   Test t = null;
 }
 ''');
     performAllAnalysisTasks();
     await assertHasFix(
-        DartFixKind.IMPORT_LIBRARY_PROJECT,
+        DartFixKind.IMPORT_LIBRARY_PROJECT1,
         '''
 import '../lib.dart';
 
 main() {
   Test t = null;
 }
 ''');
   }
 
   test_importLibraryProject_withClass_inRelativeFolder() async {
     testFile = '/project/bin/test.dart';
     addSource(
         '/project/lib/sub/folder/lib.dart',
         '''
 library lib;
 class Test {}
 ''');
     resolveTestUnit('''
 main() {
   Test t = null;
 }
 ''');
     performAllAnalysisTasks();
     await assertHasFix(
-        DartFixKind.IMPORT_LIBRARY_PROJECT,
+        DartFixKind.IMPORT_LIBRARY_PROJECT1,
         '''
 import '../lib/sub/folder/lib.dart';
 
 main() {
   Test t = null;
 }
 ''');
   }
 
   test_importLibraryProject_withClass_inSameFolder() async {
     testFile = '/project/bin/test.dart';
     addSource(
         '/project/bin/lib.dart',
         '''
 library lib;
 class Test {}
 ''');
     resolveTestUnit('''
 main() {
   Test t = null;
 }
 ''');
     performAllAnalysisTasks();
     await assertHasFix(
-        DartFixKind.IMPORT_LIBRARY_PROJECT,
+        DartFixKind.IMPORT_LIBRARY_PROJECT1,
         '''
 import 'lib.dart';
 
 main() {
   Test t = null;
 }
 ''');
   }
 
   test_importLibraryProject_withFunction() async {
     addSource(
         '/lib.dart',
         '''
 library lib;
 myFunction() {}
 ''');
     resolveTestUnit('''
 main() {
   myFunction();
 }
 ''');
     performAllAnalysisTasks();
     await assertHasFix(
-        DartFixKind.IMPORT_LIBRARY_PROJECT,
+        DartFixKind.IMPORT_LIBRARY_PROJECT1,
         '''
 import 'lib.dart';
 
 main() {
   myFunction();
 }
 ''');
   }
 
   test_importLibraryProject_withFunction_unresolvedMethod() async {
     addSource(
         '/lib.dart',
         '''
 library lib;
 myFunction() {}
 ''');
     resolveTestUnit('''
 class A {
   main() {
     myFunction();
   }
 }
 ''');
     performAllAnalysisTasks();
     await assertHasFix(
-        DartFixKind.IMPORT_LIBRARY_PROJECT,
+        DartFixKind.IMPORT_LIBRARY_PROJECT1,
         '''
 import 'lib.dart';
 
 class A {
   main() {
     myFunction();
   }
 }
 ''');
   }
 
   test_importLibraryProject_withFunctionTypeAlias() async {
     testFile = '/project/bin/test.dart';
     addSource(
         '/project/bin/lib.dart',
         '''
 library lib;
 typedef MyFunction();
 ''');
     resolveTestUnit('''
 main() {
   MyFunction t = null;
 }
 ''');
     performAllAnalysisTasks();
     await assertHasFix(
-        DartFixKind.IMPORT_LIBRARY_PROJECT,
+        DartFixKind.IMPORT_LIBRARY_PROJECT1,
         '''
 import 'lib.dart';
 
 main() {
   MyFunction t = null;
 }
 ''');
   }
 
   test_importLibraryProject_withTopLevelVariable() async {
     addSource(
         '/lib.dart',
         '''
 library lib;
 int MY_VAR = 42;
 ''');
     resolveTestUnit('''
 main() {
   print(MY_VAR);
 }
 ''');
     performAllAnalysisTasks();
     await assertHasFix(
-        DartFixKind.IMPORT_LIBRARY_PROJECT,
+        DartFixKind.IMPORT_LIBRARY_PROJECT1,
         '''
 import 'lib.dart';
 
 main() {
   print(MY_VAR);
 }
 ''');
   }
 
   test_importLibrarySdk_withClass_AsExpression() async {
@@ skipping 185 matching lines @@
 class B {}
 ''');
     resolveTestUnit('''
 import 'lib.dart' show A;
 main() {
   A a;
   B b;
 }
 ''');
     performAllAnalysisTasks();
-    await assertNoFix(DartFixKind.IMPORT_LIBRARY_PROJECT);
+    await assertNoFix(DartFixKind.IMPORT_LIBRARY_PROJECT1);
     await assertHasFix(
         DartFixKind.IMPORT_LIBRARY_SHOW,
         '''
 import 'lib.dart' show A, B;
 main() {
   A a;
   B b;
 }
 ''');
   }
@@ skipping 365 matching lines @@
 ''');
     performAllAnalysisTasks();
     await assertHasFix(
         DartFixKind.REPLACE_IMPORT_URI,
         '''
 import '../foo/bar/lib.dart';
 ''');
   }
 
   test_replaceImportUri_package() async {
-    _configureMyPkg('');
+    _configureMyPkg({'my_lib.dart': ''});
     resolveTestUnit('''
 import 'no/matter/my_lib.dart';
 ''');
     performAllAnalysisTasks();
     await assertHasFix(
         DartFixKind.REPLACE_IMPORT_URI,
         '''
 import 'package:my_pkg/my_lib.dart';
 ''');
   }
@@ skipping 1481 matching lines @@
   @override
   void t() { }
 }
 ''');
   }
 
   void verifyResult(String expectedResult) {
     expect(resultCode, expectedResult);
   }
 }