wip

Author: SethTisue

plugin/src/main/scala/com/typesafe/genjavadoc/JavaSig.scala

@@ -2,7 +2,7 @@ package com.typesafe.genjavadoc
 
 import scala.reflect.internal.ClassfileConstants
 
-trait JavaSig { this: TransformCake =>
+trait JavaSig extends NeedsJavaSig { this: TransformCake =>
   import global._
   import definitions._
 
@@ -199,12 +199,6 @@ trait JavaSig { this: TransformCake =>
       (initialSymbol.enclClassChain.exists(sym isNestedIn _)) ||
       (initialSymbol.isMethod && initialSymbol.typeParams.contains(sym))))
 
-  private def needsSigCollector: TypeCollector[Boolean] =
-    (new NeedsSigCollector[global.type] { val global = JavaSig.this.global })
-      .needsSigCollector
-
-  private def needsJavaSig(tp: Type) = !settings.Ynogenericsig.value && needsSigCollector.collect(tp)
-
   class UnknownSig extends Exception
 
 }

plugin/src/main/scala/com/typesafe/genjavadoc/NeedsJavaSig.scala

@@ -0,0 +1,40 @@
+package com.typesafe.genjavadoc
+
+trait NeedsJavaSig { this: TransformCake =>
+
+  import global._
+  import definitions._
+
+  def needsJavaSig(tp: Type): Boolean =
+    !settings.Ynogenericsig.value && NeedsSigCollector.collect(tp)
+
+  private object NeedsSigCollector extends TypeCollector(false) {
+    private def rebindInnerClass(pre: Type, cls: Symbol): Type =
+      if (cls.owner.isClass) cls.owner.tpe else pre // why not cls.isNestedClass?
+    override def traverse(tp: Type): Unit = {
+      if (!result) {
+        tp match {
+          case st: SubType =>
+            traverse(st.supertype)
+          case TypeRef(pre, sym, args) =>
+            if (sym == ArrayClass) args foreach traverse
+            else if (sym.isTypeParameterOrSkolem || sym.isExistentiallyBound || !args.isEmpty) result = true
+            else if (sym.isClass) traverse(rebindInnerClass(pre, sym)) // #2585
+            else if (!sym.owner.isPackageClass) traverse(pre)
+          case PolyType(_, _) | ExistentialType(_, _) =>
+            result = true
+          case RefinedType(parents, _) =>
+            parents foreach traverse
+          case ClassInfoType(parents, _, _) =>
+            parents foreach traverse
+          case at: AnnotatedType =>
+            traverse(at.underlying)
+          case _ =>
+            mapOver(tp)
+        }
+      }
+    }
+  }
+
+}
+