From 58db64a47821c7e3573df64009ca2dee7a75220a Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 25 Jul 2019 09:58:58 +0300 Subject: [PATCH] J2K: Fix old J2K test data's error messages which has changed due to new inference --- j2k/testData/fileOrElement/class/kt-639.kt | 4 ++-- .../fileOrElement/function/java8MRKFunctionExpectedType.kt | 2 +- j2k/testData/fileOrElement/issues/kt-1048.kt | 4 ++-- .../fileOrElement/methodCallExpression/collectionsMethods2.kt | 4 ++-- .../fileOrElement/newClassExpression/fullQualifiedName.kt | 2 +- .../fileOrElement/newClassExpression/fullQualifiedName2.kt | 2 +- j2k/testData/fileOrElement/nullability/nullableField.kt | 3 --- j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt | 2 +- j2k/testData/fileOrElement/rawGenerics/kt-540.kt | 2 +- j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt | 4 +++- 10 files changed, 14 insertions(+), 15 deletions(-) diff --git a/j2k/testData/fileOrElement/class/kt-639.kt b/j2k/testData/fileOrElement/class/kt-639.kt index e10e9a370df..7a83019214a 100644 --- a/j2k/testData/fileOrElement/class/kt-639.kt +++ b/j2k/testData/fileOrElement/class/kt-639.kt @@ -1,5 +1,5 @@ -// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap(initialCapacity: Int) Please specify it explicitly. -// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap(initialCapacity: Int) Please specify it explicitly. +// ERROR: Not enough information to infer type variable K +// ERROR: Not enough information to infer type variable K package demo import java.util.HashMap diff --git a/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt b/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt index 42692d3e808..1e0c8d5767d 100644 --- a/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt +++ b/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt @@ -1,4 +1,4 @@ -// ERROR: Type inference failed: Not enough information to infer parameter T in fun emptyList(): List Please specify it explicitly. +// ERROR: Not enough information to infer type variable T package test import java.util.Collections diff --git a/j2k/testData/fileOrElement/issues/kt-1048.kt b/j2k/testData/fileOrElement/issues/kt-1048.kt index 0722e9e63cc..5048c10e21c 100644 --- a/j2k/testData/fileOrElement/issues/kt-1048.kt +++ b/j2k/testData/fileOrElement/issues/kt-1048.kt @@ -1,5 +1,5 @@ -// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap() Please specify it explicitly. -// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap() Please specify it explicitly. +// ERROR: Not enough information to infer type variable K +// ERROR: Not enough information to infer type variable K import java.util.HashMap internal class G(t: T) diff --git a/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt b/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt index d6b427c9d39..0246472b42a 100644 --- a/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt +++ b/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt @@ -1,5 +1,5 @@ -// ERROR: Null can not be a value of a non-null type String -// ERROR: Null can not be a value of a non-null type String +// ERROR: Null can not be a value of a non-null type TypeVariable(T) +// ERROR: Null can not be a value of a non-null type TypeVariable(T) import java.util.* internal class A { diff --git a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt index f83edeff07a..ee3234db7dc 100644 --- a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt +++ b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt @@ -1,4 +1,4 @@ -// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList() Please specify it explicitly. +// ERROR: Not enough information to infer type variable E package test internal class User { diff --git a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt index f83edeff07a..ee3234db7dc 100644 --- a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt +++ b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt @@ -1,4 +1,4 @@ -// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList() Please specify it explicitly. +// ERROR: Not enough information to infer type variable E package test internal class User { diff --git a/j2k/testData/fileOrElement/nullability/nullableField.kt b/j2k/testData/fileOrElement/nullability/nullableField.kt index 3aa83840a27..e550fc31ca6 100644 --- a/j2k/testData/fileOrElement/nullability/nullableField.kt +++ b/j2k/testData/fileOrElement/nullability/nullableField.kt @@ -1,6 +1,3 @@ -// ERROR: Type mismatch: inferred type is Int? but Int was expected -// ERROR: Type inference failed. Please try to specify type arguments explicitly. -// ERROR: Using 'remove(Int): T' is an error. Use removeAt(index) instead. package test import java.util.ArrayList diff --git a/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt b/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt index 9c7c150d871..be19bc5c2ba 100644 --- a/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt +++ b/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt @@ -1,4 +1,4 @@ -// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap() Please specify it explicitly. +// ERROR: Not enough information to infer type variable K package demo import java.util.HashMap diff --git a/j2k/testData/fileOrElement/rawGenerics/kt-540.kt b/j2k/testData/fileOrElement/rawGenerics/kt-540.kt index a7f27cd4296..1580b16aba9 100644 --- a/j2k/testData/fileOrElement/rawGenerics/kt-540.kt +++ b/j2k/testData/fileOrElement/rawGenerics/kt-540.kt @@ -1,4 +1,4 @@ -// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList() Please specify it explicitly. +// ERROR: Not enough information to infer type variable E package demo import java.util.ArrayList diff --git a/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt b/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt index 3062919bdf9..e1fe9f1edf5 100644 --- a/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt +++ b/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt @@ -1,4 +1,6 @@ -// ERROR: Type inference failed. Expected type mismatch: inferred type is HashMap but Map was expected +// ERROR: Type mismatch: inferred type is (CapturedType(*)!!..Any?) but String was expected +// ERROR: Type mismatch: inferred type is (CapturedType(*)!!..Any?) but String was expected +// ERROR: Type mismatch: inferred type is HashMap but Map was expected import java.util.* internal object A {