Merge pull request #11066 from lrytz/b12878

lrytz · web-flow · commit 802a7b0bc18c · 2025-08-29T16:11:29.000+02:00
Skip over JEP 445 compact compilation units
diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala
@@ -770,14 +770,9 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
       }
     }
 
-    def memberDecl(mods: Modifiers, parentToken: Int): List[Tree] = {
-      in.token match {
-        case CLASS | ENUM | RECORD | INTERFACE | AT =>
-          typeDecl(mods)
-        case _ =>
-          termDecl(mods, parentToken)
-      }
-    }
+    def memberDecl(mods: Modifiers, parentToken: Int): List[Tree] =
+      if (isTypeDeclStart()) typeDecl(mods)
+      else termDecl(mods, parentToken)
 
     def makeCompanionObject(cdef: ClassDef, statics: List[Tree]): Tree =
       atPos(cdef.pos) {
@@ -1061,6 +1056,13 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
       (res, hasClassBody)
     }
 
+    def isTypeDeclStart(): Boolean = {
+      adaptRecordIdentifier()
+      in.token match {
+        case ENUM | INTERFACE | AT | CLASS | RECORD => true
+        case _ => false
+      }
+    }
     def typeDecl(mods: Modifiers): List[Tree] = {
       adaptRecordIdentifier()
       in.token match {
@@ -1092,6 +1094,14 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
     /** CompilationUnit ::= [[Annotation] package QualId semi] {Import} {TypeDecl} //TopStatSeq
      */
     def compilationUnit(): Tree = {
+      var compact = false
+      def typeDeclOrCompact(mods: Modifiers): List[Tree] =
+        if (isTypeDeclStart()) typeDecl(mods)
+        else {
+          val ts = termDecl(mods, CLASS)
+          if (ts.nonEmpty) compact = true
+          Nil
+        }
       val buf = ListBuffer.empty[Tree]
       var pos = in.currentPos
       val leadingAnnots = if (in.token == AT) annotations() else Nil
@@ -1107,7 +1117,7 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
         }
         else {
           if (!leadingAnnots.isEmpty)
-            buf ++= typeDecl(modifiers(inInterface = false, annots0 = leadingAnnots))
+            buf ++= typeDeclOrCompact(modifiers(inInterface = false, annots0 = leadingAnnots))
           Ident(nme.EMPTY_PACKAGE_NAME)
         }
       thisPackageName = gen.convertToTypeName(pkg) match {
@@ -1120,10 +1130,11 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
       while (in.token != EOF && in.token != RBRACE) {
         while (in.token == SEMI) in.nextToken()
         if (in.token != EOF)
-          buf ++= typeDecl(modifiers(inInterface = false))
+          buf ++= typeDeclOrCompact(modifiers(inInterface = false))
       }
       accept(EOF)
-      atPos(pos) {
+      if (compact) EmptyTree
+      else atPos(pos) {
         makePackaging(pkg, buf.toList)
       }
     }
diff --git a/test/files/neg/i20026.check b/test/files/neg/i20026.check
@@ -1,4 +1,7 @@
-JTest.java:3: error: illegal start of type declaration
+JTest.java:3: error: illegal start of type
 import java.util.*;
-       ^
-1 error
+^
+JTest.java:3: error: identifier expected but `;` found.
+import java.util.*;
+                  ^
+2 errors
diff --git a/test/files/neg/t12878.check b/test/files/neg/t12878.check
@@ -0,0 +1,7 @@
+Test.scala:3: error: not found: type H
+  new H()
+      ^
+Test.scala:4: error: not found: value T
+  new T.H()
+      ^
+2 errors
diff --git a/test/files/neg/t12878/T.java b/test/files/neg/t12878/T.java
@@ -0,0 +1,9 @@
+//> using jvm 25+
+
+int k = 0;
+File f = null;
+java.io.File g = f;
+@Deprecated void main() { return; }
+public record Person(String name, int age) { }
+public class H { }
+public static int k() { return 1; }
diff --git a/test/files/neg/t12878/Test.scala b/test/files/neg/t12878/Test.scala
@@ -0,0 +1,5 @@
+class Test {
+  new U
+  new H()
+  new T.H()
+}
diff --git a/test/files/neg/t12878/U.java b/test/files/neg/t12878/U.java
@@ -0,0 +1 @@
+public class U { }
diff --git a/test/files/pos/t12878/T.java b/test/files/pos/t12878/T.java
@@ -0,0 +1,9 @@
+//> using jvm 25+
+
+int k = 0;
+File f = null;
+java.io.File g = f;
+@Deprecated void main() { return; }
+public record Person(String name, int age) { }
+public class H { }
+public static int k() { return 1; }
diff --git a/test/files/pos/t12878/Test.scala b/test/files/pos/t12878/Test.scala
@@ -0,0 +1,3 @@
+class Test {
+  new U
+}
diff --git a/test/files/pos/t12878/U.java b/test/files/pos/t12878/U.java
@@ -0,0 +1 @@
+public class U { }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +class Test {
 +  new U
 +  new H()
 +  new T.H()
 +}