Fix for detecting lib/src. Sort fixes by relevance.

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/protocol/protocol.dart'
@@ skipping 27 matching lines @@
  */
 class BaseFixProcessorTest extends AbstractSingleUnitTest {
   AnalysisErrorFilter errorFilter = (AnalysisError error) {
     return error.errorCode != HintCode.UNUSED_CATCH_CLAUSE &&
         error.errorCode != HintCode.UNUSED_CATCH_STACK &&
         error.errorCode != HintCode.UNUSED_ELEMENT &&
         error.errorCode != HintCode.UNUSED_FIELD &&
         error.errorCode != HintCode.UNUSED_LOCAL_VARIABLE;
   };
 
+  String myPkgLibPath = '/packages/my_pkg/lib';
+
   Fix fix;
   SourceChange change;
   String resultCode;
 
   assert_undefinedFunction_create_returnType_bool(String lineWithTest) async {
     resolveTestUnit('''
 main() {
   bool b = true;
   $lineWithTest
 }
@@ skipping 88 matching lines @@
     DefaultFixContributor contributor = new DefaultFixContributor();
     return contributor.computeFixes(fixContext);
   }
 
   /**
    * Configures the [SourceFactory] to have the `my_pkg` package in
    * `/packages/my_pkg/lib` folder.
    */
   void _configureMyPkg(Map<String, String> pathToCode) {
     pathToCode.forEach((path, code) {
-      provider.newFile('/packages/my_pkg/lib/$path', code);
+      provider.newFile('$myPkgLibPath/$path', code);
     });
     // configure SourceFactory
-    Folder myPkgFolder = provider.getResource('/packages/my_pkg/lib');
+    Folder myPkgFolder = provider.getResource(myPkgLibPath);
     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',
         pathToCode.keys
             .map((path) => "import 'package:my_pkg/$path';")
@@ skipping 2938 matching lines @@
         DartFixKind.IMPORT_LIBRARY_PROJECT2,
         '''
 import 'package:my_pkg/a.dart';
 
 main() {
   Test test = null;
 }
 ''');
   }
 
+  test_importLibraryPackage_preferDirectOverExport_src() async {
+    myPkgLibPath = '/my/src/packages/my_pkg/lib';
+    _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(
@@ skipping 2377 matching lines @@
   var v = 42;
   print('v: $v');
 }
 ''');
   }
 
   void verifyResult(String expectedResult) {
     expect(resultCode, expectedResult);
   }
 }