[kernel] Fix printing of additional exports

jensjoha · commit-bot@chromium.org · commit 05f56ef160fe · 2019-10-09T10:10:33.000Z
Change-Id: I65ee82646555cd31eccad33e3a125f0ef2af3a35 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/120784 Reviewed-by: Johnni Winther <johnniwinther@google.com> Commit-Queue: Jens Johansen <jensj@google.com>
diff --git a/pkg/front_end/testcases/general/export_main.dart.outline.expect b/pkg/front_end/testcases/general/export_main.dart.outline.expect
@@ -3,7 +3,6 @@ import self as self;
 import "hello.dart" as hel;
 additionalExports = (hel::main)
 
-
 export "org-dartlang-testcase:///hello.dart";
 
 
diff --git a/pkg/front_end/testcases/general/export_main.dart.strong.expect b/pkg/front_end/testcases/general/export_main.dart.strong.expect
@@ -3,7 +3,6 @@ import self as self;
 import "hello.dart" as hel;
 additionalExports = (hel::main)
 
-
 export "org-dartlang-testcase:///hello.dart";
 
 
diff --git a/pkg/front_end/testcases/general/export_main.dart.strong.transformed.expect b/pkg/front_end/testcases/general/export_main.dart.strong.transformed.expect
@@ -3,7 +3,6 @@ import self as self;
 import "hello.dart" as hel;
 additionalExports = (hel::main)
 
-
 export "org-dartlang-testcase:///hello.dart";
 
 
diff --git a/pkg/front_end/testcases/general/export_test.dart.outline.expect b/pkg/front_end/testcases/general/export_test.dart.outline.expect
@@ -3,7 +3,6 @@ import self as self;
 import "dart:core" as core;
 additionalExports = (core::print)
 
-
 import "dart:developer";
 export "dart:core";
 
diff --git a/pkg/front_end/testcases/general/export_test.dart.strong.expect b/pkg/front_end/testcases/general/export_test.dart.strong.expect
@@ -4,7 +4,6 @@ import "dart:core" as core;
 import "dart:developer" as dev;
 additionalExports = (core::print)
 
-
 import "dart:developer";
 export "dart:core";
 
diff --git a/pkg/front_end/testcases/general/export_test.dart.strong.transformed.expect b/pkg/front_end/testcases/general/export_test.dart.strong.transformed.expect
@@ -4,7 +4,6 @@ import "dart:core" as core;
 import "dart:developer" as dev;
 additionalExports = (core::print)
 
-
 import "dart:developer";
 export "dart:core";
 
diff --git a/pkg/front_end/testcases/rasta/export.dart.outline.expect b/pkg/front_end/testcases/rasta/export.dart.outline.expect
@@ -3,7 +3,6 @@ import self as self;
 import "foo.dart" as foo;
 additionalExports = (foo::foo)
 
-
 export "org-dartlang-testcase:///foo.dart";
 
 
diff --git a/pkg/front_end/testcases/rasta/export.dart.strong.expect b/pkg/front_end/testcases/rasta/export.dart.strong.expect
@@ -3,7 +3,6 @@ import self as self;
 import "foo.dart" as foo;
 additionalExports = (foo::foo)
 
-
 export "org-dartlang-testcase:///foo.dart";
 
 
diff --git a/pkg/front_end/testcases/rasta/export.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/export.dart.strong.transformed.expect
@@ -3,7 +3,6 @@ import self as self;
 import "foo.dart" as foo;
 additionalExports = (foo::foo)
 
-
 export "org-dartlang-testcase:///foo.dart";
 
 
diff --git a/pkg/front_end/testcases/rasta/import_export.dart.outline.expect b/pkg/front_end/testcases/rasta/import_export.dart.outline.expect
@@ -11,7 +11,6 @@ import self as self2;
 import "foo.dart" as foo;
 additionalExports = (foo::foo)
 
-
 export "org-dartlang-testcase:///foo.dart";
 
 
diff --git a/pkg/front_end/testcases/rasta/import_export.dart.strong.expect b/pkg/front_end/testcases/rasta/import_export.dart.strong.expect
@@ -13,7 +13,6 @@ import self as self2;
 import "foo.dart" as foo;
 additionalExports = (foo::foo)
 
-
 export "org-dartlang-testcase:///foo.dart";
 
 
diff --git a/pkg/front_end/testcases/rasta/import_export.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/import_export.dart.strong.transformed.expect
@@ -13,7 +13,6 @@ import self as self2;
 import "foo.dart" as foo;
 additionalExports = (foo::foo)
 
-
 export "org-dartlang-testcase:///foo.dart";
 
 
