Merge pull request #13378 from griggt/fix-13310

griggt · web-flow · commit ce0e25c12b07 · 2021-08-25T09:36:28.000-07:00
Fix #13310: Parse empty Java compilation units as EmptyTree
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
`@@ -1013,7 +1013,9 @@ object JavaParsers {`
`1013`	`1013`	`}`
`1014`	`1014`	`val unit = atSpan(start) { PackageDef(pkg, buf.toList) }`
`1015`	`1015`	`accept(EOF)`
`1016`		`- unit`
	`1016`	`+ unit match`
	`1017`	`+ case PackageDef(Ident(nme.EMPTY_PACKAGE), Nil) => EmptyTree`
	`1018`	`+ case _ => unit`
`1017`	`1019`	`}`
`1018`	`1020`	`}`
`1019`	`1021`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// The entire contents of this file is intentionally commented out`
	`2`	`+// public class i13310 {}`