azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix testData in compiler: add collections and ranges package to fq-names.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-11-28 01:42:20 +03:00
parent 98e2d27c77
commit f4822cd757
524 changed files with 1594 additions and 1552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/diagnosticMessage/expectedNothingDueToProjections1.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- expectedNothingDueToProjections1 -->
Out-projected type 'kotlin.MutableCollection<out kotlin.CharSequence>' prohibits the use of 'public abstract fun add(element: E): kotlin.Boolean defined in kotlin.MutableCollection'
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'
idea/testData/diagnosticMessage/numberValueTypes3.html
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ 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.List<`T></td>
<td align="right" style="white-space:nowrap;font-weight:bold;">l: kotlin.collections.List<`T></td>
<td style="white-space:nowrap;font-weight:bold;">)</td>
<td style="white-space:nowrap;font-weight:bold;">: kotlin.Unit</td>
</tr>
idea/testData/diagnosticMessage/numberValueTypes4.html
Vendored
+4 -4
View File
@@ -7,7 +7,7 @@ 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.MutableList<`T></td>
<td align="right" style="white-space:nowrap;font-weight:bold;">l: kotlin.collections.MutableList<`T></td>
<td style="white-space:nowrap;font-weight:bold;">)</td>
<td style="white-space:nowrap;font-weight:bold;">: kotlin.Unit</td>
</tr>
@@ -20,7 +20,7 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<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.MutableList<`kotlin.String></b></td>
<td align="right" style="white-space:nowrap;"><b>kotlin.collections.MutableList<`kotlin.String></b></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
<tr>
@@ -29,7 +29,7 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<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.MutableList<`kotlin.Int></b></font></td>
<td align="right" style="white-space:nowrap;"><font color=red><b>kotlin.collections.MutableList<`kotlin.Int></b></font></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
<tr>
@@ -41,7 +41,7 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
<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.MutableList<`kotlin.String></b></td>
<td align="right" style="white-space:nowrap;"><b>kotlin.collections.MutableList<`kotlin.String></b></td>
<td style="white-space:nowrap;"><b>)</b></td>
</tr>
</table>
idea/testData/diagnosticMessage/renderCollectionOfTypes1.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- renderCollectionOfTypes1 -->
Expected 2 parameters of types kotlin.List<kotlin.Int>, java.util.ArrayList<kotlin.String>
Expected 2 parameters of types kotlin.collections.List<kotlin.Int>, java.util.ArrayList<kotlin.String>
idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch2.html
Vendored
+2 -2
View File
@@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch:
<table>
<tr>
<td>required: </td>
<td><b>kotlin.List<`kotlin.Int></b></td>
<td><b>kotlin.collections.List<`kotlin.Int></b></td>
</tr>
<tr>
<td>found: </td>
<td><font color=red><b>kotlin.Set<`kotlin.Int></b></font></td>
<td><font color=red><b>kotlin.collections.Set<`kotlin.Int></b></font></td>
</tr>
</table>
</html>
idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch3.html
Vendored
+2 -2
View File
@@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch:
<table>
<tr>
<td>required: </td>
<td><b>kotlin.Set<`kotlin.String></b></td>
<td><b>kotlin.collections.Set<`kotlin.String></b></td>
</tr>
<tr>
<td>found: </td>
<td><font color=red><b>kotlin.Set<`kotlin.Int></b></font></td>
<td><font color=red><b>kotlin.collections.Set<`kotlin.Int></b></font></td>
</tr>
</table>
</html>
idea/testData/diagnosticMessage/typeMismatchDueToProjections1.html
Vendored
+4 -4
View File
@@ -4,14 +4,14 @@ Type mismatch.
<table>
<tr>
<td>Required:</td>
<td>kotlin.Collection<`kotlin.Nothing></td>
<td>kotlin.collections.Collection<`kotlin.Nothing></td>
</tr>
<tr>
<td>Found:</td>
<td>kotlin.MutableCollection<`kotlin.CharSequence></td>
<td>kotlin.collections.MutableCollection<`kotlin.CharSequence></td>
</tr>
</table>
<br />
Projected type kotlin.MutableCollection<`out kotlin.CharSequence> restricts use of <br />
<b>public</b> <b>abstract</b> <b>fun</b> addAll(elements: kotlin.Collection<`E>): kotlin.Boolean <i>defined in</i> kotlin.MutableCollection
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
</html>
idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt1.txt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- typeMismatchDueToProjectionsTxt1 -->
Type mismatch: inferred type is kotlin.MutableCollection<kotlin.CharSequence> but kotlin.Collection<kotlin.Nothing> was expected. Projected type kotlin.MutableCollection<out kotlin.CharSequence> restricts use of public abstract fun addAll(elements: kotlin.Collection<E>): kotlin.Boolean defined in kotlin.MutableCollection
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
idea/testData/diagnosticMessage/upperBoundViolated1.txt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
<!-- upperBoundViolated1 -->
Type parameter bound for T in fun <R, T : kotlin.List<R>> foo(r: R, list: T): kotlin.Unit
is not satisfied: inferred type kotlin.Collection<kotlin.Int> is not a subtype of kotlin.List<kotlin.Int>
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>
idea/testData/diagnosticMessage/upperBoundViolated2.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
<!-- upperBoundViolated2 -->
Type parameter bound for V in fun <V : U, U> bar(v: V, u: kotlin.MutableSet<U>): kotlin.MutableSet<U>
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