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/addImport/ImportNestedClass.kt
Vendored
+1 -1
View File
@@ -1 +1 @@
// IMPORT: kotlin.Map.Entry
// IMPORT: kotlin.collections.Map.Entry
idea/testData/addImport/ImportNestedClass.kt.after
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
import kotlin.Map.Entry
import kotlin.collections.Map.Entry
// IMPORT: kotlin.Map.Entry
// IMPORT: kotlin.collections.Map.Entry
idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt
Vendored
+4 -4
View File
@@ -1,8 +1,8 @@
interface T {
<error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (foo(Ljava/util/List;)V):
fun foo(l: kotlin.List<kotlin.Int>): kotlin.Unit
fun foo(l: kotlin.List<kotlin.String>): kotlin.Unit">fun foo(l: List<String>)</error> {}
fun foo(l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
fun foo(l: kotlin.collections.List<kotlin.String>): kotlin.Unit">fun foo(l: List<String>)</error> {}
<error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (foo(Ljava/util/List;)V):
fun foo(l: kotlin.List<kotlin.Int>): kotlin.Unit
fun foo(l: kotlin.List<kotlin.String>): kotlin.Unit">fun foo(l: List<Int>)</error> {}
fun foo(l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
fun foo(l: kotlin.collections.List<kotlin.String>): kotlin.Unit">fun foo(l: List<Int>)</error> {}
}
idea/testData/decompiler/builtIns/Int.stubs
Vendored
+12 -4
View File
@@ -529,7 +529,9 @@ PsiJetFileStubImpl[package=kotlin]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=ranges]
REFERENCE_EXPRESSION:[referencedName=IntRange]
FUN:[fqName=kotlin.Int.rangeTo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=rangeTo]
MODIFIER_LIST:[public final operator]
@@ -543,7 +545,9 @@ PsiJetFileStubImpl[package=kotlin]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=ranges]
REFERENCE_EXPRESSION:[referencedName=IntRange]
FUN:[fqName=kotlin.Int.rangeTo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=rangeTo]
MODIFIER_LIST:[public final operator]
@@ -557,7 +561,9 @@ PsiJetFileStubImpl[package=kotlin]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=ranges]
REFERENCE_EXPRESSION:[referencedName=LongRange]
FUN:[fqName=kotlin.Int.rangeTo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=rangeTo]
MODIFIER_LIST:[public final operator]
@@ -571,7 +577,9 @@ PsiJetFileStubImpl[package=kotlin]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=ranges]
REFERENCE_EXPRESSION:[referencedName=IntRange]
FUN:[fqName=kotlin.Int.shl, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=shl]
MODIFIER_LIST:[public final infix]
idea/testData/decompiler/builtIns/Int.text
Vendored
+4 -4
View File
@@ -80,13 +80,13 @@ public final class Int private constructor() : kotlin.Number, kotlin.Comparable<
public final operator fun plus(other: kotlin.Short): kotlin.Int { /* compiled code */ }
public final operator fun rangeTo(other: kotlin.Byte): kotlin.IntRange { /* compiled code */ }
public final operator fun rangeTo(other: kotlin.Byte): kotlin.ranges.IntRange { /* compiled code */ }
public final operator fun rangeTo(other: kotlin.Int): kotlin.IntRange { /* compiled code */ }
public final operator fun rangeTo(other: kotlin.Int): kotlin.ranges.IntRange { /* compiled code */ }
public final operator fun rangeTo(other: kotlin.Long): kotlin.LongRange { /* compiled code */ }
public final operator fun rangeTo(other: kotlin.Long): kotlin.ranges.LongRange { /* compiled code */ }
public final operator fun rangeTo(other: kotlin.Short): kotlin.IntRange { /* compiled code */ }
public final operator fun rangeTo(other: kotlin.Short): kotlin.ranges.IntRange { /* compiled code */ }
public final infix fun shl(bitCount: kotlin.Int): kotlin.Int { /* compiled code */ }
idea/testData/decompiler/decompiledText/FlexibleTypes.expected.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ package test
public abstract class FlexibleTypes public constructor() {
public abstract val p: kotlin.Int /* platform type */
public abstract fun collection(): kotlin.List<kotlin.Int> /* platform type */
public abstract fun collection(): kotlin.collections.List<kotlin.Int> /* platform type */
public final fun withBody(): kotlin.Int /* platform type */ { /* compiled code */ }
}
idea/testData/decompiler/decompiledText/FunctionTypes.expected.kt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ public final class FunctionTypes public constructor() {
public final fun f3(f: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit { /* compiled code */ }
public final fun f4(f: kotlin.List<@kotlin.ExtensionFunctionType kotlin.Function1<*, *>>): kotlin.Unit { /* compiled code */ }
public final fun f4(f: kotlin.collections.List<@kotlin.ExtensionFunctionType kotlin.Function1<*, *>>): kotlin.Unit { /* compiled code */ }
public final fun <A> (A.(A) -> A)?.bar(): kotlin.Unit { /* compiled code */ }
idea/testData/decompiler/decompiledText/SimpleClass.expected.kt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@
package test
public abstract class SimpleClass public constructor() : dependency.D<dependency.Tr, kotlin.Int>, dependency.Tr, kotlin.List<kotlin.String> {
public abstract class SimpleClass public constructor() : dependency.D<dependency.Tr, kotlin.Int>, dependency.Tr, kotlin.collections.List<kotlin.String> {
public final val a: dependency.A /* compiled code */
public final var b: dependency.B /* compiled code */
@@ -14,7 +14,7 @@ public abstract class SimpleClass public constructor() : dependency.D<dependency
public final fun f(): kotlin.Unit { /* compiled code */ }
public final fun g(d: dependency.D<kotlin.String, dependency.Tr>): kotlin.List<dependency.D<dependency.A, kotlin.Int>> { /* compiled code */ }
public final fun g(d: dependency.D<kotlin.String, dependency.Tr>): kotlin.collections.List<dependency.D<dependency.A, kotlin.Int>> { /* compiled code */ }
private final fun privateFun(): kotlin.Unit { /* compiled code */ }
idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt
Vendored
+3 -1
View File
@@ -19,7 +19,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=MutableCollection]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
Vendored
+3 -1
View File
@@ -168,7 +168,9 @@ PsiJetFileStubImpl[package=]
REFERENCE_EXPRESSION:[referencedName=b]
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=ranges]
REFERENCE_EXPRESSION:[referencedName=LongRange]
TYPE_REFERENCE:
ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a]
idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt
Vendored
+3 -1
View File
@@ -21,7 +21,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=List]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt
Vendored
+3 -1
View File
@@ -40,7 +40,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=List]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
Vendored
+6 -2
View File
@@ -208,7 +208,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=List]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
@@ -219,7 +221,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=Map]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
idea/testData/decompiler/stubBuilder/Types/Types.txt
Vendored
+33 -11
View File
@@ -45,7 +45,9 @@ PsiJetFileStubImpl[package=test]
NULLABLE_TYPE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=List]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
@@ -91,7 +93,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=List]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
@@ -129,7 +133,9 @@ PsiJetFileStubImpl[package=test]
NULLABLE_TYPE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=List]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
@@ -165,7 +171,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=List]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
@@ -219,7 +227,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=List]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
@@ -233,7 +243,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=List]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
@@ -247,7 +259,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=List]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
@@ -271,7 +285,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=Map]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
@@ -300,7 +316,9 @@ PsiJetFileStubImpl[package=test]
NULLABLE_TYPE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=Map]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=NONE]
@@ -322,7 +340,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=Map]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=IN]
@@ -354,7 +374,9 @@ PsiJetFileStubImpl[package=test]
TYPE_REFERENCE:
USER_TYPE:[isAbsoluteInRootPackage=false]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
USER_TYPE:[isAbsoluteInRootPackage=false]
REFERENCE_EXPRESSION:[referencedName=kotlin]
REFERENCE_EXPRESSION:[referencedName=collections]
REFERENCE_EXPRESSION:[referencedName=List]
TYPE_ARGUMENT_LIST:
TYPE_PROJECTION:[projectionKind=STAR]
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
idea/testData/quickfix/addStarProjections/qualifiedList.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Add '<*>'" "true"
public fun foo(a: Any) {
a is kotlin.List<caret>
a is kotlin.collections.List<caret>
}
idea/testData/quickfix/addStarProjections/qualifiedList.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Add '<*>'" "true"
public fun foo(a: Any) {
a is kotlin.List<*>
a is kotlin.collections.List<*>
}
idea/testData/quickfix/addStarProjections/qualifiedMap.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Add '<*, *>'" "true"
public fun foo(a: Any) {
a is kotlin.Map<caret>
a is kotlin.collections.Map<caret>
}
idea/testData/quickfix/addStarProjections/qualifiedMap.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// "Add '<*, *>'" "true"
public fun foo(a: Any) {
a is kotlin.Map<*, *>
a is kotlin.collections.Map<*, *>
}
idea/testData/quickfix/addStarProjections/when/qualifiedList.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// "Add '<*>'" "true"
public fun foo(a: Any) {
when (a) {
is kotlin.List<caret> -> {}
is kotlin.collections.List<caret> -> {}
else -> {}
}
}
idea/testData/quickfix/addStarProjections/when/qualifiedList.kt.after
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// "Add '<*>'" "true"
public fun foo(a: Any) {
when (a) {
is kotlin.List<*> -> {}
is kotlin.collections.List<*> -> {}
else -> {}
}
}
idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// "Add '<*, *>'" "true"
public fun foo(a: Any) {
when (a) {
is kotlin.Map<caret> -> {}
is kotlin.collections.Map<caret> -> {}
else -> {}
}
}
idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt.after
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// "Add '<*, *>'" "true"
public fun foo(a: Any) {
when (a) {
is kotlin.Map<*, *> -> {}
is kotlin.collections.Map<*, *> -> {}
else -> {}
}
}
idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.after.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "Cast expression 'x' to 'List<Any>?'" "true"
// ERROR: Java type mismatch expected kotlin.(Mutable)List<kotlin.Any!>! but found kotlin.MutableList<kotlin.String>. Use explicit cast
// ERROR: Java type mismatch expected kotlin.collections.(Mutable)List<kotlin.Any!>! but found kotlin.collections.MutableList<kotlin.String>. Use explicit cast
fun main(x: MutableList<String>) {
A.foo(x as List<Any>?)
idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.before.Main.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// "Cast expression 'x' to 'List<Any>?'" "true"
// ERROR: Java type mismatch expected kotlin.(Mutable)List<kotlin.Any!>! but found kotlin.MutableList<kotlin.String>. Use explicit cast
// ERROR: Java type mismatch expected kotlin.collections.(Mutable)List<kotlin.Any!>! but found kotlin.collections.MutableList<kotlin.String>. Use explicit cast
fun main(x: MutableList<String>) {
A.foo(<caret>x)
idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// WITH_RUNTIME
// SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean
// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> defined in test.<anonymous>
// PARAM_TYPES: kotlin.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)>
// PARAM_DESCRIPTOR: value-parameter val it: kotlin.collections.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> defined in test.<anonymous>
// PARAM_TYPES: kotlin.collections.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)>
fun test() {
J.getMap().filter { <selection>it.getKey()</selection> }
}
idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// WITH_RUNTIME
// SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean
// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> defined in test.<anonymous>
// PARAM_TYPES: kotlin.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)>
// PARAM_DESCRIPTOR: value-parameter val it: kotlin.collections.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> defined in test.<anonymous>
// PARAM_TYPES: kotlin.collections.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)>
fun test() {
J.getMap().filter { b(it) }
}
idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
// WITH_RUNTIME
// PARAM_DESCRIPTOR: val data: (kotlin.MutableList<(kotlin.String..kotlin.String?)>..kotlin.List<(kotlin.String..kotlin.String?)>) defined in test
// PARAM_TYPES: kotlin.List<(kotlin.String..kotlin.String?)>, kotlin.MutableList<(kotlin.String..kotlin.String?)>, kotlin.MutableCollection<(kotlin.String..kotlin.String?)>, kotlin.Collection<(kotlin.String..kotlin.String?)>
// PARAM_DESCRIPTOR: val data: (kotlin.collections.MutableList<(kotlin.String..kotlin.String?)>..kotlin.collections.List<(kotlin.String..kotlin.String?)>) defined in test
// PARAM_TYPES: kotlin.collections.List<(kotlin.String..kotlin.String?)>, kotlin.collections.MutableList<(kotlin.String..kotlin.String?)>, kotlin.collections.MutableCollection<(kotlin.String..kotlin.String?)>, kotlin.collections.Collection<(kotlin.String..kotlin.String?)>
fun test(): Boolean {
val j: J? = null
val data = j?.getData() ?: return false
idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt.after
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
// WITH_RUNTIME
// PARAM_DESCRIPTOR: val data: (kotlin.MutableList<(kotlin.String..kotlin.String?)>..kotlin.List<(kotlin.String..kotlin.String?)>) defined in test
// PARAM_TYPES: kotlin.List<(kotlin.String..kotlin.String?)>, kotlin.MutableList<(kotlin.String..kotlin.String?)>, kotlin.MutableCollection<(kotlin.String..kotlin.String?)>, kotlin.Collection<(kotlin.String..kotlin.String?)>
// PARAM_DESCRIPTOR: val data: (kotlin.collections.MutableList<(kotlin.String..kotlin.String?)>..kotlin.collections.List<(kotlin.String..kotlin.String?)>) defined in test
// PARAM_TYPES: kotlin.collections.List<(kotlin.String..kotlin.String?)>, kotlin.collections.MutableList<(kotlin.String..kotlin.String?)>, kotlin.collections.MutableCollection<(kotlin.String..kotlin.String?)>, kotlin.collections.Collection<(kotlin.String..kotlin.String?)>
fun test(): Boolean {
val j: J? = null
val data = j?.getData() ?: return false
idea/testData/resolve/builtins/emptyRange.kt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
val empty = IntRange.<caret>EMPTY
// BINARY: kotlin/IntRange.class
// BINARY: ranges/IntRange.class
// SRC: kotlin/Ranges.kt
// TARGET: (in kotlin.IntRange.Companion).EMPTY
// TARGET: (in kotlin.ranges.IntRange.Companion).EMPTY
idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
Resolve target: value-parameter val c: kotlin.Collection<kotlin.String>
Resolve target: value-parameter val c: kotlin.collections.Collection<kotlin.String>
----------------------------------------------
fun foo(c: Collection<String>): Collection<String> {
return <caret>c.filter {
idea/testData/resolve/referenceWithLib/multiDeclarationWithTypeParameters.kt
Vendored
+3 -3
View File
@@ -7,7 +7,7 @@ fun <Int> f(l: List<Int>) {
}
// MULTIRESOLVE
// REF: (for kotlin.List<T> in dependency).component1()
// REF: (for kotlin.List<T> in dependency).component2()
// REF: (for kotlin.List<T> in dependency).component3()
// REF: (for kotlin.collections.List<T> in dependency).component1()
// REF: (for kotlin.collections.List<T> in dependency).component2()
// REF: (for kotlin.collections.List<T> in dependency).component3()
idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ fun foo(a: List<Int>) {
a[<caret>"bar"] = 3
}
// REF: (for kotlin.List<T> in dependency).set(kotlin.String, T)
// REF: (for kotlin.collections.List<T> in dependency).set(kotlin.String, T)
idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt
Vendored
+3 -3
View File
@@ -3,6 +3,6 @@ fun main(it: Iterator<Any>) {
}
// MULTIRESOLVE
// REF: (for kotlin.Iterator<T> in kotlin.collections).iterator()
// REF: (in kotlin.Iterator).hasNext()
// REF: (in kotlin.Iterator).next()
// REF: (for kotlin.collections.Iterator<T> in kotlin.collections).iterator()
// REF: (in kotlin.collections.Iterator).hasNext()
// REF: (in kotlin.collections.Iterator).next()
idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt
Vendored
+3 -3
View File
@@ -3,6 +3,6 @@ fun main() {
}
// MULTIRESOLVE
// REF: (in kotlin.IntIterator).next()
// REF: (in kotlin.IntProgression).iterator()
// REF: (in kotlin.Iterator).hasNext()
// REF: (in kotlin.collections.IntIterator).next()
// REF: (in kotlin.ranges.IntProgression).iterator()
// REF: (in kotlin.collections.Iterator).hasNext()
idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt
Vendored
+2 -2
View File
@@ -4,5 +4,5 @@ fun main() {
// MULTIRESOLVE
// REF: (for kotlin.CharSequence in kotlin.text).iterator()
// REF: (in kotlin.CharIterator).next()
// REF: (in kotlin.Iterator).hasNext()
// REF: (in kotlin.collections.CharIterator).next()
// REF: (in kotlin.collections.Iterator).hasNext()
idea/testData/shortenRefs/type/GenericType3.kt
Vendored
+1 -1
View File
@@ -1 +1 @@
val x: <selection>kotlin.Map.Entry<kotlin.Array<kotlin.String>, java.sql.Array></selection>
val x: <selection>kotlin.collections.Map.Entry<kotlin.Array<kotlin.String>, java.sql.Array></selection>
idea/testData/unifier/equivalence/types/userTypeRuntime.kt
Vendored
+1 -1
View File
@@ -5,4 +5,4 @@ val b: MutableMap<String, MutableList<Any>> = HashMap()
val c: Map<Any, MutableList<Any>> = HashMap()
val d: Map<String, List<Any>> = HashMap()
val e: Map<String, MutableList<Any?>> = HashMap()
val f: kotlin.Map<String, MutableList<kotlin.Any>> = HashMap()
val f: kotlin.collections.Map<String, MutableList<kotlin.Any>> = HashMap()
idea/testData/unifier/equivalence/types/userTypeRuntime.kt.match
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
Map<String, MutableList<Any>>
kotlin.Map<String, MutableList<kotlin.Any>>
kotlin.collections.Map<String, MutableList<kotlin.Any>>