Java package must be rooted

Author: som-snytt

compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala

@@ -125,8 +125,8 @@ trait TypeAssigner {
 
   /** The type of the selection `tree`, where `qual1` is the typed qualifier part. */
   def selectionType(tree: untpd.RefTree, qual1: Tree)(using Context): Type =
-    val qualType0 = qual1.tpe.widenIfUnstable
     val qualType =
+      val qualType0 = qual1.tpe.widenIfUnstable
       if !qualType0.hasSimpleKind && tree.name != nme.CONSTRUCTOR then
         // constructors are selected on type constructor, type arguments are passed afterwards
         errorType(em"$qualType0 takes type parameters", qual1.srcPos)
@@ -199,7 +199,7 @@ trait TypeAssigner {
 
   /** Type assignment method. Each method takes as parameters
    *   - an untpd.Tree to which it assigns a type,
-   *   - typed child trees it needs to access to cpmpute that type,
+   *   - typed child trees it needs to access to compute that type,
    *   - any further information it needs to access to compute that type.
    */
   def assignType(tree: untpd.Ident, tp: Type)(using Context): Ident =

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -1008,13 +1008,24 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
         typedSelectWithAdapt(tree, pt, qual).withSpan(tree.span).computeNullable()
 
     def javaSelection(qual: Tree)(using Context) =
-      val tree1 = assignType(cpy.Select(tree)(qual, tree.name), qual)
-      tree1.tpe match
-        case moduleRef: TypeRef if moduleRef.symbol.is(ModuleClass, butNot = JavaDefined) =>
-          // handle unmangling of module names (Foo$ -> Foo[ModuleClass])
-          cpy.Select(tree)(qual, tree.name.unmangleClassName).withType(moduleRef)
-        case _ =>
-          tree1
+      qual match
+      case id @ Ident(name) if id.symbol.is(Package) && !id.symbol.owner.isRoot =>
+        def nextPackage(last: Symbol)(using Context): Type =
+          val startAt = ctx.outersIterator.dropWhile(_.owner != last.owner).drop(1).next()
+          val next = findRef(name, WildcardType, required = Package, EmptyFlags, qual.srcPos)(using startAt)
+          if next.exists && !next.typeSymbol.owner.isRoot then nextPackage(next.typeSymbol)
+          else next
+        val next = nextPackage(id.symbol)
+        val qual1 = if next.exists then assignType(cpy.Ident(id)(tree.name), next) else qual
+        assignType(cpy.Select(tree)(qual1, tree.name), qual1)
+      case _ =>
+        val tree1 = assignType(cpy.Select(tree)(qual, tree.name), qual)
+        tree1.tpe match
+          case moduleRef: TypeRef if moduleRef.symbol.is(ModuleClass, butNot = JavaDefined) =>
+            // handle unmangling of module names (Foo$ -> Foo[ModuleClass])
+            cpy.Select(tree)(qual, tree.name.unmangleClassName).withType(moduleRef)
+          case _ =>
+            tree1
 
     def tryJavaSelectOnType(using Context): Tree = tree.qualifier match {
       case sel @ Select(qual, name) =>

tests/pos/t10350/Bar.scala

@@ -0,0 +1,6 @@
+
+package bar
+
+object Bar {
+  def xxx(s: String): foo.Foo = foo.Foo.create(s)
+}

tests/pos/t10350/Baz.java

@@ -0,0 +1,5 @@
+
+package foo.java;
+
+interface Baz {
+}

tests/pos/t10350/Foo.java

@@ -0,0 +1,14 @@
+
+package foo;
+
+public interface Foo {
+  static Foo create(java.lang.String v) {
+    return null;
+  }
+}
+
+/*
+5 |  static Foo create(java.lang.String v) {
+  |                    ^^^^^^^^^
+  |                    value lang is not a member of foo.java
+ */

tests/pos/t11788/Bar.scala

@@ -0,0 +1,3 @@
+object Bar extends App {
+  println(new Foo().test())
+}

tests/pos/t11788/Foo.java

@@ -0,0 +1,8 @@
+public class Foo {
+	private String java;
+
+	public java.lang.Integer test() {
+		//return Integer.valueOf(42);
+		throw null;
+	}
+}

tests/pos/t11788b/Bar.scala

@@ -0,0 +1,3 @@
+object Bar extends App {
+  println(new Foo().test())
+}

tests/pos/t11788b/Foo.java

@@ -0,0 +1,8 @@
+public class Foo {
+	private String java;
+
+	public java.lang.Integer test() {
+		//return Integer.valueOf(42);
+		throw null;
+	}
+}

tests/pos/t11788b/java.java

@@ -0,0 +1,7 @@
+
+public class java {
+	public static class lang {
+		public static class Integer {
+		}
+	}
+}