Remove LibraryEntity.libraryName

pkg/compiler/lib/src/mirrors_used.dart

 // Copyright (c) 2013, 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 dart2js.mirrors_used;
 
 import 'common/tasks.dart' show CompilerTask;
 import 'common.dart';
 import 'compile_time_constants.dart' show ConstantCompiler;
 import 'compiler.dart' show Compiler;
@@ skipping 438 matching lines @@
     for (var entry in list) {
       if (entry is ResolutionDartType) {
         ResolutionDartType type = entry;
         result.add(type.element);
       } else {
         String string = entry;
         LibraryElement libraryCandiate;
         String libraryNameCandiate;
         for (LibraryElement l in compiler.libraryLoader.libraries) {
           if (l.hasLibraryName) {
-            String libraryName = l.libraryOrScriptName;
+            String libraryName = l.libraryName;

[Siggi Cherem (dart-lang), 2017/02/07 23:31:53]

should this one be .name too?

[Johnni Winther, 2017/02/08 10:27:10]

No. It is a deliberate dependency on the actual library name (it checks
.hasLibraryName before the use).

             if (string == libraryName) {
               // Found an exact match.
               libraryCandiate = l;
               libraryNameCandiate = libraryName;
               break;
             } else if (string.startsWith('$libraryName.')) {
               if (libraryNameCandiate == null ||
                   libraryNameCandiate.length < libraryName.length) {
                 // Found a better candiate
                 libraryCandiate = l;
@@ skipping 37 matching lines @@
   Element resolveLocalExpression(Element element, List<String> identifiers) {
     Element current = element;
     for (String identifier in identifiers) {
       Element e = findLocalMemberIn(current, identifier);
       if (e == null) {
         if (current.isLibrary) {
           LibraryElement library = current;
           reporter.reportHintMessage(
               spannable,
               MessageKind.MIRRORS_CANNOT_RESOLVE_IN_LIBRARY,
-              {'name': identifiers[0], 'library': library.libraryOrScriptName});
+              {'name': identifiers[0], 'library': library.name});
         } else {
           reporter.reportHintMessage(
               spannable,
               MessageKind.MIRRORS_CANNOT_FIND_IN_ELEMENT,
               {'name': identifier, 'element': current.name});
         }
         return current;
       }
       current = e;
     }
@@ skipping 38 matching lines @@
       // @MirrorsUsed(targets: fisk)
       //                       ^^^^
       //
       // Instead of saying 'fisk' should pretty print the problematic constant
       // value.
       return spannable;
     }
     return node;
   }
 }