Handle 'part of' declarations with URI correctly in Fasta.

pkg/front_end/lib/src/fasta/source/source_library_builder.dart

 // Copyright (c) 2016, 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 fasta.source_library_builder;
 
 import 'package:kernel/ast.dart' show AsyncMarker, ProcedureKind;
 
 import '../combinator.dart' show Combinator;
 
@@ skipping 43 matching lines @@
   final Map<String, Builder> exports = <String, Builder>{};
 
   final Scope scope = new Scope(<String, Builder>{}, null, isModifiable: false);
 
   final Uri fileUri;
 
   final List<List> implementationBuilders = <List<List>>[];
 
   String name;
 
-  String partOf;
+  String partOfName;
+
+  Uri partOfUri;
 
   List<MetadataBuilder> metadata;
 
   /// The current declaration that is being built. When we start parsing a
   /// declaration (class, method, and so on), we don't have enough information
   /// to create a builder and this object records its members and types until,
   /// for example, [addClass] is called.
   DeclarationBuilder<T> currentDeclaration;
 
   SourceLibraryBuilder(this.loader, Uri fileUri)
       : fileUri = fileUri,
         super(fileUri) {
     currentDeclaration = libraryDeclaration;
   }
 
   Uri get uri;
 
-  bool get isPart => partOf != null;
+  bool get isPart => partOfName != null || partOfUri != null;
 
   Map<String, Builder> get members => libraryDeclaration.members;
 
   List<T> get types => libraryDeclaration.types;
 
   /// When parsing a class, this returns a map of its members (that have been
   /// parsed so far).
   Map<String, MemberBuilder> get classMembers {
     assert(currentDeclaration.parent == libraryDeclaration);
     return currentDeclaration.members;
@@ skipping 55 matching lines @@
     if (uri.scheme == "dart") {
       resolvedUri = new Uri(scheme: "dart", path: "${uri.path}/$path");
       newFileUri = fileUri.resolve(path);
     } else {
       resolvedUri = uri.resolve(path);
       newFileUri = fileUri.resolve(path);
     }
     parts.add(loader.read(resolvedUri, newFileUri));
   }
 
-  void addPartOf(List<MetadataBuilder> metadata, String name) {
-    partOf = name;
+  void addPartOf(List<MetadataBuilder> metadata, String name, String uri) {
+    partOfName = name;
+    partOfUri = uri == null ? null : this.uri.resolve(uri);
   }
 
   void addClass(
       List<MetadataBuilder> metadata,
       int modifiers,
       String name,
       List<TypeVariableBuilder> typeVariables,
       T supertype,
       List<T> interfaces,
       int charOffset);
@@ skipping 167 matching lines @@
       if (part == this) {
         addCompileTimeError(-1, "A file can't be a part of itself.");
       } else {
         includePart(part);
       }
     }
   }
 
   void includePart(SourceLibraryBuilder<T, R> part) {
     if (name != null) {
-      if (part.partOf == null) {
+      if (!part.isPart) {
         warning(
             part.fileUri,
             -1,
             "Has no 'part of' declaration but is used as "
             "a part by ${name} ($uri).");
         parts.remove(part);
         return;
       }
-      if (part.partOf != name) {
-        warning(
-            part.fileUri,
-            -1,
-            "Is part of '${part.partOf}' but is used as "
-            "a part by '${name}' ($uri).");
+      if (part.partOfName != name && part.partOfUri != uri) {
+        String partName = part.partOfName ?? "${part.partOfUri}";
+        String myName = name == null ? "'$uri'" : "'${name}' ($uri)";
+        warning(part.fileUri, -1,
+            "Is part of '$partName' but is used as a part by $myName.");
         parts.remove(part);
         return;
       }
     }
     part.members.forEach((String name, Builder builder) {
       if (builder.next != null) {
         assert(builder.next.next == null);
         addBuilder(name, builder.next, builder.next.charOffset);
       }
       addBuilder(name, builder, builder.charOffset);
@@ skipping 146 matching lines @@
   }
 
   /// Called to register [procedure] as a factory whose types are collected in
   /// [factoryDeclaration]. Later, once the class has been built, we can
   /// synthesize type variables on the factory matching the class'.
   void addFactoryDeclaration(
       ProcedureBuilder procedure, DeclarationBuilder<T> factoryDeclaration) {
     factoryDeclarations[procedure] = factoryDeclaration;
   }
 }