Adjust existing test data for diagnostic messages

This commit is contained in:
Pavel V. Talanov
2016-02-16 15:35:59 +03:00
parent e4cf090720
commit 4ab5aabfa0
33 changed files with 70 additions and 70 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- annotationsForResolve1 -->
Type mismatch: inferred type is kotlin.String but kotlin.Int was expected
Type mismatch: inferred type is String but Int was expected
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- cannotInferVisibility1 -->
Cannot infer visibility for 'val foo: kotlin.String'. Please specify it explicitly
Cannot infer visibility for 'val foo: String'. Please specify it explicitly
@@ -1,2 +1,2 @@
<!-- cannotOverrideInvisibleMember1 -->
'public open fun foo(): kotlin.Unit defined in B' has no access to 'private open fun foo(): kotlin.Unit defined in A', so it cannot override it
'public open fun foo(): Unit defined in B' has no access to 'private open fun foo(): Unit defined in A', so it cannot override it
@@ -1,3 +1,3 @@
<!-- conflictingOverloadsClass1 -->
<html>
'<b>public</b> <b>final</b> <b>fun</b> lol(x: kotlin.Int): kotlin.Int'<br />conflicts with another declaration in class 'conflictingOverloads'</html>
'<b>public</b> <b>final</b> <b>fun</b> lol(x: Int): Int'<br />conflicts with another declaration in class 'conflictingOverloads'</html>
@@ -1,3 +1,3 @@
<!-- conflictingOverloadsClass2 -->
<html>
'<b>public</b> <b>final</b> <b>fun</b> lol(y: kotlin.Int): kotlin.Int'<br />conflicts with another declaration in class 'conflictingOverloads'</html>
'<b>public</b> <b>final</b> <b>fun</b> lol(y: Int): Int'<br />conflicts with another declaration in class 'conflictingOverloads'</html>
@@ -1,2 +1,2 @@
<!-- conflictingOverloadsDefaultPackage1 -->
'public fun foo(x: kotlin.Int): kotlin.Int' conflicts with another declaration in package '<root>'
'public fun foo(x: Int): Int' conflicts with another declaration in package '<root>'
@@ -1,2 +1,2 @@
<!-- conflictingOverloadsDefaultPackage2 -->
'public fun foo(y: kotlin.Int): kotlin.Int' conflicts with another declaration in package '<root>'
'public fun foo(y: Int): Int' conflicts with another declaration in package '<root>'
@@ -4,12 +4,12 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<table>
<tr>
<td width="10%"></td>
<td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;"><b>fun</b> <`T, E : kotlin.Cloneable> writeToMyList</td>
<td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;"><b>fun</b> <`T, E : Cloneable> writeToMyList</td>
<td style="white-space:nowrap;font-weight:bold;">(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">l: MyList<`in T>,</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">t: T</td>
<td style="white-space:nowrap;font-weight:bold;">)</td>
<td style="white-space:nowrap;font-weight:bold;">: kotlin.Unit <b>where</b> E : java.io.Closeable</td>
<td style="white-space:nowrap;font-weight:bold;">: Unit <b>where</b> E : Closeable</td>
</tr>
<tr>
<td colspan="8" style="white-space:nowrap;">None of the following substitutions</td>
@@ -19,8 +19,8 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"><b>(</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>MyList<`in kotlin.Any></b></font><b>,</b></td>
<td align="right" style="white-space:nowrap;"><b>kotlin.Any</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>MyList<`in Any></b></font><b>,</b></td>
<td align="right" style="white-space:nowrap;"><b>Any</b></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
<tr>
@@ -28,8 +28,8 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"><b>(</b></td>
<td align="right" style="white-space:nowrap;"><b>MyList<`in kotlin.Int></b><b>,</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>kotlin.Int</b></font></td>
<td align="right" style="white-space:nowrap;"><b>MyList<`in Int></b><b>,</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>Int</b></font></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
<tr>
@@ -40,8 +40,8 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"><b>(</b></td>
<td align="right" style="white-space:nowrap;"><b>MyList<`kotlin.Int></b><b>,</b></td>
<td align="right" style="white-space:nowrap;"><b>kotlin.Any</b></td>
<td align="right" style="white-space:nowrap;"><b>MyList<`Int></b><b>,</b></td>
<td align="right" style="white-space:nowrap;"><b>Any</b></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
</table>
@@ -4,7 +4,7 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<table>
<tr>
<td width="10%"></td>
<td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;"><b>constructor</b> Cons<`T, E : kotlin.Cloneable></td>
<td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;"><b>constructor</b> Cons<`T, E : Cloneable></td>
<td style="white-space:nowrap;font-weight:bold;">(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">l: MyList<`in T>,</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">t: T</td>
@@ -19,8 +19,8 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"><b>(</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>MyList<`in kotlin.Any></b></font><b>,</b></td>
<td align="right" style="white-space:nowrap;"><b>kotlin.Any</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>MyList<`in Any></b></font><b>,</b></td>
<td align="right" style="white-space:nowrap;"><b>Any</b></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
<tr>
@@ -28,8 +28,8 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"><b>(</b></td>
<td align="right" style="white-space:nowrap;"><b>MyList<`in kotlin.Int></b><b>,</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>kotlin.Int</b></font></td>
<td align="right" style="white-space:nowrap;"><b>MyList<`in Int></b><b>,</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>Int</b></font></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
<tr>
@@ -40,8 +40,8 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"><b>(</b></td>
<td align="right" style="white-space:nowrap;"><b>MyList<`kotlin.Int></b><b>,</b></td>
<td align="right" style="white-space:nowrap;"><b>kotlin.Any</b></td>
<td align="right" style="white-space:nowrap;"><b>MyList<`Int></b><b>,</b></td>
<td align="right" style="white-space:nowrap;"><b>Any</b></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
</table>
@@ -1,2 +1,2 @@
<!-- constructorsRedeclaration1 -->
'public constructor Element(x: kotlin.String)' conflicts with another declaration in class 'Element'
'public constructor Element(x: String)' conflicts with another declaration in class 'Element'
@@ -1,2 +1,2 @@
<!-- constructorsRedeclaration2 -->
'public constructor Element(x: kotlin.String)' conflicts with another declaration in class 'Element'
'public constructor Element(x: String)' conflicts with another declaration in class 'Element'
@@ -1,2 +1,2 @@
<!-- constructorsRedeclarationTopLevel1 -->
'public fun Element(x: kotlin.String): kotlin.Unit' conflicts with another declaration in class 'Element'
'public fun Element(x: String): Unit' conflicts with another declaration in class 'Element'
@@ -1,2 +1,2 @@
<!-- constructorsRedeclarationTopLevel2 -->
'public constructor Element(x: kotlin.String)' conflicts with another declaration in package '<root>'
'public constructor Element(x: String)' conflicts with another declaration in package '<root>'
@@ -1,2 +1,2 @@
<!-- differentNamesForSameParameter1 -->
Names of the parameter #1 conflict in the following members of supertypes: 'public abstract fun foo(x: kotlin.Int): kotlin.Unit defined in A, public open fun foo(y: kotlin.Int): kotlin.Unit defined in B'. This may cause problems when calling this function with named arguments.
Names of the parameter #1 conflict in the following members of supertypes: 'public abstract fun foo(x: Int): Unit defined in A, public open fun foo(y: Int): Unit defined in B'. This may cause problems when calling this function with named arguments.
@@ -1,2 +1,2 @@
<!-- expectedNothingDueToProjections1 -->
Out-projected type 'kotlin.collections.MutableCollection<out kotlin.CharSequence>' prohibits the use of 'public abstract fun add(element: E): kotlin.Boolean defined in kotlin.collections.MutableCollection'
Out-projected type 'MutableCollection<out CharSequence>' prohibits the use of 'public abstract fun add(element: E): Boolean defined in kotlin.collections.MutableCollection'
+1 -1
View File
@@ -18,7 +18,7 @@ Type inference failed:
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"><b>(</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>(kotlin.Int) &rarr; kotlin.Int</b></font></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>(Int) &rarr; Int</b></font></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
</table>
@@ -1,2 +1,2 @@
<!-- multipleDefaultsFromSupertypes1 -->
More than one overridden descriptor declares a default value for 'value-parameter x: kotlin.Int = ... defined in multipleDefaultsFromSupertypes.foo'. As the compiler can not make sure these values agree, this is not allowed.
More than one overridden descriptor declares a default value for 'value-parameter x: Int = ... defined in multipleDefaultsFromSupertypes.foo'. As the compiler can not make sure these values agree, this is not allowed.
+2 -2
View File
@@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch:
<table>
<tr>
<td>required: </td>
<td><b>kotlin.Int</b></td>
<td><b>Int</b></td>
</tr>
<tr>
<td>found: </td>
<td><font color=red><b>kotlin.Long</b></font></td>
<td><font color=red><b>Long</b></font></td>
</tr>
</table>
</html>
+2 -2
View File
@@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch:
<table>
<tr>
<td>required: </td>
<td><b>kotlin.Byte</b></td>
<td><b>Byte</b></td>
</tr>
<tr>
<td>found: </td>
<td><font color=red><b>kotlin.Int</b></font></td>
<td><font color=red><b>Int</b></font></td>
</tr>
</table>
</html>
+3 -3
View File
@@ -6,9 +6,9 @@ Type inference failed:
<td width="10%"></td>
<td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;"><b>fun</b> <`T> foo</td>
<td style="white-space:nowrap;font-weight:bold;">(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">l: kotlin.collections.List<`T></td>
<td align="right" style="white-space:nowrap;font-weight:bold;">l: List<`T></td>
<td style="white-space:nowrap;font-weight:bold;">)</td>
<td style="white-space:nowrap;font-weight:bold;">: kotlin.Unit</td>
<td style="white-space:nowrap;font-weight:bold;">: Unit</td>
</tr>
<tr>
<td colspan="7" style="white-space:nowrap;">cannot be applied to</td>
@@ -18,7 +18,7 @@ Type inference failed:
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"><b>(</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>kotlin.Int</b></font></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>Int</b></font></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
</table>
+8 -8
View File
@@ -7,9 +7,9 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;"><b>fun</b> <`T> bar</td>
<td style="white-space:nowrap;font-weight:bold;">(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">t: T,</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">l: kotlin.collections.MutableList<`T></td>
<td align="right" style="white-space:nowrap;font-weight:bold;">l: MutableList<`T></td>
<td style="white-space:nowrap;font-weight:bold;">)</td>
<td style="white-space:nowrap;font-weight:bold;">: kotlin.Unit</td>
<td style="white-space:nowrap;font-weight:bold;">: Unit</td>
</tr>
<tr>
<td colspan="8" style="white-space:nowrap;">None of the following substitutions</td>
@@ -19,8 +19,8 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"><b>(</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>kotlin.String</b></font><b>,</b></td>
<td align="right" style="white-space:nowrap;"><b>kotlin.collections.MutableList<`kotlin.String></b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>String</b></font><b>,</b></td>
<td align="right" style="white-space:nowrap;"><b>MutableList<`String></b></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
<tr>
@@ -28,8 +28,8 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"><b>(</b></td>
<td align="right" style="white-space:nowrap;"><b>kotlin.Int</b><b>,</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>kotlin.collections.MutableList<`kotlin.Int></b></font></td>
<td align="right" style="white-space:nowrap;"><b>Int</b><b>,</b></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>MutableList<`Int></b></font></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
<tr>
@@ -40,8 +40,8 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"></td>
<td style="white-space:nowrap;"><b>(</b></td>
<td align="right" style="white-space:nowrap;"><b>kotlin.Int</b><b>,</b></td>
<td align="right" style="white-space:nowrap;"><b>kotlin.collections.MutableList<`kotlin.String></b></td>
<td align="right" style="white-space:nowrap;"><b>Int</b><b>,</b></td>
<td align="right" style="white-space:nowrap;"><b>MutableList<`String></b></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
</table>
@@ -1,2 +1,2 @@
<!-- renderCollectionOfTypes1 -->
Expected 2 parameters of types kotlin.collections.List<kotlin.Int>, java.util.ArrayList<kotlin.String>
Expected 2 parameters of types List<Int>, ArrayList<String>
@@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch:
<table>
<tr>
<td>required: </td>
<td><b>kotlin.String</b></td>
<td><b>String</b></td>
</tr>
<tr>
<td>found: </td>
<td><font color=red><b>kotlin.Int</b></font></td>
<td><font color=red><b>Int</b></font></td>
</tr>
</table>
</html>
@@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch:
<table>
<tr>
<td>required: </td>
<td><b>kotlin.collections.List<`kotlin.Int></b></td>
<td><b>List<`Int></b></td>
</tr>
<tr>
<td>found: </td>
<td><font color=red><b>kotlin.collections.Set<`kotlin.Int></b></font></td>
<td><font color=red><b>Set<`Int></b></font></td>
</tr>
</table>
</html>
@@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch:
<table>
<tr>
<td>required: </td>
<td><b>kotlin.collections.Set<`kotlin.String></b></td>
<td><b>Set<`String></b></td>
</tr>
<tr>
<td>found: </td>
<td><font color=red><b>kotlin.collections.Set<`kotlin.Int></b></font></td>
<td><font color=red><b>Set<`Int></b></font></td>
</tr>
</table>
</html>
@@ -4,14 +4,14 @@ Type mismatch.
<table>
<tr>
<td>Required:</td>
<td>kotlin.collections.Collection<`kotlin.Nothing></td>
<td>Collection<`Nothing></td>
</tr>
<tr>
<td>Found:</td>
<td>kotlin.collections.MutableCollection<`kotlin.CharSequence></td>
<td>MutableCollection<`CharSequence></td>
</tr>
</table>
<br />
Projected type kotlin.collections.MutableCollection<`out kotlin.CharSequence> restricts use of <br />
<b>public</b> <b>abstract</b> <b>fun</b> addAll(elements: kotlin.collections.Collection<`E>): kotlin.Boolean <i>defined in</i> kotlin.collections.MutableCollection
Projected type MutableCollection<`out CharSequence> restricts use of <br />
<b>public</b> <b>abstract</b> <b>fun</b> addAll(elements: Collection<`E>): Boolean <i>defined in</i> kotlin.collections.MutableCollection
</html>
@@ -4,14 +4,14 @@ Type mismatch.
<table>
<tr>
<td>Required:</td>
<td>A<`kotlin.Any?></td>
<td>A<`Any?></td>
</tr>
<tr>
<td>Found:</td>
<td>A<`kotlin.CharSequence></td>
<td>A<`CharSequence></td>
</tr>
</table>
<br />
Projected type B<`in kotlin.CharSequence> restricts use of <br />
<b>public</b> <b>abstract</b> <b>fun</b> foo(x: A<`in E>): kotlin.Unit <i>defined in</i> B
Projected type B<`in CharSequence> restricts use of <br />
<b>public</b> <b>abstract</b> <b>fun</b> foo(x: A<`in E>): Unit <i>defined in</i> B
</html>
@@ -1,2 +1,2 @@
<!-- typeMismatchDueToProjectionsTxt1 -->
Type mismatch: inferred type is kotlin.collections.MutableCollection<kotlin.CharSequence> but kotlin.collections.Collection<kotlin.Nothing> was expected. Projected type kotlin.collections.MutableCollection<out kotlin.CharSequence> restricts use of public abstract fun addAll(elements: kotlin.collections.Collection<E>): kotlin.Boolean defined in kotlin.collections.MutableCollection
Type mismatch: inferred type is MutableCollection<CharSequence> but Collection<Nothing> was expected. Projected type MutableCollection<out CharSequence> restricts use of public abstract fun addAll(elements: Collection<E>): Boolean defined in kotlin.collections.MutableCollection
@@ -4,11 +4,11 @@ Type mismatch.
<table>
<tr>
<td>Required:</td>
<td>b.A<`???></td>
<td>A<`???></td>
</tr>
<tr>
<td>Found:</td>
<td>kotlin.Nothing?</td>
<td>Nothing?</td>
</tr>
</table>
</html>
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- unusedValue1 -->
The value '239' assigned to 'var x: kotlin.Int defined in unusedValue' is never used
The value '239' assigned to 'var x: Int defined in unusedValue' is never used
+2 -2
View File
@@ -1,3 +1,3 @@
<!-- upperBoundViolated1 -->
Type parameter bound for T in fun <R, T : kotlin.collections.List<R>> foo(r: R, list: T): kotlin.Unit
is not satisfied: inferred type kotlin.collections.Collection<kotlin.Int> is not a subtype of kotlin.collections.List<kotlin.Int>
Type parameter bound for T in fun <R, T : List<R>> foo(r: R, list: T): Unit
is not satisfied: inferred type Collection<Int> is not a subtype of List<Int>
+2 -2
View File
@@ -1,3 +1,3 @@
<!-- upperBoundViolated2 -->
Type parameter bound for V in fun <V : U, U> bar(v: V, u: kotlin.collections.MutableSet<U>): kotlin.collections.MutableSet<U>
is not satisfied: inferred type kotlin.Any is not a subtype of kotlin.String
Type parameter bound for V in fun <V : U, U> bar(v: V, u: MutableSet<U>): MutableSet<U>
is not satisfied: inferred type Any is not a subtype of String
+2 -2
View File
@@ -1,3 +1,3 @@
<!-- upperBoundViolated3 -->
Type parameter bound for T in fun <T : R, R : i.B> baz(t: T, r: R): kotlin.Unit where T : i.A
is not satisfied: inferred type i.A is not a subtype of i.B
Type parameter bound for T in fun <T : R, R : B> baz(t: T, r: R): Unit where T : A
is not satisfied: inferred type A is not a subtype of B