diff --git a/idea/testData/diagnosticMessage/annotationsForResolve1.txt b/idea/testData/diagnosticMessage/annotationsForResolve1.txt index 9a22d7fcfcc..e664c47207c 100644 --- a/idea/testData/diagnosticMessage/annotationsForResolve1.txt +++ b/idea/testData/diagnosticMessage/annotationsForResolve1.txt @@ -1,2 +1,2 @@ -Type mismatch: inferred type is kotlin.String but kotlin.Int was expected \ No newline at end of file +Type mismatch: inferred type is String but Int was expected \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/cannotInferVisibility1.txt b/idea/testData/diagnosticMessage/cannotInferVisibility1.txt index 05920f8ccda..9ffd9b31fbf 100644 --- a/idea/testData/diagnosticMessage/cannotInferVisibility1.txt +++ b/idea/testData/diagnosticMessage/cannotInferVisibility1.txt @@ -1,2 +1,2 @@ -Cannot infer visibility for 'val foo: kotlin.String'. Please specify it explicitly \ No newline at end of file +Cannot infer visibility for 'val foo: String'. Please specify it explicitly \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/cannotOverrideInvisibleMember1.txt b/idea/testData/diagnosticMessage/cannotOverrideInvisibleMember1.txt index bad439cd1af..99cecd9e9b8 100644 --- a/idea/testData/diagnosticMessage/cannotOverrideInvisibleMember1.txt +++ b/idea/testData/diagnosticMessage/cannotOverrideInvisibleMember1.txt @@ -1,2 +1,2 @@ -'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 \ No newline at end of file +'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 \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/conflictingOverloadsClass1.html b/idea/testData/diagnosticMessage/conflictingOverloadsClass1.html index da51b028e10..a4f2dd22017 100644 --- a/idea/testData/diagnosticMessage/conflictingOverloadsClass1.html +++ b/idea/testData/diagnosticMessage/conflictingOverloadsClass1.html @@ -1,3 +1,3 @@ -'public final fun lol(x: kotlin.Int): kotlin.Int'
conflicts with another declaration in class 'conflictingOverloads' \ No newline at end of file +'public final fun lol(x: Int): Int'
conflicts with another declaration in class 'conflictingOverloads' \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/conflictingOverloadsClass2.html b/idea/testData/diagnosticMessage/conflictingOverloadsClass2.html index 7bb533b2ab5..3815c7db476 100644 --- a/idea/testData/diagnosticMessage/conflictingOverloadsClass2.html +++ b/idea/testData/diagnosticMessage/conflictingOverloadsClass2.html @@ -1,3 +1,3 @@ -'public final fun lol(y: kotlin.Int): kotlin.Int'
conflicts with another declaration in class 'conflictingOverloads' \ No newline at end of file +'public final fun lol(y: Int): Int'
conflicts with another declaration in class 'conflictingOverloads' \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt b/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt index b41855c1694..e0b856fa6a7 100644 --- a/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt +++ b/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt @@ -1,2 +1,2 @@ -'public fun foo(x: kotlin.Int): kotlin.Int' conflicts with another declaration in package '' \ No newline at end of file +'public fun foo(x: Int): Int' conflicts with another declaration in package '' \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt b/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt index 4f85235fbe7..80b26da5f89 100644 --- a/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt +++ b/idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt @@ -1,2 +1,2 @@ -'public fun foo(y: kotlin.Int): kotlin.Int' conflicts with another declaration in package '' \ No newline at end of file +'public fun foo(y: Int): Int' conflicts with another declaration in package '' \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/conflictingSubstitutions1.html b/idea/testData/diagnosticMessage/conflictingSubstitutions1.html index f8038e2adc1..de3d108f6ee 100644 --- a/idea/testData/diagnosticMessage/conflictingSubstitutions1.html +++ b/idea/testData/diagnosticMessage/conflictingSubstitutions1.html @@ -4,12 +4,12 @@ Type inference failed: Cannot infer type parameter T in - + - + @@ -19,8 +19,8 @@ Type inference failed: Cannot infer type parameter T in - - + + @@ -28,8 +28,8 @@ Type inference failed: Cannot infer type parameter T in - - + + @@ -40,8 +40,8 @@ Type inference failed: Cannot infer type parameter T in - - + +
fun <`T, E : kotlin.Cloneable> writeToMyListfun <`T, E : Cloneable> writeToMyList ( l: MyList<`in T>, t: T ): kotlin.Unit where E : java.io.Closeable: Unit where E : Closeable
None of the following substitutions (MyList<`in kotlin.Any>,kotlin.AnyMyList<`in Any>,Any )
(MyList<`in kotlin.Int>,kotlin.IntMyList<`in Int>,Int )
(MyList<`kotlin.Int>,kotlin.AnyMyList<`Int>,Any )
diff --git a/idea/testData/diagnosticMessage/conflictingSubstitutions2.html b/idea/testData/diagnosticMessage/conflictingSubstitutions2.html index 2032183caa6..afc7a791ad6 100644 --- a/idea/testData/diagnosticMessage/conflictingSubstitutions2.html +++ b/idea/testData/diagnosticMessage/conflictingSubstitutions2.html @@ -4,7 +4,7 @@ Type inference failed: Cannot infer type parameter T in - + @@ -19,8 +19,8 @@ Type inference failed: Cannot infer type parameter T in - - + + @@ -28,8 +28,8 @@ Type inference failed: Cannot infer type parameter T in - - + + @@ -40,8 +40,8 @@ Type inference failed: Cannot infer type parameter T in - - + +
constructor Cons<`T, E : kotlin.Cloneable>constructor Cons<`T, E : Cloneable> ( l: MyList<`in T>, t: T (MyList<`in kotlin.Any>,kotlin.AnyMyList<`in Any>,Any )
(MyList<`in kotlin.Int>,kotlin.IntMyList<`in Int>,Int )
(MyList<`kotlin.Int>,kotlin.AnyMyList<`Int>,Any )
diff --git a/idea/testData/diagnosticMessage/constructorsRedeclaration1.txt b/idea/testData/diagnosticMessage/constructorsRedeclaration1.txt index 461c8bfe26e..d2d48730976 100644 --- a/idea/testData/diagnosticMessage/constructorsRedeclaration1.txt +++ b/idea/testData/diagnosticMessage/constructorsRedeclaration1.txt @@ -1,2 +1,2 @@ -'public constructor Element(x: kotlin.String)' conflicts with another declaration in class 'Element' \ No newline at end of file +'public constructor Element(x: String)' conflicts with another declaration in class 'Element' \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/constructorsRedeclaration2.txt b/idea/testData/diagnosticMessage/constructorsRedeclaration2.txt index ddbfe553c9d..c51e54b0b59 100644 --- a/idea/testData/diagnosticMessage/constructorsRedeclaration2.txt +++ b/idea/testData/diagnosticMessage/constructorsRedeclaration2.txt @@ -1,2 +1,2 @@ -'public constructor Element(x: kotlin.String)' conflicts with another declaration in class 'Element' \ No newline at end of file +'public constructor Element(x: String)' conflicts with another declaration in class 'Element' \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt b/idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt index 88eb437c3f4..548a927e869 100644 --- a/idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt +++ b/idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt @@ -1,2 +1,2 @@ -'public fun Element(x: kotlin.String): kotlin.Unit' conflicts with another declaration in class 'Element' \ No newline at end of file +'public fun Element(x: String): Unit' conflicts with another declaration in class 'Element' \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel2.txt b/idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel2.txt index 53c625fdb97..b2c534364e5 100644 --- a/idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel2.txt +++ b/idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel2.txt @@ -1,2 +1,2 @@ -'public constructor Element(x: kotlin.String)' conflicts with another declaration in package '' \ No newline at end of file +'public constructor Element(x: String)' conflicts with another declaration in package '' \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/differentNamesForSameParameter1.txt b/idea/testData/diagnosticMessage/differentNamesForSameParameter1.txt index fe6aafc4e54..31ad6639896 100644 --- a/idea/testData/diagnosticMessage/differentNamesForSameParameter1.txt +++ b/idea/testData/diagnosticMessage/differentNamesForSameParameter1.txt @@ -1,2 +1,2 @@ -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. \ No newline at end of file +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. \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/expectedNothingDueToProjections1.txt b/idea/testData/diagnosticMessage/expectedNothingDueToProjections1.txt index 219a36dd9eb..e1d3eebc78a 100644 --- a/idea/testData/diagnosticMessage/expectedNothingDueToProjections1.txt +++ b/idea/testData/diagnosticMessage/expectedNothingDueToProjections1.txt @@ -1,2 +1,2 @@ -Out-projected type 'kotlin.collections.MutableCollection' prohibits the use of 'public abstract fun add(element: E): kotlin.Boolean defined in kotlin.collections.MutableCollection' \ No newline at end of file +Out-projected type 'MutableCollection' prohibits the use of 'public abstract fun add(element: E): Boolean defined in kotlin.collections.MutableCollection' \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/functionPlaceholder3.html b/idea/testData/diagnosticMessage/functionPlaceholder3.html index b3d58210157..74dccbbc138 100644 --- a/idea/testData/diagnosticMessage/functionPlaceholder3.html +++ b/idea/testData/diagnosticMessage/functionPlaceholder3.html @@ -18,7 +18,7 @@ Type inference failed: ( - (kotlin.Int) → kotlin.Int + (Int) → Int ) diff --git a/idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes1.txt b/idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes1.txt index f0861ff109d..65062f7a6a3 100644 --- a/idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes1.txt +++ b/idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes1.txt @@ -1,2 +1,2 @@ -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. \ No newline at end of file +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. \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/numberValueTypes1.html b/idea/testData/diagnosticMessage/numberValueTypes1.html index 4478c57bcf4..917ffee0462 100644 --- a/idea/testData/diagnosticMessage/numberValueTypes1.html +++ b/idea/testData/diagnosticMessage/numberValueTypes1.html @@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch: - + - +
required: kotlin.IntInt
found: kotlin.LongLong
\ No newline at end of file diff --git a/idea/testData/diagnosticMessage/numberValueTypes2.html b/idea/testData/diagnosticMessage/numberValueTypes2.html index 8c73c0e5a47..000138fe5f2 100644 --- a/idea/testData/diagnosticMessage/numberValueTypes2.html +++ b/idea/testData/diagnosticMessage/numberValueTypes2.html @@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch: - + - +
required: kotlin.ByteByte
found: kotlin.IntInt
\ No newline at end of file diff --git a/idea/testData/diagnosticMessage/numberValueTypes3.html b/idea/testData/diagnosticMessage/numberValueTypes3.html index ecfb204e642..98bf8ebb067 100644 --- a/idea/testData/diagnosticMessage/numberValueTypes3.html +++ b/idea/testData/diagnosticMessage/numberValueTypes3.html @@ -6,9 +6,9 @@ Type inference failed: fun <`T> foo ( - l: kotlin.collections.List<`T> + l: List<`T> ) - : kotlin.Unit + : Unit cannot be applied to @@ -18,7 +18,7 @@ Type inference failed: ( - kotlin.Int + Int ) diff --git a/idea/testData/diagnosticMessage/numberValueTypes4.html b/idea/testData/diagnosticMessage/numberValueTypes4.html index 9feec08ed74..4103b1391e2 100644 --- a/idea/testData/diagnosticMessage/numberValueTypes4.html +++ b/idea/testData/diagnosticMessage/numberValueTypes4.html @@ -7,9 +7,9 @@ Type inference failed: Cannot infer type parameter T in fun <`T> bar ( t: T, - l: kotlin.collections.MutableList<`T> + l: MutableList<`T> ) - : kotlin.Unit + : Unit None of the following substitutions @@ -19,8 +19,8 @@ Type inference failed: Cannot infer type parameter T in ( - kotlin.String, - kotlin.collections.MutableList<`kotlin.String> + String, + MutableList<`String> ) @@ -28,8 +28,8 @@ Type inference failed: Cannot infer type parameter T in ( - kotlin.Int, - kotlin.collections.MutableList<`kotlin.Int> + Int, + MutableList<`Int> ) @@ -40,8 +40,8 @@ Type inference failed: Cannot infer type parameter T in ( - kotlin.Int, - kotlin.collections.MutableList<`kotlin.String> + Int, + MutableList<`String> ) diff --git a/idea/testData/diagnosticMessage/renderCollectionOfTypes1.txt b/idea/testData/diagnosticMessage/renderCollectionOfTypes1.txt index 99ef6254720..7805a387491 100644 --- a/idea/testData/diagnosticMessage/renderCollectionOfTypes1.txt +++ b/idea/testData/diagnosticMessage/renderCollectionOfTypes1.txt @@ -1,2 +1,2 @@ -Expected 2 parameters of types kotlin.collections.List, java.util.ArrayList \ No newline at end of file +Expected 2 parameters of types List, ArrayList \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch1.html b/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch1.html index 58ee0551803..392ee5e670d 100644 --- a/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch1.html +++ b/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch1.html @@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch: - + - +
required: kotlin.StringString
found: kotlin.IntInt
\ No newline at end of file diff --git a/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch2.html b/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch2.html index f00aadf7b3b..b398034210a 100644 --- a/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch2.html +++ b/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch2.html @@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch: - + - +
required: kotlin.collections.List<`kotlin.Int>List<`Int>
found: kotlin.collections.Set<`kotlin.Int>Set<`Int>
\ No newline at end of file diff --git a/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch3.html b/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch3.html index 2e6f413152c..b1771930d28 100644 --- a/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch3.html +++ b/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch3.html @@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch: - + - +
required: kotlin.collections.Set<`kotlin.String>Set<`String>
found: kotlin.collections.Set<`kotlin.Int>Set<`Int>
\ No newline at end of file diff --git a/idea/testData/diagnosticMessage/typeMismatchDueToProjections1.html b/idea/testData/diagnosticMessage/typeMismatchDueToProjections1.html index 2f0847b3cc9..7bd6908b19d 100644 --- a/idea/testData/diagnosticMessage/typeMismatchDueToProjections1.html +++ b/idea/testData/diagnosticMessage/typeMismatchDueToProjections1.html @@ -4,14 +4,14 @@ Type mismatch. - + - +
Required:kotlin.collections.Collection<`kotlin.Nothing>Collection<`Nothing>
Found:kotlin.collections.MutableCollection<`kotlin.CharSequence>MutableCollection<`CharSequence>

-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 +Projected type MutableCollection<`out CharSequence> restricts use of
+public abstract fun addAll(elements: Collection<`E>): Boolean defined in kotlin.collections.MutableCollection \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsIn1.html b/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsIn1.html index 7484ec1016a..91e83f282ea 100644 --- a/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsIn1.html +++ b/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsIn1.html @@ -4,14 +4,14 @@ Type mismatch. - + - +
Required:A<`kotlin.Any?>A<`Any?>
Found:A<`kotlin.CharSequence>A<`CharSequence>

