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

Replace "jet" package name with "kotlin" in testData

Browse Source
This commit is contained in:
Alexander Udalov
2014-02-21 23:29:57 +04:00
parent f2b4c7fa3e
commit f7b6457139
763 changed files with 2314 additions and 2310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/diagnosticMessage/conflictingSubstitutions1.html
+7 -7
View File
@@ -20,7 +20,7 @@ t: T</td>
<td style="white-space:nowrap;font-weight:bold;">
)</td>
<td style="white-space:nowrap;font-weight:bold;">
: jet.Unit <b>
: kotlin.Unit <b>
where</b>
E : java.io.Closeable</td>
</tr>
@@ -42,14 +42,14 @@ None of the following substitutions</td>
<td align="right" style="white-space:nowrap;">
<font color=red>
<b>
MyList&lt;in jet.Any&gt;</b>
MyList&lt;in kotlin.Any&gt;</b>
</font>
<b>
,</b>
</td>
<td align="right" style="white-space:nowrap;">
<b>
jet.Any</b>
kotlin.Any</b>
</td>
<td style="white-space:nowrap;">
<b>
@@ -69,14 +69,14 @@ jet.Any</b>
</td>
<td align="right" style="white-space:nowrap;">
<b>
MyList&lt;in jet.Int&gt;</b>
MyList&lt;in kotlin.Int&gt;</b>
<b>
,</b>
</td>
<td align="right" style="white-space:nowrap;">
<font color=red>
<b>
jet.Int</b>
kotlin.Int</b>
</font>
</td>
<td style="white-space:nowrap;">
@@ -101,13 +101,13 @@ can be applied to</td>
</td>
<td align="right" style="white-space:nowrap;">
<b>
MyList&lt;jet.Int&gt;</b>
MyList&lt;kotlin.Int&gt;</b>
<b>
,</b>
</td>
<td align="right" style="white-space:nowrap;">
<b>
jet.Any</b>
kotlin.Any</b>
</td>
<td style="white-space:nowrap;">
<b>
idea/testData/diagnosticMessage/conflictingSubstitutions2.html
+6 -6
View File
@@ -40,14 +40,14 @@ None of the following substitutions</td>
<td align="right" style="white-space:nowrap;">
<font color=red>
<b>
MyList&lt;in jet.Any&gt;</b>
MyList&lt;in kotlin.Any&gt;</b>
</font>
<b>
,</b>
</td>
<td align="right" style="white-space:nowrap;">
<b>
jet.Any</b>
kotlin.Any</b>
</td>
<td style="white-space:nowrap;">
<b>
@@ -67,14 +67,14 @@ jet.Any</b>
</td>
<td align="right" style="white-space:nowrap;">
<b>
MyList&lt;in jet.Int&gt;</b>
MyList&lt;in kotlin.Int&gt;</b>
<b>
,</b>
</td>
<td align="right" style="white-space:nowrap;">
<font color=red>
<b>
jet.Int</b>
kotlin.Int</b>
</font>
</td>
<td style="white-space:nowrap;">
@@ -99,13 +99,13 @@ can be applied to</td>
</td>
<td align="right" style="white-space:nowrap;">
<b>
MyList&lt;jet.Int&gt;</b>
MyList&lt;kotlin.Int&gt;</b>
<b>
,</b>
</td>
<td align="right" style="white-space:nowrap;">
<b>
jet.Any</b>
kotlin.Any</b>
</td>
<td style="white-space:nowrap;">
<b>
idea/testData/diagnosticMessage/functionPlaceholder3.html
+1 -1
View File
@@ -36,7 +36,7 @@ cannot be applied to</td>
<td align="right" style="white-space:nowrap;">
<font color=red>
<b>
(jet.Int) &rarr; jet.Int</b>
(kotlin.Int) &rarr; kotlin.Int</b>
</font>
</td>
<td style="white-space:nowrap;">
idea/testData/diagnosticMessage/numberValueTypes1.html
+2 -2
View File
@@ -6,7 +6,7 @@ Type inference failed. Expected type mismatch: <table>
required: </td>
<td>
<b>
jet.Int</b>
kotlin.Int</b>
</td>
</tr>
<tr>
@@ -15,7 +15,7 @@ found: </td>
<td>
<font color=red>
<b>
jet.Long</b>
kotlin.Long</b>
</font>
</td>
</tr>
idea/testData/diagnosticMessage/numberValueTypes2.html
+2 -2
View File
@@ -6,7 +6,7 @@ Type inference failed. Expected type mismatch: <table>
required: </td>
<td>
<b>
jet.Byte</b>
kotlin.Byte</b>
</td>
</tr>
<tr>
@@ -15,7 +15,7 @@ found: </td>
<td>
<font color=red>
<b>
jet.Int</b>
kotlin.Int</b>
</font>
</td>
</tr>
idea/testData/diagnosticMessage/numberValueTypes3.html
+3 -3
View File
@@ -12,11 +12,11 @@ fun</b>
<td style="white-space:nowrap;font-weight:bold;">
(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
l: jet.List&lt;T&gt;</td>
l: kotlin.List&lt;T&gt;</td>
<td style="white-space:nowrap;font-weight:bold;">
)</td>
<td style="white-space:nowrap;font-weight:bold;">
: jet.Unit</td>
: kotlin.Unit</td>
</tr>
<tr>
<td colspan="7" style="white-space:nowrap;">
@@ -36,7 +36,7 @@ cannot be applied to</td>
<td align="right" style="white-space:nowrap;">
<font color=red>
<b>
jet.Int</b>
kotlin.Int</b>
</font>
</td>
<td style="white-space:nowrap;">
idea/testData/diagnosticMessage/numberValueTypes4.html
+8 -8
View File
@@ -16,11 +16,11 @@ fun</b>
<td align="right" style="white-space:nowrap;font-weight:bold;">
t: T,</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
l: jet.MutableList&lt;T&gt;</td>
l: kotlin.MutableList&lt;T&gt;</td>
<td style="white-space:nowrap;font-weight:bold;">
)</td>
<td style="white-space:nowrap;font-weight:bold;">
: jet.Unit</td>
: kotlin.Unit</td>
</tr>
<tr>
<td colspan="8" style="white-space:nowrap;">
@@ -40,14 +40,14 @@ None of the following substitutions</td>
<td align="right" style="white-space:nowrap;">
<font color=red>
<b>
jet.String</b>
kotlin.String</b>
</font>
<b>
,</b>
</td>
<td align="right" style="white-space:nowrap;">
<b>
jet.MutableList&lt;jet.String&gt;</b>
kotlin.MutableList&lt;kotlin.String&gt;</b>
</td>
<td style="white-space:nowrap;">
<b>
@@ -67,14 +67,14 @@ jet.MutableList&lt;jet.String&gt;</b>
</td>
<td align="right" style="white-space:nowrap;">
<b>
jet.Int</b>
kotlin.Int</b>
<b>
,</b>
</td>
<td align="right" style="white-space:nowrap;">
<font color=red>
<b>
jet.MutableList&lt;jet.Int&gt;</b>
kotlin.MutableList&lt;kotlin.Int&gt;</b>
</font>
</td>
<td style="white-space:nowrap;">
@@ -99,13 +99,13 @@ can be applied to</td>
</td>
<td align="right" style="white-space:nowrap;">
<b>
jet.Int</b>
kotlin.Int</b>
<b>
,</b>
</td>
<td align="right" style="white-space:nowrap;">
<b>
jet.MutableList&lt;jet.String&gt;</b>
kotlin.MutableList&lt;kotlin.String&gt;</b>
</td>
<td style="white-space:nowrap;">
<b>
idea/testData/diagnosticMessage/renderCollectionOfTypes1.txt
+1 -1
View File
@@ -1,2 +1,2 @@
<!-- renderCollectionOfTypes1 -->
Expected 2 parameters of types jet.List<jet.Int>, java.util.ArrayList<jet.String>
Expected 2 parameters of types kotlin.List<kotlin.Int>, java.util.ArrayList<kotlin.String>
idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch1.html
+2 -2
View File
@@ -6,7 +6,7 @@ Type inference failed. Expected type mismatch: <table>
required: </td>
<td>
<b>
jet.String</b>
kotlin.String</b>
</td>
</tr>
<tr>
@@ -15,7 +15,7 @@ found: </td>
<td>
<font color=red>
<b>
jet.Int</b>
kotlin.Int</b>
</font>
</td>
</tr>
idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch2.html
+2 -2
View File
@@ -6,7 +6,7 @@ Type inference failed. Expected type mismatch: <table>
required: </td>
<td>
<b>
jet.List&lt;jet.Int&gt;</b>
kotlin.List&lt;kotlin.Int&gt;</b>
</td>
</tr>
<tr>
@@ -15,7 +15,7 @@ found: </td>
<td>
<font color=red>
<b>
jet.Set&lt;jet.Int&gt;</b>
kotlin.Set&lt;kotlin.Int&gt;</b>
</font>
</td>
</tr>
idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch3.html
+2 -2
View File
@@ -6,7 +6,7 @@ Type inference failed. Expected type mismatch: <table>
required: </td>
<td>
<b>
jet.Set&lt;jet.String&gt;</b>
kotlin.Set&lt;kotlin.String&gt;</b>
</td>
</tr>
<tr>
@@ -15,7 +15,7 @@ found: </td>
<td>
<font color=red>
<b>
jet.Set&lt;jet.Int&gt;</b>
kotlin.Set&lt;kotlin.Int&gt;</b>
</font>
</td>
</tr>
idea/testData/diagnosticMessage/typeMismatchWithNothing1.html
+1 -1
View File
@@ -11,7 +11,7 @@ b.A&lt;???&gt;</td>
<td>
Found:</td>
<td>
jet.Nothing?</td>
kotlin.Nothing?</td>
</tr>
</table>
</html>
idea/testData/diagnosticMessage/upperBoundViolated1.txt
+2 -2
View File
@@ -1,3 +1,3 @@
<!-- upperBoundViolated1 -->
Type parameter bound for T in fun <R, T : jet.List<R>> foo(r: R, list: T): jet.Unit
is not satisfied: inferred type jet.Collection<jet.Int> is not a subtype of jet.List<jet.Int>
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>
idea/testData/diagnosticMessage/upperBoundViolated2.txt
+2 -2
View File
@@ -1,3 +1,3 @@
<!-- upperBoundViolated2 -->
Type parameter bound for V in fun <V : U, U> bar(v: V, u: jet.MutableSet<U>): jet.MutableSet<U>
is not satisfied: inferred type jet.Any is not a subtype of jet.String
Type parameter bound for V in fun <V : U, U> bar(v: V, u: kotlin.MutableSet<U>): kotlin.MutableSet<U>
is not satisfied: inferred type kotlin.Any is not a subtype of kotlin.String
idea/testData/diagnosticMessage/upperBoundViolated3.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<!-- upperBoundViolated3 -->
Type parameter bound for T in fun <T : R, R : i.B> baz(t: T, r: R): jet.Unit where T : i.A
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