Merge remote-tracking branch 'retronym/ticket/11365' into topic/pipeline-trace-macro-omnibus-rebase-all

Author: retronym

src/compiler/scala/tools/nsc/typechecker/Typers.scala

@@ -131,7 +131,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
      *  (`owner` tells where the type occurs).
      */
     def privates[T <: Tree](typer: Typer, owner: Symbol, tree: T): T =
-      check(typer, owner, EmptyScope, WildcardType, tree)
+      if (owner.isJavaDefined) tree else check(typer, owner, EmptyScope, WildcardType, tree)
 
     private def check[T <: Tree](typer: Typer, owner: Symbol, scope: Scope, pt: Type, tree: T): T = {
       this.owner = owner
@@ -1759,7 +1759,9 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
           checkStablePrefixClassType(parent)
 
           if (psym != superclazz) {
-            if (psym.isTrait) {
+            if (context.unit.isJava && context.unit.isJava && psym.isJavaAnnotation) {
+              // allowed
+            } else if (psym.isTrait) {
               val ps = psym.info.parents
               if (!ps.isEmpty && !superclazz.isSubClass(ps.head.typeSymbol))
                 pending += ParentSuperSubclassError(parent, superclazz, ps.head.typeSymbol, psym)
@@ -1845,7 +1847,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
         if (clazz.isTrait && clazz.info.parents.nonEmpty && clazz.info.firstParent.typeSymbol == AnyClass)
           checkEphemeral(clazz, impl2.body)
 
-        if ((clazz isNonBottomSubClass ClassfileAnnotationClass) && (clazz != ClassfileAnnotationClass)) {
+        if (!clazz.isJavaDefined && (clazz isNonBottomSubClass ClassfileAnnotationClass) && (clazz != ClassfileAnnotationClass)) {
           if (!clazz.owner.isPackageClass)
             context.error(clazz.pos, "inner classes cannot be classfile annotations")
           // Ignore @SerialVersionUID, because it is special-cased and handled completely differently.
@@ -2008,7 +2010,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
       if (clazz.isTrait && hasSuperArgs(parents1.head))
         ConstrArgsInParentOfTraitError(parents1.head, clazz)
 
-      if ((clazz isSubClass ClassfileAnnotationClass) && !clazz.isTopLevel)
+      if (!clazz.isJavaDefined && (clazz isSubClass ClassfileAnnotationClass) && !clazz.isTopLevel)
         context.error(clazz.pos, "inner classes cannot be classfile annotations")
 
       if (!phase.erasedTypes && !clazz.info.resultType.isError) // @S: prevent crash for duplicated type members

test/scaladoc/resources/t11365.java

@@ -0,0 +1,18 @@
+/**
+ * A package header
+ */
+package test.scaladoc;
+
+/**
+ * Testing java comments don't flag Scala specific errors
+ */
+public class JavaComments {
+	static @interface Annot {
+	}
+
+	private class Route {}
+ 	final java.util.List<Route> routes = null;
+
+	abstract class AnnotImpl implements Annot {}
+
+}

test/scaladoc/run/t11365.check

@@ -0,0 +1 @@
+Done.

test/scaladoc/run/t11365.scala

@@ -0,0 +1,18 @@
+import scala.tools.nsc.doc.Universe
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocJavaModelTest
+
+object Test extends ScaladocJavaModelTest {
+
+  override def resourceFile = "t11365.java"
+  override def scaladocSettings = ""
+
+  def testModel(rootPackage: Package) = {
+    import access._
+    val Tag = ":marker:"
+
+    val base = rootPackage._package("test")._package("scaladoc")
+    val clazz = base._class("JavaComments")
+    // Just testing that we haven't hit a compiler error.
+  }
+}