Clean tests

scala · Oct 18, 2023 · 7ba5ba1 · 7ba5ba1
1 parent 347feae
commit 7ba5ba1
Show file tree

Hide file tree

Showing 59 changed files with 17 additions and 563 deletions.
diff --git a/compiler/src/dotty/tools/dotc/core/JavaNullInterop.scala b/compiler/src/dotty/tools/dotc/core/JavaNullInterop.scala
@@ -114,7 +114,7 @@ object JavaNullInterop {
           // This is because `setNames(null)` passes as argument a single-element array containing the value `null`,
           // and not a `null` array.
           || !ctx.flexibleTypes && tp.isRef(defn.RepeatedParamClass)
-        case _ => true
+        case _ => false
       }))
 
     override def apply(tp: Type): Type = tp match {

diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala
@@ -645,14 +645,15 @@ trait Applications extends Compatibility {
               missingArg(n)
           }
 
-          if (formal.isRepeatedParam)
+          val formal1 = formal.stripFlexible
+          if (formal1.isRepeatedParam)
             args match {
               case arg :: Nil if isVarArg(arg) =>
                 addTyped(arg)
               case (arg @ Typed(Literal(Constant(null)), _)) :: Nil if ctx.isAfterTyper =>
                 addTyped(arg)
               case _ =>
-                val elemFormal = formal.widenExpr.argTypesLo.head
+                val elemFormal = formal1.widenExpr.argTypesLo.head
                 val typedArgs =
                   harmonic(harmonizeArgs, elemFormal) {
                     args.map { arg =>

diff --git a/tests/explicit-nulls/flexible-types/common/interop-propagate.scala b/tests/explicit-nulls/flexible-types/common/interop-propagate.scala
@@ -3,16 +3,16 @@
 
   // Test that type mapping works with flexible types.
   val ll: ArrayList[ArrayList[ArrayList[String]]] = new ArrayList[ArrayList[ArrayList[String]]]
-  val level1: ArrayList[ArrayList[String]] = ll.get(0)
-  val level2: ArrayList[String] = ll.get(0).get(0)
-  val level3: String = ll.get(0).get(0).get(0)
+  val level1: ArrayList[ArrayList[String]] = ll.get(0) // error
+  val level2: ArrayList[String] = ll.get(0).get(0) // error
+  val level3: String = ll.get(0).get(0).get(0)  // error
 
   val lb = new ArrayList[ArrayList[ArrayList[String]]]
   val levelA = lb.get(0)
-  val levelB = lb.get(0).get(0)
-  val levelC = lb.get(0).get(0).get(0)
+  val levelB = lb.get(0).get(0)  // error
+  val levelC = lb.get(0).get(0).get(0)  // error
 
-  val x = levelA.get(0)
+  val x = levelA.get(0)  // error
   val y = levelB.get(0)
-  val z: String = levelA.get(0).get(0)
+  val z: String = levelA.get(0).get(0)  // error
 }
diff --git a/tests/explicit-nulls/flexible-types/common/java-call/S.scala b/tests/explicit-nulls/flexible-types/common/java-call/S.scala
@@ -10,7 +10,7 @@ val s1n: String | Null = j.f1()
 
 val i1: Int = j.f2()
 
-val k: jj.K = jj.f3()
+val k: jj.K = jj.f3() // error // error
 
 val s2: String = j.g1[String]()  // error
 

diff --git a/tests/explicit-nulls/flexible-types/common/unsafe-match-null.scala b/tests/explicit-nulls/flexible-types/common/unsafe-match-null.scala
diff --git a/...-nulls/flexible-types/common/equal/J.java → ...cit-nulls/flexible-types/pos/equal/J.java b/...-nulls/flexible-types/common/equal/J.java → ...cit-nulls/flexible-types/pos/equal/J.java
diff --git a/...nulls/flexible-types/common/equal/S.scala → ...it-nulls/flexible-types/pos/equal/S.scala b/...nulls/flexible-types/common/equal/S.scala → ...it-nulls/flexible-types/pos/equal/S.scala
diff --git a/...-types/pos/interop-constructor-src/J.java → ...-types/pos/interop-constructor-src/J.java b/...-types/pos/interop-constructor-src/J.java → ...-types/pos/interop-constructor-src/J.java
diff --git a/...types/pos/interop-constructor-src/S.scala → ...types/pos/interop-constructor-src/S.scala b/...types/pos/interop-constructor-src/S.scala → ...types/pos/interop-constructor-src/S.scala
diff --git a/...xible-types/pos/interop-enum-src/Day.java → ...xible-types/pos/interop-enum-src/Day.java b/...xible-types/pos/interop-enum-src/Day.java → ...xible-types/pos/interop-enum-src/Day.java
diff --git a/...le-types/pos/interop-enum-src/Planet.java → ...le-types/pos/interop-enum-src/Planet.java b/...le-types/pos/interop-enum-src/Planet.java → ...le-types/pos/interop-enum-src/Planet.java
diff --git a/...exible-types/pos/interop-enum-src/S.scala → ...exible-types/pos/interop-enum-src/S.scala b/...exible-types/pos/interop-enum-src/S.scala → ...exible-types/pos/interop-enum-src/S.scala
diff --git a/...lexible-types/pos/interop-generics/J.java → ...lexible-types/pos/interop-generics/J.java b/...lexible-types/pos/interop-generics/J.java → ...lexible-types/pos/interop-generics/J.java
diff --git a/...exible-types/pos/interop-generics/S.scala → ...exible-types/pos/interop-generics/S.scala b/...exible-types/pos/interop-generics/S.scala → ...exible-types/pos/interop-generics/S.scala
diff --git a/...exible-types/pos/interop-match-src/J.java → ...exible-types/pos/interop-match-src/J.java b/...exible-types/pos/interop-match-src/J.java → ...exible-types/pos/interop-match-src/J.java
diff --git a/...xible-types/pos/interop-match-src/S.scala → ...xible-types/pos/interop-match-src/S.scala b/...xible-types/pos/interop-match-src/S.scala → ...xible-types/pos/interop-match-src/S.scala
diff --git a/...xible-types/pos/interop-method-src/J.java → ...xible-types/pos/interop-method-src/J.java b/...xible-types/pos/interop-method-src/J.java → ...xible-types/pos/interop-method-src/J.java
diff --git a/...ible-types/pos/interop-method-src/S.scala → ...ible-types/pos/interop-method-src/S.scala b/...ible-types/pos/interop-method-src/S.scala → ...ible-types/pos/interop-method-src/S.scala
diff --git a/...xible-types/pos/interop-ortype-src/J.java → ...xible-types/pos/interop-ortype-src/J.java b/...xible-types/pos/interop-ortype-src/J.java → ...xible-types/pos/interop-ortype-src/J.java
diff --git a/...ible-types/pos/interop-ortype-src/S.scala → ...ible-types/pos/interop-ortype-src/S.scala b/...ible-types/pos/interop-ortype-src/S.scala → ...ible-types/pos/interop-ortype-src/S.scala
diff --git a/...lexible-types/pos/interop-poly-src/J.java → ...lexible-types/pos/interop-poly-src/J.java b/...lexible-types/pos/interop-poly-src/J.java → ...lexible-types/pos/interop-poly-src/J.java
diff --git a/...exible-types/pos/interop-poly-src/S.scala → ...exible-types/pos/interop-poly-src/S.scala b/...exible-types/pos/interop-poly-src/S.scala → ...exible-types/pos/interop-poly-src/S.scala
diff --git a/...flexible-types/pos/interop-sam-src/J.java → ...flexible-types/pos/interop-sam-src/J.java b/...flexible-types/pos/interop-sam-src/J.java → ...flexible-types/pos/interop-sam-src/J.java
diff --git a/...lexible-types/pos/interop-sam-src/S.scala → ...lexible-types/pos/interop-sam-src/S.scala b/...lexible-types/pos/interop-sam-src/S.scala → ...lexible-types/pos/interop-sam-src/S.scala
diff --git a/...xible-types/pos/interop-static-src/J.java → ...xible-types/pos/interop-static-src/J.java b/...xible-types/pos/interop-static-src/J.java → ...xible-types/pos/interop-static-src/J.java
diff --git a/...ible-types/pos/interop-static-src/S.scala → ...ible-types/pos/interop-static-src/S.scala b/...ible-types/pos/interop-static-src/S.scala → ...ible-types/pos/interop-static-src/S.scala
diff --git a/tests/explicit-nulls/flexible-types/pos/match-null.scala b/tests/explicit-nulls/flexible-types/pos/match-null.scala
@@ -0,0 +1,5 @@
+def test1 =
+  val s: String = ???
+  s.trim() match
+    case _: String =>
+    case null =>
diff --git a/tests/flexible-types/neg/array.scala b/tests/flexible-types/neg/array.scala
diff --git a/tests/flexible-types/pos-separate/interop-enum-src/Day_1.java b/tests/flexible-types/pos-separate/interop-enum-src/Day_1.java
diff --git a/tests/flexible-types/pos-separate/interop-enum-src/Planet_2.java b/tests/flexible-types/pos-separate/interop-enum-src/Planet_2.java
diff --git a/tests/flexible-types/pos-separate/interop-enum-src/S_3.scala b/tests/flexible-types/pos-separate/interop-enum-src/S_3.scala
diff --git a/tests/flexible-types/pos/i8981.scala b/tests/flexible-types/pos/i8981.scala
diff --git a/tests/flexible-types/pos/instanceof-nothing.scala b/tests/flexible-types/pos/instanceof-nothing.scala
diff --git a/tests/flexible-types/pos/interop-array-src/J.java b/tests/flexible-types/pos/interop-array-src/J.java
diff --git a/tests/flexible-types/pos/interop-array-src/S.scala b/tests/flexible-types/pos/interop-array-src/S.scala
diff --git a/tests/flexible-types/pos/interop-compare-src/J.java b/tests/flexible-types/pos/interop-compare-src/J.java
diff --git a/tests/flexible-types/pos/interop-compare-src/S.scala b/tests/flexible-types/pos/interop-compare-src/S.scala
diff --git a/tests/flexible-types/pos/interop-constructor.scala b/tests/flexible-types/pos/interop-constructor.scala
diff --git a/tests/flexible-types/pos/interop-java-varargs-src/Names.java b/tests/flexible-types/pos/interop-java-varargs-src/Names.java
diff --git a/tests/flexible-types/pos/interop-java-varargs-src/S.scala b/tests/flexible-types/pos/interop-java-varargs-src/S.scala
diff --git a/tests/flexible-types/pos/interop-java-varargs.scala b/tests/flexible-types/pos/interop-java-varargs.scala
diff --git a/tests/flexible-types/pos/override-java-object-arg-src/J.java b/tests/flexible-types/pos/override-java-object-arg-src/J.java
diff --git a/tests/flexible-types/pos/override-java-object-arg-src/S.scala b/tests/flexible-types/pos/override-java-object-arg-src/S.scala
diff --git a/tests/flexible-types/pos/override-java-object-arg.scala b/tests/flexible-types/pos/override-java-object-arg.scala
diff --git a/tests/flexible-types/pos/override-java-varargs/S.scala b/tests/flexible-types/pos/override-java-varargs/S.scala