Merge pull request scala#4117 from retronym/ticket/8449

adriaanm · adriaanm · commit b9c89cc28409 · 2014-11-17T12:41:01.000+01:00
SI-8449 Fix spurious error with Java raw type over a Scala class
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -870,13 +870,13 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
 
       def adaptType(): Tree = {
         // @M When not typing a type constructor (!context.inTypeConstructorAllowed)
-        // or raw type (tree.symbol.isJavaDefined && context.unit.isJava), types must be of kind *,
+        // or raw type, types must be of kind *,
         // and thus parameterized types must be applied to their type arguments
         // @M TODO: why do kind-* tree's have symbols, while higher-kinded ones don't?
         def properTypeRequired = (
              tree.hasSymbolField
           && !context.inTypeConstructorAllowed
-          && !(tree.symbol.isJavaDefined && context.unit.isJava)
+          && !context.unit.isJava
         )
         // @M: don't check tree.tpe.symbol.typeParams. check tree.tpe.typeParams!!!
         // (e.g., m[Int] --> tree.tpe.symbol.typeParams.length == 1, tree.tpe.typeParams.length == 0!)
diff --git a/test/files/t8449/Client.scala b/test/files/t8449/Client.scala
@@ -0,0 +1,3 @@
+object Client {
+  def foo: Any = new Test().foo
+}
diff --git a/test/files/t8449/Test.java b/test/files/t8449/Test.java
@@ -0,0 +1,10 @@
+public class Test {
+	// Raw type over a Scala type constructor
+	public scala.Function1 foo() { return null; }
+	// scalac reported:
+	// % scalac-hash v2.11.2 -d /tmp sandbox/{Test.java,Client.scala}
+	// sandbox/Test.java:2: error: trait Function1 takes type parameters
+	// 	public scala.Function1 foo() { return null; }
+	//                      ^
+	// one error found
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+object Client {`
	`2`	`+ def foo: Any = new Test().foo`
	`3`	`+}`