Skip to content

Commit 7ba5ba1

Browse files
committed
Clean tests
1 parent 347feae commit 7ba5ba1

File tree

59 files changed

+17
-563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+17
-563
lines changed

compiler/src/dotty/tools/dotc/core/JavaNullInterop.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ object JavaNullInterop {
114114
// This is because `setNames(null)` passes as argument a single-element array containing the value `null`,
115115
// and not a `null` array.
116116
|| !ctx.flexibleTypes && tp.isRef(defn.RepeatedParamClass)
117-
case _ => true
117+
case _ => false
118118
}))
119119

120120
override def apply(tp: Type): Type = tp match {

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -645,14 +645,15 @@ trait Applications extends Compatibility {
645645
missingArg(n)
646646
}
647647

648-
if (formal.isRepeatedParam)
648+
val formal1 = formal.stripFlexible
649+
if (formal1.isRepeatedParam)
649650
args match {
650651
case arg :: Nil if isVarArg(arg) =>
651652
addTyped(arg)
652653
case (arg @ Typed(Literal(Constant(null)), _)) :: Nil if ctx.isAfterTyper =>
653654
addTyped(arg)
654655
case _ =>
655-
val elemFormal = formal.widenExpr.argTypesLo.head
656+
val elemFormal = formal1.widenExpr.argTypesLo.head
656657
val typedArgs =
657658
harmonic(harmonizeArgs, elemFormal) {
658659
args.map { arg =>

tests/explicit-nulls/flexible-types/common/interop-propagate.scala

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
// Test that type mapping works with flexible types.
55
val ll: ArrayList[ArrayList[ArrayList[String]]] = new ArrayList[ArrayList[ArrayList[String]]]
6-
val level1: ArrayList[ArrayList[String]] = ll.get(0)
7-
val level2: ArrayList[String] = ll.get(0).get(0)
8-
val level3: String = ll.get(0).get(0).get(0)
6+
val level1: ArrayList[ArrayList[String]] = ll.get(0) // error
7+
val level2: ArrayList[String] = ll.get(0).get(0) // error
8+
val level3: String = ll.get(0).get(0).get(0) // error
99

1010
val lb = new ArrayList[ArrayList[ArrayList[String]]]
1111
val levelA = lb.get(0)
12-
val levelB = lb.get(0).get(0)
13-
val levelC = lb.get(0).get(0).get(0)
12+
val levelB = lb.get(0).get(0) // error
13+
val levelC = lb.get(0).get(0).get(0) // error
1414

15-
val x = levelA.get(0)
15+
val x = levelA.get(0) // error
1616
val y = levelB.get(0)
17-
val z: String = levelA.get(0).get(0)
17+
val z: String = levelA.get(0).get(0) // error
1818
}

tests/explicit-nulls/flexible-types/common/java-call/S.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ val s1n: String | Null = j.f1()
1010

1111
val i1: Int = j.f2()
1212

13-
val k: jj.K = jj.f3()
13+
val k: jj.K = jj.f3() // error // error
1414

1515
val s2: String = j.g1[String]() // error
1616

tests/explicit-nulls/flexible-types/common/unsafe-match-null.scala

-5
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
def test1 =
2+
val s: String = ???
3+
s.trim() match
4+
case _: String =>
5+
case null =>

tests/flexible-types/neg/array.scala

-44
This file was deleted.

tests/flexible-types/pos-separate/interop-enum-src/Day_1.java

-6
This file was deleted.

tests/flexible-types/pos-separate/interop-enum-src/Planet_2.java

-19
This file was deleted.

tests/flexible-types/pos-separate/interop-enum-src/S_3.scala

-6
This file was deleted.

tests/flexible-types/pos/i8981.scala

-1
This file was deleted.

tests/flexible-types/pos/instanceof-nothing.scala

-26
This file was deleted.

tests/flexible-types/pos/interop-array-src/J.java

-13
This file was deleted.

tests/flexible-types/pos/interop-array-src/S.scala

-25
This file was deleted.

tests/flexible-types/pos/interop-compare-src/J.java

-5
This file was deleted.

tests/flexible-types/pos/interop-compare-src/S.scala

-10
This file was deleted.

tests/flexible-types/pos/interop-constructor.scala

-7
This file was deleted.

tests/flexible-types/pos/interop-java-varargs-src/Names.java

-4
This file was deleted.

tests/flexible-types/pos/interop-java-varargs-src/S.scala

-19
This file was deleted.

tests/flexible-types/pos/interop-java-varargs.scala

-22
This file was deleted.

tests/flexible-types/pos/override-java-object-arg-src/J.java

-10
This file was deleted.

tests/flexible-types/pos/override-java-object-arg-src/S.scala

-33
This file was deleted.

tests/flexible-types/pos/override-java-object-arg.scala

-43
This file was deleted.

tests/flexible-types/pos/override-java-varargs/S.scala

-14
This file was deleted.

0 commit comments

Comments
 (0)