Only emit package-info's if the source file's path is 'package-info.j…

…ava' To avoid emitting duplicate symbols when there are other files that contain no classes, and to match javac's behaviour. PiperOrigin-RevId: 545473342
google · Jul 4, 2023 · 7c64f04 · 7c64f04
1 parent 701bb99
commit 7c64f04
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/java/com/google/turbine/binder/CompUnitPreprocessor.java b/java/com/google/turbine/binder/CompUnitPreprocessor.java
@@ -36,6 +36,8 @@
 import com.google.turbine.tree.Tree.PkgDecl;
 import com.google.turbine.tree.Tree.TyDecl;
 import com.google.turbine.tree.TurbineModifier;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
@@ -105,7 +107,7 @@ public static PreprocessedCompUnit preprocess(CompUnit unit) {
       // "While the file could technically contain the source code
       // for one or more package-private (default-access) classes,
       // it would be very bad form." -- JLS 7.4.1
-      if (!unit.pkg().get().annos().isEmpty() || unit.decls().isEmpty()) {
+      if (isPackageInfo(unit)) {
         decls = Iterables.concat(decls, ImmutableList.of(packageInfoTree(unit.pkg().get())));
       }
     } else {
@@ -124,6 +126,18 @@ public static PreprocessedCompUnit preprocess(CompUnit unit) {
         unit.imports(), types.build(), unit.mod(), unit.source(), packageName);
   }
 
+  private static boolean isPackageInfo(CompUnit unit) {
+    String path = unit.source().path();
+    if (path == null) {
+      return false;
+    }
+    Path fileName = Paths.get(path).getFileName();
+    if (fileName == null) {
+      return false;
+    }
+    return fileName.toString().equals("package-info.java");
+  }
+
   private static ImmutableMap<String, ClassSymbol> preprocessChildren(
       SourceFile source,
       ImmutableList.Builder<SourceBoundClass> types,

diff --git a/javatests/com/google/turbine/lower/testdata/package_info.test b/javatests/com/google/turbine/lower/testdata/package_info.test
@@ -10,3 +10,5 @@ package p;
 package p;
 class Test {}
 
+=== Empty.java ===
+package p;
diff --git a/javatests/com/google/turbine/main/MainTest.java b/javatests/com/google/turbine/main/MainTest.java
@@ -106,7 +106,7 @@ public void sourceJarClash() throws IOException {
 
   @Test
   public void packageInfo() throws IOException {
-    Path src = temporaryFolder.newFile("package-info.jar").toPath();
+    Path src = temporaryFolder.newFile("package-info.java").toPath();
     MoreFiles.asCharSink(src, UTF_8).write("@Deprecated package test;");
 
     Path output = temporaryFolder.newFile("output.jar").toPath();
@@ -467,7 +467,7 @@ public static byte[] dump() {
 
   @Test
   public void classGeneration() throws IOException {
-    Path src = temporaryFolder.newFile("package-info.jar").toPath();
+    Path src = temporaryFolder.newFile("package-info.java").toPath();
     MoreFiles.asCharSink(src, UTF_8).write("@Deprecated package test;");
     File resources = temporaryFolder.newFile("resources.jar");
     Main.compile(