-Projected type B<`in kotlin.CharSequence> restricts use of
-public abstract fun foo(x: A<`in E>): kotlin.Unit defined in B +Projected type B<`in CharSequence> restricts use of
+public abstract fun foo(x: A<`in E>): Unit defined in B \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt1.txt b/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt1.txt index 59c1186b914..cc12f44af82 100644 --- a/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt1.txt +++ b/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt1.txt @@ -1,2 +1,2 @@ -Type mismatch: inferred type is kotlin.collections.MutableCollection but kotlin.collections.Collection was expected. Projected type kotlin.collections.MutableCollection restricts use of public abstract fun addAll(elements: kotlin.collections.Collection): kotlin.Boolean defined in kotlin.collections.MutableCollection \ No newline at end of file +Type mismatch: inferred type is MutableCollection but Collection was expected. Projected type MutableCollection restricts use of public abstract fun addAll(elements: Collection): Boolean defined in kotlin.collections.MutableCollection \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/typeMismatchWithNothing1.html b/idea/testData/diagnosticMessage/typeMismatchWithNothing1.html index 430b7e274e7..699d1c940c7 100644 --- a/idea/testData/diagnosticMessage/typeMismatchWithNothing1.html +++ b/idea/testData/diagnosticMessage/typeMismatchWithNothing1.html @@ -4,11 +4,11 @@ Type mismatch. - + - +
Required:b.A<`???>A<`???>
Found:kotlin.Nothing?Nothing?
\ No newline at end of file diff --git a/idea/testData/diagnosticMessage/unusedValue1.txt b/idea/testData/diagnosticMessage/unusedValue1.txt index 8c627462571..a225f7ad885 100644 --- a/idea/testData/diagnosticMessage/unusedValue1.txt +++ b/idea/testData/diagnosticMessage/unusedValue1.txt @@ -1,2 +1,2 @@ -The value '239' assigned to 'var x: kotlin.Int defined in unusedValue' is never used \ No newline at end of file +The value '239' assigned to 'var x: Int defined in unusedValue' is never used \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/upperBoundViolated1.txt b/idea/testData/diagnosticMessage/upperBoundViolated1.txt index 16d2d946901..3e223776524 100644 --- a/idea/testData/diagnosticMessage/upperBoundViolated1.txt +++ b/idea/testData/diagnosticMessage/upperBoundViolated1.txt @@ -1,3 +1,3 @@ -Type parameter bound for T in fun > foo(r: R, list: T): kotlin.Unit - is not satisfied: inferred type kotlin.collections.Collection is not a subtype of kotlin.collections.List \ No newline at end of file +Type parameter bound for T in fun > foo(r: R, list: T): Unit + is not satisfied: inferred type Collection is not a subtype of List \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/upperBoundViolated2.txt b/idea/testData/diagnosticMessage/upperBoundViolated2.txt index 7dd5946ba0e..b50de2670ca 100644 --- a/idea/testData/diagnosticMessage/upperBoundViolated2.txt +++ b/idea/testData/diagnosticMessage/upperBoundViolated2.txt @@ -1,3 +1,3 @@ -Type parameter bound for V in fun bar(v: V, u: kotlin.collections.MutableSet): kotlin.collections.MutableSet - is not satisfied: inferred type kotlin.Any is not a subtype of kotlin.String \ No newline at end of file +Type parameter bound for V in fun bar(v: V, u: MutableSet): MutableSet + is not satisfied: inferred type Any is not a subtype of String \ No newline at end of file diff --git a/idea/testData/diagnosticMessage/upperBoundViolated3.txt b/idea/testData/diagnosticMessage/upperBoundViolated3.txt index 579f66bf74d..f9c5aa2d91d 100644 --- a/idea/testData/diagnosticMessage/upperBoundViolated3.txt +++ b/idea/testData/diagnosticMessage/upperBoundViolated3.txt @@ -1,3 +1,3 @@ -Type parameter bound for T in fun 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 \ No newline at end of file +Type parameter bound for T in fun baz(t: T, r: R): Unit where T : A + is not satisfied: inferred type A is not a subtype of B \ No newline at end of file