Merge pull request #13378 from griggt/fix-13310

Fix #13310: Parse empty Java compilation units as EmptyTree
scala · Aug 25, 2021 · ce0e25c · ce0e25c
2 parents 9e06f24 + fbea0ff
commit ce0e25c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala b/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala
@@ -1013,7 +1013,9 @@ object JavaParsers {
       }
       val unit = atSpan(start) { PackageDef(pkg, buf.toList) }
       accept(EOF)
-      unit
+      unit match
+        case PackageDef(Ident(nme.EMPTY_PACKAGE), Nil) => EmptyTree
+        case _ => unit
     }
   }
 

diff --git a/tests/pos/i13310.java b/tests/pos/i13310.java
@@ -0,0 +1,2 @@
+// The entire contents of this file is intentionally commented out
+// public class i13310 {}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// The entire contents of this file is intentionally commented out
		// public class i13310 {}