Fixing cleanup of dart:html annotation generation.

tools/dom/scripts/systemhtml.py

 #!/usr/bin/python
 # Copyright (c) 2012, 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.
 
 """This module provides shared functionality for the system to generate
 Dart:html APIs from the IDL database."""
 
 import emitter
 import os
@@ skipping 376 matching lines @@
         implements.append(parent_type_info.interface_name())
 
     secure_base_name = self._backend.SecureBaseName(interface_name)
     if secure_base_name:
       implements.append(secure_base_name)
 
     implements_str = ''
     if implements:
       implements_str = ' implements ' + ', '.join(set(implements))
 
-    annotations = FindCommonAnnotations(self._interface.doc_js_name)
-    annotations_str = ''
-    if annotations:
-      annotations_str = '\n' + '\n'.join(annotations)
+    annotations = FormatAnnotations(
+        FindCommonAnnotations(self._interface.doc_js_name), '')
 
     self._implementation_members_emitter = implementation_emitter.Emit(
         self._backend.ImplementationTemplate(),
         LIBRARYNAME=self._library_name,
-        ANNOTATIONS=annotations_str,
+        ANNOTATIONS=annotations,
         CLASSNAME=self._interface_type_info.implementation_name(),
         EXTENDS=' extends %s' % base_class if base_class else '',
         IMPLEMENTS=implements_str,
         DOMNAME=self._interface.doc_js_name,
         NATIVESPEC=self._backend.NativeSpec())
     self._backend.StartInterface(self._implementation_members_emitter)
 
     self._backend.EmitHelpers(base_class)
     self._event_generator.EmitStreamProviders(
         self._interface,
@@ skipping 500 matching lines @@
 
   def _HasCustomImplementation(self, member_name):
     member_name = '%s.%s' % (self._interface.doc_js_name, member_name)
     return member_name in _js_custom_members
 
   def _RenamingAnnotation(self, idl_name, member_name):
     if member_name != idl_name:
       return  "@JSName('%s')\n  " % idl_name
     return ''
 
-  def _Annotations(self, idl_type, idl_member_name):
-    out = ''
-    annotations = FindDart2JSAnnotations(idl_type, self._interface.id,
+  def _Annotations(self, idl_type, idl_member_name, indent='  '):
+    anns = FindDart2JSAnnotations(idl_type, self._interface.id,
         idl_member_name)
-    if annotations:
-      out = '%s\n  ' % annotations
+
     if not AnyConversionAnnotations(idl_type, self._interface.id,
                                   idl_member_name):
       return_type = self.SecureOutputType(idl_type)
       native_type = self._NarrowToImplementationType(idl_type)
       if native_type != return_type:
-        out += "@Returns('%s') @Creates('%s')\n  " % (native_type, native_type)
-    return out
+        anns = anns + [
+          "@Returns('%s')" % native_type,
+          "@Creates('%s')" % native_type,
+        ]
+    return FormatAnnotations(anns, indent);
 
   def CustomJSMembers(self):
     return _js_custom_members
 
   def _NarrowToImplementationType(self, type_name):
     return self._type_registry.TypeInfo(type_name).narrow_dart_type()
 
   def _NarrowInputType(self, type_name):
     return self._NarrowToImplementationType(type_name)
 
@@ skipping 96 matching lines @@
     for library_name in libraries:
       self._libraries[library_name] = DartLibrary(
           library_name, template_loader, library_type, output_dir)
 
   def AddFile(self, basename, library_name, path):
     self._libraries[library_name].AddFile(path)
 
   def Emit(self, emitter, auxiliary_dir):
     for lib in self._libraries.values():
       lib.Emit(emitter, auxiliary_dir)