Added workaround for Java 8 javac's bug re: package doc-comments (fix…

…ed in Java 9). Change on 2017/05/08 by tball <[email protected]> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=155396077
google · May 8, 2017 · 3b1a465 · 3b1a465
1 parent 01cf043
commit 3b1a465
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/translator/src/main/java/com/google/devtools/j2objc/javac/TreeConverter.java b/translator/src/main/java/com/google/devtools/j2objc/javac/TreeConverter.java
@@ -1015,6 +1015,11 @@ private PackageDeclaration convertPackage(PackageElement pkg, Trees trees) {
       newNode.addAnnotation((Annotation) convert(pkgAnnotation));
     }
     if (unit.sourcefile.toUri().getPath().endsWith("package-info.java")) {
+      if (node == null) {
+        // Java 8 javac bug, fixed in Java 9. Doc-comments in package-info.java
+        // sources are keyed to their compilation unit, not their package node.
+        node = unit;
+      }
       newNode.setJavadoc((Javadoc) getAssociatedJavaDoc(node, pkg));
     }
     return (PackageDeclaration) newNode.setName(convertName((PackageSymbol) pkg, getPosition(node)))