Use package names as import prefixes when generating code

lib/file_generator.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.
 
 part of protoc;
 
 class FileGenerator implements ProtobufContainer {
   final FileDescriptorProto _fileDescriptor;
   final ProtobufContainer _parent;
   final GenerationContext _context;
@@ skipping 10 matching lines @@
     }
     for (DescriptorProto messageType in _fileDescriptor.messageType) {
       messageGenerators.add(new MessageGenerator(messageType, this, _context));
     }
     for (FieldDescriptorProto extension in _fileDescriptor.extension) {
       extensionGenerators.add(
           new ExtensionGenerator(extension, this, _context));
     }
   }
 
+  String get package => _fileDescriptor.package;
   String get classname => '';
   String get fqname => '.${_fileDescriptor.package}';
 
   // Extract the filename from a URI and remove the extension.
   String _fileNameWithoutExtension(Uri filePath) {
     String fileName = filePath.pathSegments.last;
     int index = fileName.lastIndexOf(".");
     return index == -1 ? fileName : fileName.substring(0, index);
   }
 
@@ skipping 80 matching lines @@
     );
 
     for (String import in _fileDescriptor.dependency) {
       Uri importPath = new Uri.file(import);
       if (importPath.isAbsolute) {
         // protoc should never generate an import with an absolute path.
         throw("FAILURE: Import with absolute path is not supported");
       }
       // Create a relative path from the current file to the import.
       Uri relativeProtoPath = _relative(importPath, filePath);
-      out.println("import '${_generatedFilePath(relativeProtoPath)}';");
+      // Find the file generator for this import as it contains the
+      // package name.
+      FileGenerator fileGenerator = _context.lookupFile(import);
+      out.println("import '${_generatedFilePath(relativeProtoPath)}'");

[Siggi Cherem (dart-lang), 2013/12/20 18:27:36]

remove new line

[Søren Gjesse, 2014/01/02 08:52:33]

Done.

+      if (package != fileGenerator.package) {
+        out.println(' as ${fileGenerator.package}');

[Siggi Cherem (dart-lang), 2013/12/20 18:27:36]

and here? (println -> print)?

[Søren Gjesse, 2014/01/02 08:52:33]

Done.

+      }
+      out.println(';');
     }
     out.println('');
 
     // Initialize Field.
     for (MessageGenerator m in messageGenerators) {
       m.initializeFields();
     }
 
     // Generate code.
     for (EnumGenerator e in enumGenerators) {
@@ skipping 20 matching lines @@
         out.println('}');
       });
     }
   }
 }
 
 class GenerationContext {
   final GenerationOptions options;
   final Map<String, ProtobufContainer> _registry =
       <String, ProtobufContainer>{};
+  final Map<String, FileGenerator> _files =
+      <String, FileGenerator>{};
 
   GenerationContext(this.options);
 
   void register(ProtobufContainer container) {
     _registry[container.fqname] = container;
+    if (container is FileGenerator) {
+      _files[container._fileDescriptor.name] = container;
+    }
   }
 
   ProtobufContainer operator [](String fqname) => _registry[fqname];
+
+  FileGenerator lookupFile(String name) => _files[name];
 }