diff --git a/pkg/front_end/testcases/regress/issue_36647.dart.outline.expect b/pkg/front_end/testcases/regress/issue_36647.dart.outline.expect
@@ -7,10 +7,9 @@ import "org-dartlang-testcase:///issue_36647_lib1.dart";
 library;
 import self as self2;
 import "issue_36647_lib2.dart" as iss;
-additionalExports = (iss::xxx)
-, iss::XXX)
-, iss::extends)
-
+additionalExports = (iss::xxx,
+  iss::XXX,
+  iss::extends)
 
 export "org-dartlang-testcase:///issue_36647_lib2.dart";
 
diff --git a/pkg/front_end/testcases/regress/issue_36647.dart.strong.expect b/pkg/front_end/testcases/regress/issue_36647.dart.strong.expect
@@ -7,10 +7,9 @@ import "org-dartlang-testcase:///issue_36647_lib1.dart";
 library;
 import self as self2;
 import "issue_36647_lib2.dart" as iss;
-additionalExports = (iss::xxx)
-, iss::XXX)
-, iss::extends)
-
+additionalExports = (iss::xxx,
+  iss::XXX,
+  iss::extends)
 
 export "org-dartlang-testcase:///issue_36647_lib2.dart";
 
diff --git a/pkg/front_end/testcases/regress/issue_36647.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_36647.dart.strong.transformed.expect
@@ -7,10 +7,9 @@ import "org-dartlang-testcase:///issue_36647_lib1.dart";
 library;
 import self as self2;
 import "issue_36647_lib2.dart" as iss;
-additionalExports = (iss::xxx)
-, iss::XXX)
-, iss::extends)
-
+additionalExports = (iss::xxx,
+  iss::XXX,
+  iss::extends)
 
 export "org-dartlang-testcase:///issue_36647_lib2.dart";
 
diff --git a/pkg/front_end/testcases/regress/issue_36647_2.dart.outline.expect b/pkg/front_end/testcases/regress/issue_36647_2.dart.outline.expect
@@ -1,10 +1,9 @@
 library;
 import self as self;
 import "issue_36647_2_lib1.dart" as iss;
-additionalExports = (iss::foo)
-, iss::bar)
-, iss::baz)
-
+additionalExports = (iss::foo,
+  iss::bar,
+  iss::baz)
 
 export "org-dartlang-testcase:///issue_36647_2_lib1.dart";
 
diff --git a/pkg/front_end/testcases/regress/issue_36647_2.dart.strong.expect b/pkg/front_end/testcases/regress/issue_36647_2.dart.strong.expect
@@ -1,10 +1,9 @@
 library;
 import self as self;
 import "issue_36647_2_lib1.dart" as iss;
-additionalExports = (iss::foo)
-, iss::bar)
-, iss::baz)
-
+additionalExports = (iss::foo,
+  iss::bar,
+  iss::baz)
 
 export "org-dartlang-testcase:///issue_36647_2_lib1.dart";
 
diff --git a/pkg/front_end/testcases/regress/issue_36647_2.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_36647_2.dart.strong.transformed.expect
@@ -1,10 +1,9 @@
 library;
 import self as self;
 import "issue_36647_2_lib1.dart" as iss;
-additionalExports = (iss::foo)
-, iss::bar)
-, iss::baz)
-
+additionalExports = (iss::foo,
+  iss::bar,
+  iss::baz)
 
 export "org-dartlang-testcase:///issue_36647_2_lib1.dart";
 
diff --git a/pkg/kernel/lib/text/ast_to_text.dart b/pkg/kernel/lib/text/ast_to_text.dart
@@ -459,13 +459,8 @@ class Printer extends Visitor<Null> {
   void writeAdditionalExports(List<Reference> additionalExports) {
     if (additionalExports.isEmpty) return;
     write('additionalExports = (');
-    bool isFirst = true;
-    for (Reference reference in additionalExports) {
-      if (isFirst) {
-        isFirst = false;
-      } else {
-        write(', ');
-      }
+    for (int i = 0; i < additionalExports.length; i++) {
+      Reference reference = additionalExports[i];
       var node = reference.node;
       if (node is Class) {
         Library nodeLibrary = node.enclosingLibrary;
@@ -488,10 +483,14 @@ class Printer extends Visitor<Null> {
       } else {
         throw new UnimplementedError('${node.runtimeType}');
       }
-      endLine(')');
-    }
 
-    endLine();
+      if (i + 1 == additionalExports.length) {
+        endLine(")");
+      } else {
+        endLine(",");
+        write("  ");
+      }
+    }
   }
 
   void writeComponentFile(Component component) {
