diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.descriptors.txt index 252102ad3b2..a5e85d1c57c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/withTestCompilerPluginEnabled/myInterfaceSupertype.descriptors.txt @@ -1,6 +1,6 @@ KtNamedClassOrObjectSymbol: annotationsList: [ - () + () psi: KtAnnotationEntry ] classIdIfNonLocal: foo/MyClass diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/withTestCompilerPluginEnabled/generatedCompanionWorksAsValue.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByReference/withTestCompilerPluginEnabled/generatedCompanionWorksAsValue.descriptors.txt index f34dd44deae..adb9e9aa59b 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/withTestCompilerPluginEnabled/generatedCompanionWorksAsValue.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/withTestCompilerPluginEnabled/generatedCompanionWorksAsValue.descriptors.txt @@ -1,6 +1,6 @@ KtNamedClassOrObjectSymbol: annotationsList: [ - () + () psi: KtAnnotationEntry ] classIdIfNonLocal: test/WithGeneratedCompanion diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt index 8e59c2451d0..e06cf486a71 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DoubleColonExpressionResolver.kt @@ -129,7 +129,7 @@ class DoubleColonExpressionResolver( } } - return createTypeInfo(ErrorUtils.createErrorType(ErrorTypeKind.UNRESOLVED_CLASS_TYPE, expression.toString()), c) + return createTypeInfo(ErrorUtils.createErrorType(ErrorTypeKind.UNRESOLVED_CLASS_TYPE, expression.text), c) } private fun checkClassLiteral( diff --git a/compiler/testData/cfg/controlStructures/incorrectIndex_After.values b/compiler/testData/cfg/controlStructures/incorrectIndex_After.values index 3b4f959587e..879e95b0a23 100644 --- a/compiler/testData/cfg/controlStructures/incorrectIndex_After.values +++ b/compiler/testData/cfg/controlStructures/incorrectIndex_After.values @@ -2,7 +2,7 @@ val s = mutableListOf() --------------------- mutableListOf !: * -mutableListOf() : {<: [ERROR : Type for mutableListOf()]} NEW: magic[UNRESOLVED_CALL](mutableListOf()|!) -> +mutableListOf() : {<: [Error type: Not found recorded type for mutableListOf()]} NEW: magic[UNRESOLVED_CALL](mutableListOf()|!) -> ===================== == test == fun test(name: String?, flag: Boolean): Boolean { diff --git a/compiler/testData/cfg/controlStructures/incorrectIndex_Before.values b/compiler/testData/cfg/controlStructures/incorrectIndex_Before.values index a462144125d..86a9f3acadf 100644 --- a/compiler/testData/cfg/controlStructures/incorrectIndex_Before.values +++ b/compiler/testData/cfg/controlStructures/incorrectIndex_Before.values @@ -2,7 +2,7 @@ val s = mutableListOf() --------------------- mutableListOf !: * -mutableListOf() : {<: [ERROR : Type for mutableListOf()]} NEW: magic[UNRESOLVED_CALL](mutableListOf()|!) -> +mutableListOf() : {<: [Error type: Not found recorded type for mutableListOf()]} NEW: magic[UNRESOLVED_CALL](mutableListOf()|!) -> ===================== == test == fun test(name: String?, flag: Boolean): Boolean { diff --git a/compiler/testData/cfg/declarations/classesAndObjects/QualifierReceiverWithOthers.values b/compiler/testData/cfg/declarations/classesAndObjects/QualifierReceiverWithOthers.values index 62e52d58306..34fb7960ce4 100644 --- a/compiler/testData/cfg/declarations/classesAndObjects/QualifierReceiverWithOthers.values +++ b/compiler/testData/cfg/declarations/classesAndObjects/QualifierReceiverWithOthers.values @@ -24,8 +24,8 @@ object C { operator fun X.invoke() = println("Hello!") --------------------- println !: * -"Hello!" : * NEW: r("Hello!") -> -println("Hello!") : {<: [ERROR : Error function type]} NEW: magic[UNRESOLVED_CALL](println("Hello!")|, !) -> +"Hello!" : * NEW: r("Hello!") -> +println("Hello!") : {<: [Error type: Return type for function cannot be resolved]} NEW: magic[UNRESOLVED_CALL](println("Hello!")|, !) -> ===================== == with == inline fun with(receiver: T, block: T.() -> R): R = receiver.block() @@ -44,9 +44,9 @@ fun use() = with(C) { } } --------------------- -C : C NEW: r(C) -> -{ with(B) { A.foo() } } : {<: C.() -> ???} NEW: r({ with(B) { A.foo() } }) -> -with(C) { with(B) { A.foo() } } : {<: [ERROR : Error function type]} NEW: call(with(C) { with(B) { A.foo() } }, with|, ) -> +C : C NEW: r(C) -> +{ with(B) { A.foo() } } : {<: C.() -> ???} NEW: r({ with(B) { A.foo() } }) -> +with(C) { with(B) { A.foo() } } : {<: [Error type: Return type for function cannot be resolved]} NEW: call(with(C) { with(B) { A.foo() } }, with|, ) -> ===================== == anonymous_0 == { diff --git a/compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.values b/compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.values index a06dbc1af66..f17a5886382 100644 --- a/compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.values +++ b/compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.values @@ -4,10 +4,10 @@ fun foo(x: Int) { a } --------------------- - : Int NEW: magic[FAKE_INITIALIZER](x: Int) -> - : {<: [ERROR : component1() return type]} NEW: magic[UNRESOLVED_CALL](a|) -> - : {<: [ERROR : component2() return type]} NEW: magic[UNRESOLVED_CALL](b|) -> -x : * NEW: r(x) -> -a : * NEW: r(a) -> -{ val (a, b) = x a } : * COPY + : Int NEW: magic[FAKE_INITIALIZER](x: Int) -> + : {<: [Error type: component1() return type]} NEW: magic[UNRESOLVED_CALL](a|) -> + : {<: [Error type: component2() return type]} NEW: magic[UNRESOLVED_CALL](b|) -> +x : * NEW: r(x) -> +a : * NEW: r(a) -> +{ val (a, b) = x a } : * COPY ===================== diff --git a/compiler/testData/cfg/expressions/assignmentToThis.values b/compiler/testData/cfg/expressions/assignmentToThis.values index 491d3789f6e..b445016a221 100644 --- a/compiler/testData/cfg/expressions/assignmentToThis.values +++ b/compiler/testData/cfg/expressions/assignmentToThis.values @@ -3,11 +3,11 @@ fun Int.bar(c: C) { this = c } --------------------- - : {<: [ERROR : C]} NEW: magic[FAKE_INITIALIZER](c: C) -> - : * NEW: magic[VALUE_CONSUMER](this|) -> -this : * COPY -this : * NEW: r(this, ) -> -c : * NEW: r(c) -> + : {<: [Error type: Unresolved type for C]} NEW: magic[FAKE_INITIALIZER](c: C) -> + : * NEW: magic[VALUE_CONSUMER](this|) -> +this : * COPY +this : * NEW: r(this, ) -> +c : * NEW: r(c) -> this = c !: * -{ this = c } !: * COPY +{ this = c } !: * COPY ===================== diff --git a/compiler/testData/diagnostics/nativeTests/throws.txt b/compiler/testData/diagnostics/nativeTests/throws.txt index 23712ebc0c7..c3679369f3b 100644 --- a/compiler/testData/diagnostics/nativeTests/throws.txt +++ b/compiler/testData/diagnostics/nativeTests/throws.txt @@ -433,7 +433,7 @@ public typealias ExceptionAlias = kotlin.Exception public typealias IllegalStateExceptionAlias = kotlin.IllegalStateException public typealias RuntimeExceptionAlias = kotlin.RuntimeException public typealias ThrowableAlias = kotlin.Throwable -public typealias UEAlias = [ERROR : UE] +public typealias UEAlias = [Error type: Unresolved type for UE] package kotlin { diff --git a/compiler/testData/diagnostics/tests/DeferredTypes.ni.txt b/compiler/testData/diagnostics/tests/DeferredTypes.ni.txt index 50ba3ee2313..aecef605966 100644 --- a/compiler/testData/diagnostics/tests/DeferredTypes.ni.txt +++ b/compiler/testData/diagnostics/tests/DeferredTypes.ni.txt @@ -1,7 +1,7 @@ package public interface T { - public open val a: [ERROR : ] + public open val a: [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/DeprecatedGetSetPropertyDelegateConvention.txt b/compiler/testData/diagnostics/tests/DeprecatedGetSetPropertyDelegateConvention.txt index f77c3760afd..c1626e7b9f5 100644 --- a/compiler/testData/diagnostics/tests/DeprecatedGetSetPropertyDelegateConvention.txt +++ b/compiler/testData/diagnostics/tests/DeprecatedGetSetPropertyDelegateConvention.txt @@ -36,8 +36,8 @@ public final class CustomDelegate3 { public final class Example { public constructor Example() - public final var a: [ERROR : Type from delegate] - public final val aval: [ERROR : Type from delegate] + public final var a: [Error type: Error delegation type for CustomDelegate()] + public final val aval: [Error type: Error delegation type for CustomDelegate()] public final var b: kotlin.String public final var c: kotlin.Int public final var d: kotlin.Int diff --git a/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt b/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt index 7f9dee61e5e..2c21f6de1e6 100644 --- a/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt +++ b/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.txt @@ -3,10 +3,10 @@ package public val bar: (???) -> kotlin.Unit public val la: (???) -> kotlin.Unit public val las: (kotlin.Int) -> kotlin.Unit -public fun test(/*0*/ a: [ERROR : Type annotation was missing for parameter a], /*1*/ b: [ERROR : Type annotation was missing for parameter b], /*2*/ c: [ERROR : Type annotation was missing for parameter c]): kotlin.Unit +public fun test(/*0*/ a: [Error type: Missed a type for a value parameter a], /*1*/ b: [Error type: Missed a type for a value parameter b], /*2*/ c: [Error type: Missed a type for a value parameter c]): kotlin.Unit public final class A { - public constructor A(/*0*/ a: [ERROR : Type annotation was missing for parameter a]) + public constructor A(/*0*/ a: [Error type: Missed a type for a value parameter a]) public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/FunctionReturnTypes.txt b/compiler/testData/diagnostics/tests/FunctionReturnTypes.txt index 593c4142647..5af51a4886b 100644 --- a/compiler/testData/diagnostics/tests/FunctionReturnTypes.txt +++ b/compiler/testData/diagnostics/tests/FunctionReturnTypes.txt @@ -1,6 +1,6 @@ package -public val a: [ERROR : Return not allowed] +public val a: [Error type: Return not allowed] public fun bbb(): kotlin.Unit public fun blockAndAndMismatch(): kotlin.Int public fun blockAndAndMismatch1(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.ni.txt b/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.ni.txt index cadd24ca7df..5da803b7a28 100644 --- a/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.ni.txt +++ b/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.ni.txt @@ -21,8 +21,8 @@ public final class B { public final class C { public constructor C() - public final val bar: [ERROR : ] - public final val test: [ERROR : Type for bar()] + public final val bar: [Error type: Return type for function cannot be resolved] + public final val test: [Error type: Not found recorded type for bar()] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.txt b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.txt index 5f4517207f9..e4c90cb41ad 100644 --- a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.txt +++ b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.txt @@ -2,14 +2,14 @@ package package foo { public val f: () -> ??? - public val s: [ERROR : Type for java] - public val ss: [ERROR : Type for System] - public val sss: [ERROR : Type for X] + public val s: [Error type: Not found recorded type for java] + public val ss: [Error type: Not found recorded type for System] + public val sss: [Error type: Not found recorded type for X] public val x: kotlin.String - public val xs: [ERROR : Type for java.lang] - public val xss: [ERROR : Type for java.lang.System] - public val xsss: [ERROR : Type for foo.X] - public val xssss: [ERROR : Type for foo] + public val xs: [Error type: Not found recorded type for java.lang] + public val xss: [Error type: Not found recorded type for java.lang.System] + public val xsss: [Error type: Not found recorded type for foo.X] + public val xssss: [Error type: Not found recorded type for foo] public fun main(): kotlin.Unit public final class X { diff --git a/compiler/testData/diagnostics/tests/PackageInTypePosition.txt b/compiler/testData/diagnostics/tests/PackageInTypePosition.txt index 66dad6df0d1..bc6abffeced 100644 --- a/compiler/testData/diagnostics/tests/PackageInTypePosition.txt +++ b/compiler/testData/diagnostics/tests/PackageInTypePosition.txt @@ -1,3 +1,3 @@ package -@[ERROR : foo] /* annotation class not found */ public fun bar(/*0*/ p: [ERROR : foo]): [ERROR : foo] +@[Error type: Unresolved type for foo] /* annotation class not found */ public fun bar(/*0*/ p: [Error type: Unresolved type for foo]): [Error type: Unresolved type for foo] diff --git a/compiler/testData/diagnostics/tests/PackageQualified.txt b/compiler/testData/diagnostics/tests/PackageQualified.txt index 1f848e1ebad..452c473db9e 100644 --- a/compiler/testData/diagnostics/tests/PackageQualified.txt +++ b/compiler/testData/diagnostics/tests/PackageQualified.txt @@ -1,7 +1,7 @@ package package foobar { - public val x1: [ERROR : ] + public val x1: [Error type: Error property type] public val x2: java.util.List? = null public val y1: kotlin.collections.List? = null public fun done(/*0*/ result: O): foobar.Iteratee @@ -59,9 +59,9 @@ package foobar { package foobar.a { public val a: java.util.List? = null - public val a2: [ERROR : util.List]? - public val a3: [ERROR : LinkedList]? + public val a2: [Error type: Unresolved type for util.List]? + public val a3: [Error type: Unresolved type for LinkedList]? public val b: kotlin.collections.List? = null - public val b1: [ERROR : util.List]? + public val b1: [Error type: Unresolved type for util.List]? } } diff --git a/compiler/testData/diagnostics/tests/RecursiveResolve.txt b/compiler/testData/diagnostics/tests/RecursiveResolve.txt index b7ee249de48..b9dc41a80ba 100644 --- a/compiler/testData/diagnostics/tests/RecursiveResolve.txt +++ b/compiler/testData/diagnostics/tests/RecursiveResolve.txt @@ -37,12 +37,12 @@ public final class Test2 { public final class Test3 { public constructor Test3(/*0*/ foo: kotlin.Any?, /*1*/ bar: kotlin.Any?) private final val bar: kotlin.Any - private final val bas: [ERROR : Type for bas()] + private final val bas: [Error type: Not found recorded type for bas()] public final val bas2: kotlin.Int public final val foo: kotlin.Any public final fun bar(): kotlin.Int public final fun bar(/*0*/ i: kotlin.Int): kotlin.Int - private final fun bar2(): [ERROR : Error function type] + private final fun bar2(): [Error type: Return type for function cannot be resolved] private final fun bar2(/*0*/ i: kotlin.Int): kotlin.Int private final fun bas(): kotlin.Int private final fun bas2(): kotlin.Int @@ -54,12 +54,12 @@ public final class Test3 { public final class Test4 { public constructor Test4(/*0*/ foo: kotlin.Any?, /*1*/ bar: kotlin.Any?) private final val bar: kotlin.Any - private final val bas: [ERROR : Type for bas()] + private final val bas: [Error type: Not found recorded type for bas()] public final val bas2: kotlin.Int public final val foo: kotlin.Any public final fun bar(): kotlin.Int public final fun bar(/*0*/ i: kotlin.Int): kotlin.Int - private final fun bar2(): [ERROR : Error function type] + private final fun bar2(): [Error type: Return type for function cannot be resolved] private final fun bar2(/*0*/ i: kotlin.Int): kotlin.Int private final fun bas(): kotlin.Int private final fun bas2(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/RecursiveTypeInference.ni.txt b/compiler/testData/diagnostics/tests/RecursiveTypeInference.ni.txt index de8c2b4fa90..3003e5029dc 100644 --- a/compiler/testData/diagnostics/tests/RecursiveTypeInference.ni.txt +++ b/compiler/testData/diagnostics/tests/RecursiveTypeInference.ni.txt @@ -1,19 +1,19 @@ package package a { - public val foo: [ERROR : Error function type] - public fun bar(): [ERROR : Error function type] + public val foo: [Error type: Return type for function cannot be resolved] + public fun bar(): [Error type: Return type for function cannot be resolved] } package b { - public fun bar(): [ERROR : Error function type] - public fun foo(): [ERROR : Error function type] + public fun bar(): [Error type: Return type for function cannot be resolved] + public fun foo(): [Error type: Return type for function cannot be resolved] } package c { - public fun bar(): [ERROR : Error function type] - public fun bazz(): [ERROR : Error function type] - public fun foo(): [ERROR : Error function type] + public fun bar(): [Error type: Return type for function cannot be resolved] + public fun bazz(): [Error type: Return type for function cannot be resolved] + public fun foo(): [Error type: Return type for function cannot be resolved] } package ok { diff --git a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.txt b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.txt index 77ca54e6d45..3d6b17194df 100644 --- a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.txt +++ b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.txt @@ -2,4 +2,5 @@ package @java.lang.Deprecated public fun a(): kotlin.Unit @java.util.ArrayList public fun b(): kotlin.Unit -@[ERROR : Xoo] /* annotation class not found */ public fun c(): kotlin.Unit +@[Error type: Unresolved type for Xoo] /* annotation class not found */ public fun c(): kotlin.Unit + diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationForObject.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationForObject.txt index 4c32710296f..c2ba609bb57 100644 --- a/compiler/testData/diagnostics/tests/annotations/AnnotationForObject.txt +++ b/compiler/testData/diagnostics/tests/annotations/AnnotationForObject.txt @@ -1,6 +1,6 @@ package -@[ERROR : someErrorAnnotation] /* annotation class not found */ public object Test { +@[Error type: Unresolved type for someErrorAnnotation] /* annotation class not found */ public object Test { private constructor Test() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt b/compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt index 7dc3b7d2be0..a3d8656a005 100644 --- a/compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt +++ b/compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt @@ -3,7 +3,7 @@ package package test { public val some: test.SomeObject - @[ERROR : BadAnnotation] /* annotation class not found */ public object SomeObject { + @[Error type: Unresolved type for BadAnnotation] /* annotation class not found */ public object SomeObject { private constructor SomeObject() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt index 0e6079fca84..90b3942e9f8 100644 --- a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt +++ b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.txt @@ -84,8 +84,8 @@ package test { } public final annotation class Ann9 : kotlin.Annotation { - public constructor Ann9(/*0*/ error: [ERROR : Unresolved] = ...) - public final val error: [ERROR : Unresolved] + public constructor Ann9(/*0*/ error: [Error type: Unresolved type for Unresolved] = ...) + public final val error: [Error type: Unresolved type for Unresolved] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.txt b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.txt index caa8c915e63..1e02e5aeb70 100644 --- a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.txt +++ b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.txt @@ -1,11 +1,11 @@ package -@setparam:[ERROR : varargs] /* annotation class not found */ public var bar: kotlin.Int +@setparam:[Error type: Unresolved type for varargs] /* annotation class not found */ public var bar: kotlin.Int public val x: (kotlin.Int) -> kotlin.Int -public fun foo(/*0*/ @[ERROR : varargs] /* annotation class not found */ f: kotlin.Int): kotlin.Unit +public fun foo(/*0*/ @[Error type: Unresolved type for varargs] /* annotation class not found */ f: kotlin.Int): kotlin.Unit public final class Hello { - public constructor Hello(/*0*/ @[ERROR : varargs] /* annotation class not found */ args: kotlin.Any) + public constructor Hello(/*0*/ @[Error type: Unresolved type for varargs] /* annotation class not found */ args: kotlin.Any) public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/annotations/noNameProperty.txt b/compiler/testData/diagnostics/tests/annotations/noNameProperty.txt index 2aaaba03919..0879091dfa5 100644 --- a/compiler/testData/diagnostics/tests/annotations/noNameProperty.txt +++ b/compiler/testData/diagnostics/tests/annotations/noNameProperty.txt @@ -1,8 +1,8 @@ package public final annotation class Ann : kotlin.Annotation { - public constructor Ann(/*0*/ x: kotlin.Int, /*1*/ ``: [ERROR : Type annotation was missing for parameter ]) - public final val ``: [ERROR : Annotation is absent] + public constructor Ann(/*0*/ x: kotlin.Int, /*1*/ ``: [Error type: Missed a type for a value parameter ]) + public final val ``: [Error type: No type specified for val] public final val x: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.txt b/compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.txt index 51c0087fb3c..90f16331100 100644 --- a/compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.txt +++ b/compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.txt @@ -3,7 +3,7 @@ package public final class Bar { public constructor Bar() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @[ERROR : Not an annotation: T] /* annotation class not found */ public final fun foo(): kotlin.Int + @[Error type: Not an annotation type T in the annotation context] /* annotation class not found */ public final fun foo(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -11,7 +11,7 @@ public final class Bar { public final class Foo { public constructor Foo() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @[ERROR : Not an annotation: T] /* annotation class not found */ public final fun foo(): kotlin.Int + @[Error type: Not an annotation type T in the annotation context] /* annotation class not found */ public final fun foo(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.txt b/compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.txt index 9fba12786fd..f3e0cb1e953 100644 --- a/compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.txt +++ b/compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.txt @@ -1,34 +1,34 @@ package -@[ERROR : Ann] /* annotation class not found */ public final class A { +@[Error type: Unresolved type for Ann] /* annotation class not found */ public final class A { public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@[ERROR : Ann] /* annotation class not found */ public final class B { +@[Error type: Unresolved type for Ann] /* annotation class not found */ public final class B { public constructor B() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@[ERROR : Ann] /* annotation class not found */ public final class C { +@[Error type: Unresolved type for Ann] /* annotation class not found */ public final class C { public constructor C() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@[ERROR : kotlin.Ann] /* annotation class not found */ public final class D { +@[Error type: Unresolved type for kotlin.Ann] /* annotation class not found */ public final class D { public constructor D() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@[ERROR : kotlin.annotation.Ann] /* annotation class not found */ public final class E { +@[Error type: Unresolved type for kotlin.annotation.Ann] /* annotation class not found */ public final class E { public constructor E() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/diagnosticFileAnnotationInWrongPlace.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/diagnosticFileAnnotationInWrongPlace.txt index eb001fff7d3..478cd8dd18e 100644 --- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/diagnosticFileAnnotationInWrongPlace.txt +++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/diagnosticFileAnnotationInWrongPlace.txt @@ -1,7 +1,7 @@ package package bar { - public val prop: [ERROR : No type, no body] + public val prop: [Error type: Return type for property prop cannot be resolved] public fun func(): kotlin.Unit @bar.baz public final class C { diff --git a/compiler/testData/diagnostics/tests/callableReference/bound/kt12843.txt b/compiler/testData/diagnostics/tests/callableReference/bound/kt12843.txt index 356c2834d58..71a73ec2771 100644 --- a/compiler/testData/diagnostics/tests/callableReference/bound/kt12843.txt +++ b/compiler/testData/diagnostics/tests/callableReference/bound/kt12843.txt @@ -6,7 +6,7 @@ public final class Foo { public constructor Foo() public final fun bar(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun f(): [ERROR : Error function type] + public final fun f(): [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax.txt b/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax.txt index 697eea68622..2d8c50e20d8 100644 --- a/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax.txt +++ b/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax.txt @@ -24,10 +24,10 @@ package test { public final fun kotlin.collections.List.testClassLiteral1(): kotlin.reflect.KClass public final fun kotlin.collections.List.testClassLiteral2(): kotlin.reflect.KClass public final fun kotlin.collections.List.testClassLiteral3(): kotlin.reflect.KClass - public final fun kotlin.collections.List.testUnresolved1(): [ERROR : Error function type] + public final fun kotlin.collections.List.testUnresolved1(): [Error type: Return type for function cannot be resolved] public final fun kotlin.collections.List.testUnresolved2(): kotlin.reflect.KFunction0 public final fun kotlin.collections.List.testUnresolved3(): kotlin.reflect.KFunction0 - public final fun kotlin.collections.List.testUnresolved4(): [ERROR : Error function type] + public final fun kotlin.collections.List.testUnresolved4(): [Error type: Return type for function cannot be resolved] } public final class a { diff --git a/compiler/testData/diagnostics/tests/callableReference/ea81649_errorPropertyLHS.txt b/compiler/testData/diagnostics/tests/callableReference/ea81649_errorPropertyLHS.txt index cb10c6e01dd..dba44d4d3a3 100644 --- a/compiler/testData/diagnostics/tests/callableReference/ea81649_errorPropertyLHS.txt +++ b/compiler/testData/diagnostics/tests/callableReference/ea81649_errorPropertyLHS.txt @@ -1,7 +1,7 @@ // -- Module: -- package -public fun bar(/*0*/ ff: [ERROR : Err].() -> kotlin.Unit): kotlin.Unit +public fun bar(/*0*/ ff: [Error type: Unresolved type for Err].() -> kotlin.Unit): kotlin.Unit // -- Module: -- package diff --git a/compiler/testData/diagnostics/tests/callableReference/function/classMemberVsConstructorLikeFunction.txt b/compiler/testData/diagnostics/tests/callableReference/function/classMemberVsConstructorLikeFunction.txt index f40a89c432f..8b21e633b15 100644 --- a/compiler/testData/diagnostics/tests/callableReference/function/classMemberVsConstructorLikeFunction.txt +++ b/compiler/testData/diagnostics/tests/callableReference/function/classMemberVsConstructorLikeFunction.txt @@ -1,7 +1,7 @@ package public val f: kotlin.reflect.KFunction1 -public val g: [ERROR : Type for Foo::length] +public val g: [Error type: Not found recorded type for Foo::length] public fun Foo(): kotlin.String package test { diff --git a/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.txt b/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.txt index 398d2d34365..60b49bd65b0 100644 --- a/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.txt +++ b/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.txt @@ -1,15 +1,15 @@ package -public fun bar(): [ERROR : Error function type] -public fun foo(): [ERROR : Error function type] +public fun bar(): [Error type: Return type for function cannot be resolved] +public fun foo(): [Error type: Return type for function cannot be resolved] public fun take(/*0*/ arg: kotlin.Any): kotlin.Unit public final class A { public constructor A() - public final fun bar(): [ERROR : Error function type] + public final fun bar(): [Error type: Return type for function cannot be resolved] public final fun baz(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): [ERROR : Error function type] + public final fun foo(): [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/callableReference/noExceptionOnRedCodeWithArrayLikeCall.txt b/compiler/testData/diagnostics/tests/callableReference/noExceptionOnRedCodeWithArrayLikeCall.txt index 73859c15399..7956198753a 100644 --- a/compiler/testData/diagnostics/tests/callableReference/noExceptionOnRedCodeWithArrayLikeCall.txt +++ b/compiler/testData/diagnostics/tests/callableReference/noExceptionOnRedCodeWithArrayLikeCall.txt @@ -1,12 +1,12 @@ package -public fun foo(/*0*/ intDTO: DTO?, /*1*/ p: [ERROR : KProperty1<*, Int>]): kotlin.Unit +public fun foo(/*0*/ intDTO: DTO?, /*1*/ p: [Error type: Unresolved type for KProperty1<*, Int>]): kotlin.Unit public final class DTO { public constructor DTO() public final val q: kotlin.Int = 0 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final operator fun get(/*0*/ prop: [ERROR : KProperty1<*, Int>]): kotlin.Int + public final operator fun get(/*0*/ prop: [Error type: Unresolved type for KProperty1<*, Int>]): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/ambiguousWithVararg.txt b/compiler/testData/diagnostics/tests/callableReference/resolve/ambiguousWithVararg.txt index 0e34f8a125a..228619984bd 100644 --- a/compiler/testData/diagnostics/tests/callableReference/resolve/ambiguousWithVararg.txt +++ b/compiler/testData/diagnostics/tests/callableReference/resolve/ambiguousWithVararg.txt @@ -1,8 +1,8 @@ package -public val ref1: [ERROR : Type for ::fun1] -public val ref2: [ERROR : Type for ::fun2] -public val ref3: [ERROR : Type for ::fun3] +public val ref1: [Error type: Not found recorded type for ::fun1] +public val ref2: [Error type: Not found recorded type for ::fun2] +public val ref3: [Error type: Not found recorded type for ::fun3] public fun fun1(): kotlin.Unit public fun fun1(/*0*/ x: kotlin.Int): kotlin.Unit public fun fun2(/*0*/ x: kotlin.Int): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/byValType.txt b/compiler/testData/diagnostics/tests/callableReference/resolve/byValType.txt index 36af3186f98..af05f071269 100644 --- a/compiler/testData/diagnostics/tests/callableReference/resolve/byValType.txt +++ b/compiler/testData/diagnostics/tests/callableReference/resolve/byValType.txt @@ -1,6 +1,6 @@ package -public val x1: [ERROR : Type for ::foo] +public val x1: [Error type: Not found recorded type for ::foo] public val x2: () -> kotlin.Unit public val x3: (kotlin.String) -> kotlin.Unit public val x4: (kotlin.Int) -> kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/withExtFun.txt b/compiler/testData/diagnostics/tests/callableReference/resolve/withExtFun.txt index ce64ac94a29..752f988fe89 100644 --- a/compiler/testData/diagnostics/tests/callableReference/resolve/withExtFun.txt +++ b/compiler/testData/diagnostics/tests/callableReference/resolve/withExtFun.txt @@ -1,11 +1,11 @@ package -public val x0: [ERROR : Type for A::foo] +public val x0: [Error type: Not found recorded type for A::foo] public val x1: (A) -> kotlin.Unit public val x2: kotlin.reflect.KProperty1 public val x3: kotlin.reflect.KProperty1 public val x4: (A) -> kotlin.String -public val y0: [ERROR : Type for A::bar] +public val y0: [Error type: Not found recorded type for A::bar] public val y1: (A) -> kotlin.Unit public val y2: kotlin.reflect.KProperty1 public val y3: kotlin.reflect.KProperty1 diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.ni.txt b/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.ni.txt index b4aee01f697..cee5d9e8dab 100644 --- a/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.ni.txt +++ b/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.ni.txt @@ -2,7 +2,7 @@ package public val x1: kotlin.Unit public val x2: kotlin.Unit -public val x3: [ERROR : Type for apply(true, ::foo)] +public val x3: [Error type: Not found recorded type for apply(true, ::foo)] public fun apply(/*0*/ x: T, /*1*/ f: (T) -> R): R public fun foo(/*0*/ i: kotlin.Int): kotlin.Unit public fun foo(/*0*/ s: kotlin.String): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.ni.txt b/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.ni.txt index fdcf82915be..e30370b4e08 100644 --- a/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.ni.txt +++ b/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.ni.txt @@ -3,8 +3,8 @@ package public val x1: kotlin.String public val x2: kotlin.String public val x3: kotlin.String -public val x4: [ERROR : Type for fn2(::foo, ::bar)] -public val x5: [ERROR : Type for fn2(::foo, ::foo)] +public val x4: [Error type: Not found recorded type for fn2(::foo, ::bar)] +public val x5: [Error type: Not found recorded type for fn2(::foo, ::foo)] public val x6: kotlin.Int public fun bar(/*0*/ s: kotlin.String): kotlin.String public fun fn1(/*0*/ x: kotlin.Int, /*1*/ f1: (kotlin.Int) -> kotlin.String, /*2*/ f2: (kotlin.String) -> kotlin.String): kotlin.String diff --git a/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.txt b/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.txt index 66b8b56e51c..b8dccf8bcc6 100644 --- a/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.txt +++ b/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.txt @@ -1,6 +1,6 @@ package -public fun f(/*0*/ p: B<[ERROR : Foo]>): kotlin.Any +public fun f(/*0*/ p: B<[Error type: Unresolved type for Foo]>): kotlin.Any public interface B { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.txt b/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.txt index fec5856fad4..1f551fea78c 100644 --- a/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.txt +++ b/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.txt @@ -1,6 +1,6 @@ package -public fun foo(/*0*/ p: [ERROR : P]): kotlin.Unit +public fun foo(/*0*/ p: [Error type: Unresolved type for P]): kotlin.Unit public final class G { public constructor G() diff --git a/compiler/testData/diagnostics/tests/classLiteral/arrays.txt b/compiler/testData/diagnostics/tests/classLiteral/arrays.txt index 9a31b37a57a..75b116a3814 100644 --- a/compiler/testData/diagnostics/tests/classLiteral/arrays.txt +++ b/compiler/testData/diagnostics/tests/classLiteral/arrays.txt @@ -1,7 +1,7 @@ package public val a01: kotlin.reflect.KClass> -public val a02: kotlin.reflect.KClass> +public val a02: kotlin.reflect.KClass> public val a03: kotlin.reflect.KClass> public val a04: kotlin.reflect.KClass?>> public val a05: kotlin.reflect.KClass> diff --git a/compiler/testData/diagnostics/tests/classLiteral/genericClasses.txt b/compiler/testData/diagnostics/tests/classLiteral/genericClasses.txt index 6ac3aaacbce..0e2f18a4787 100644 --- a/compiler/testData/diagnostics/tests/classLiteral/genericClasses.txt +++ b/compiler/testData/diagnostics/tests/classLiteral/genericClasses.txt @@ -7,7 +7,7 @@ public val a4: kotlin.reflect.KClass> public val b1: kotlin.reflect.KClass public val b2: kotlin.reflect.KClass public val i1: kotlin.reflect.KClass.Inner<*>> -public val i2: [ERROR : Unresolved class] +public val i2: [Error type: Unresolved class A<*>.Inner<*>::class] public val i3: kotlin.reflect.KClass.Inner> public val m1: kotlin.reflect.KClass> public val m2: kotlin.reflect.KClass> diff --git a/compiler/testData/diagnostics/tests/classLiteral/nonClassesOnLHS.txt b/compiler/testData/diagnostics/tests/classLiteral/nonClassesOnLHS.txt index 5b581f99da6..ced133b0179 100644 --- a/compiler/testData/diagnostics/tests/classLiteral/nonClassesOnLHS.txt +++ b/compiler/testData/diagnostics/tests/classLiteral/nonClassesOnLHS.txt @@ -4,7 +4,7 @@ public val a1: kotlin.reflect.KClass public val a2: kotlin.reflect.KClass public val l1: kotlin.reflect.KClass?> public val l2: kotlin.reflect.KClass?> -public val m: [ERROR : Unresolved class] +public val m: [Error type: Unresolved class Map::class] public inline fun bar(): kotlin.Unit public fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/classLiteral/unresolvedClass.txt b/compiler/testData/diagnostics/tests/classLiteral/unresolvedClass.txt index f19879dfb89..738ed96af50 100644 --- a/compiler/testData/diagnostics/tests/classLiteral/unresolvedClass.txt +++ b/compiler/testData/diagnostics/tests/classLiteral/unresolvedClass.txt @@ -1,4 +1,4 @@ package -public val g: [ERROR : Unresolved class] -public val u: [ERROR : Unresolved class] +public val g: [Error type: Unresolved class UnresolvedGeneric::class] +public val u: [Error type: Unresolved class Unresolved::class] diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt index c2fc2e9b963..299c05367a9 100644 --- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt +++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.txt @@ -9,7 +9,7 @@ public final class A { public companion object Companion { private constructor Companion() - public final val y: [ERROR : Type for x] + public final val y: [Error type: Not found recorded type for x] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt index a672bc12d37..78ec4c329c5 100644 --- a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt +++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.txt @@ -2,9 +2,9 @@ package package Jet86 { public val a: kotlin.Int = 1 - public val c: [ERROR : Type for B.x] - public val d: [ERROR : Type for b.x] - public val s: [ERROR : Type for System] + public val c: [Error type: Not found recorded type for B.x] + public val d: [Error type: Not found recorded type for b.x] + public val s: [Error type: Not found recorded type for System] public fun test(): kotlin.Unit public final class A { diff --git a/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt b/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt index 71ba4f80cdb..90f9c704497 100644 --- a/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt +++ b/compiler/testData/diagnostics/tests/classObjects/classObjectHeader.txt @@ -9,7 +9,7 @@ package test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public companion object Companion : test.ToResolve<[ERROR : P]> { + public companion object Companion : test.ToResolve<[Error type: Unresolved type for P]> { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt b/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt index e47788ed65c..a2791914b43 100644 --- a/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt +++ b/compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.txt @@ -11,7 +11,7 @@ package test { public companion object Companion { private constructor Companion() - public final val a: [ERROR : Type for test()] + public final val a: [Error type: Not found recorded type for test()] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/constantEvaluator/constant/differentTypes.txt b/compiler/testData/diagnostics/tests/constantEvaluator/constant/differentTypes.txt index 3865860b780..9dabaa4eed1 100644 --- a/compiler/testData/diagnostics/tests/constantEvaluator/constant/differentTypes.txt +++ b/compiler/testData/diagnostics/tests/constantEvaluator/constant/differentTypes.txt @@ -3,8 +3,8 @@ package package test { public val prop1: kotlin.Int = 1 public val prop10: kotlin.Any = "a" - public val prop11: [ERROR : aaa] - public val prop14: [ERROR : aaa]? + public val prop11: [Error type: Unresolved type for aaa] + public val prop14: [Error type: Unresolved type for aaa]? public val prop15: test.A public val prop16: test.A? = 1 public val prop2: kotlin.Int? = 1 diff --git a/compiler/testData/diagnostics/tests/constructorConsistency/companion.txt b/compiler/testData/diagnostics/tests/constructorConsistency/companion.txt index 9f642478868..6e52cbf3df5 100644 --- a/compiler/testData/diagnostics/tests/constructorConsistency/companion.txt +++ b/compiler/testData/diagnostics/tests/constructorConsistency/companion.txt @@ -12,7 +12,7 @@ public final class My { public companion object Companion { private constructor Companion() public final val u: kotlin.String - public final val y: [ERROR : Type for foo()] + public final val y: [Error type: Not found recorded type for foo()] public final val z: kotlin.String? public final fun bar(): kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt index 6622ab09ddb..bebab40badc 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt @@ -61,7 +61,7 @@ package uninitialized_reassigned_variables { public final class ForwardAccessToBackingField { public constructor ForwardAccessToBackingField() - public final val a: [ERROR : Type for a] + public final val a: [Error type: Not found recorded type for a] public final val b: kotlin.Int = 1 public final val c: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.ni.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.ni.txt index cada8d78115..11d3a97eac2 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.ni.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.ni.txt @@ -1,7 +1,7 @@ package private fun fClient(): HttpClientImpl -private fun lazy(/*0*/ init: () -> T): [ERROR : kotlin.Lazy] +private fun lazy(/*0*/ init: () -> T): [Error type: Unresolved type for kotlin.Lazy] public object DefaultFqHttpClient : HttpClient { private constructor DefaultFqHttpClient() @@ -21,7 +21,7 @@ public object DefaultHttpClient : HttpClient { public object DefaultHttpClientWithBy : HttpClient { private constructor DefaultHttpClientWithBy() - public final val client: [ERROR : Type from delegate] + public final val client: [Error type: Error delegation type for lazy { HttpClientImpl() }] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.txt b/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.txt index 45b69f58e63..ff718ce3ad7 100644 --- a/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.txt +++ b/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.txt @@ -1,6 +1,6 @@ package public fun b(): kotlin.Boolean -public fun foo1(): [ERROR : Error function type] -public fun foo2(): [ERROR : Error function type] +public fun foo1(): [Error type: Return type for function cannot be resolved] +public fun foo2(): [Error type: Return type for function cannot be resolved] public fun foo3(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.txt b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.txt index 0819b67e71a..157ec9fb54b 100644 --- a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.txt +++ b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.txt @@ -1,7 +1,7 @@ package package kt770_351_735 { - public val w: [ERROR : Type for while (true) {}] + public val w: [Error type: Not found recorded type for while (true) {}] public fun bar(/*0*/ a: kotlin.Unit): kotlin.Unit public fun box(): kotlin.Int public fun doSmth(/*0*/ i: kotlin.Int): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt799.txt b/compiler/testData/diagnostics/tests/controlStructures/kt799.txt index 4658cf747da..3cb42e05ee3 100644 --- a/compiler/testData/diagnostics/tests/controlStructures/kt799.txt +++ b/compiler/testData/diagnostics/tests/controlStructures/kt799.txt @@ -2,7 +2,7 @@ package package kt799 { public val a: kotlin.Nothing - public val b: [ERROR : Return not allowed] + public val b: [Error type: Return not allowed] public val c: kotlin.Unit public fun doSmth(/*0*/ i: kotlin.Int): kotlin.Unit public fun f(/*0*/ mi: kotlin.Int = ...): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_before.txt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_before.txt index 5be70fc4d9c..cff8f629c4d 100644 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_before.txt +++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_before.txt @@ -8,7 +8,7 @@ public object WithFunctionInBase { public final class C { public constructor C() - public final val data: [ERROR : ] + public final val data: [Error type: Type for error type constructor ()] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -16,7 +16,7 @@ public object WithFunctionInBase { public open class Base { public constructor Base() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): [ERROR : ] + public final fun foo(): [Error type: Type for error type constructor ()] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -24,7 +24,7 @@ public object WithFunctionInBase { public companion object Companion : WithFunctionInBase.DerivedAbstract { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun foo(): [ERROR : ] + public final override /*1*/ /*fake_override*/ fun foo(): [Error type: Type for error type constructor ()] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -40,7 +40,7 @@ public object WithFunctionInBase { public abstract class DerivedAbstract : WithFunctionInBase.C.Base { public constructor DerivedAbstract() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final override /*1*/ /*fake_override*/ fun foo(): [ERROR : ] + public final override /*1*/ /*fake_override*/ fun foo(): [Error type: Type for error type constructor ()] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -54,14 +54,14 @@ public object WithPropertyInBase { public final class C { public constructor C() - public final val data: [ERROR : ] + public final val data: [Error type: Type for error type constructor ()] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open class Base { public constructor Base() - public final val foo: [ERROR : ] + public final val foo: [Error type: Type for error type constructor ()] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -69,7 +69,7 @@ public object WithPropertyInBase { public companion object Companion : WithPropertyInBase.DerivedAbstract { private constructor Companion() - public final override /*1*/ /*fake_override*/ val foo: [ERROR : ] + public final override /*1*/ /*fake_override*/ val foo: [Error type: Type for error type constructor ()] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -85,7 +85,7 @@ public object WithPropertyInBase { public abstract class DerivedAbstract : WithPropertyInBase.C.Base { public constructor DerivedAbstract() - public final override /*1*/ /*fake_override*/ val foo: [ERROR : ] + public final override /*1*/ /*fake_override*/ val foo: [Error type: Type for error type constructor ()] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -107,7 +107,7 @@ public object WithPropertyInBaseDifferentOrder { public open class Base { public constructor Base() - public final val foo: [ERROR : Int] + public final val foo: [Error type: Unresolved type for Int] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -115,7 +115,7 @@ public object WithPropertyInBaseDifferentOrder { public companion object Companion : WithPropertyInBaseDifferentOrder.DerivedAbstract { private constructor Companion() - public final override /*1*/ /*fake_override*/ val foo: [ERROR : Int] + public final override /*1*/ /*fake_override*/ val foo: [Error type: Unresolved type for Int] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -131,7 +131,7 @@ public object WithPropertyInBaseDifferentOrder { public abstract class DerivedAbstract : WithPropertyInBaseDifferentOrder.C.Base { public constructor DerivedAbstract() - public final override /*1*/ /*fake_override*/ val foo: [ERROR : Int] + public final override /*1*/ /*fake_override*/ val foo: [Error type: Unresolved type for Int] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/dataClasses/errorTypesInDataClasses.txt b/compiler/testData/diagnostics/tests/dataClasses/errorTypesInDataClasses.txt index 1eb87de9343..2069d61ea7f 100644 --- a/compiler/testData/diagnostics/tests/dataClasses/errorTypesInDataClasses.txt +++ b/compiler/testData/diagnostics/tests/dataClasses/errorTypesInDataClasses.txt @@ -4,24 +4,24 @@ public fun fa(/*0*/ a: A): kotlin.Unit public fun fb(/*0*/ b: B): kotlin.Unit public final data class A { - public constructor A(/*0*/ i: kotlin.Int, /*1*/ j: [ERROR : G]) + public constructor A(/*0*/ i: kotlin.Int, /*1*/ j: [Error type: Unresolved type for G]) public final val i: kotlin.Int - public final val j: [ERROR : G] + public final val j: [Error type: Unresolved type for G] public final operator /*synthesized*/ fun component1(): kotlin.Int - public final operator /*synthesized*/ fun component2(): [ERROR : G] - public final /*synthesized*/ fun copy(/*0*/ i: kotlin.Int = ..., /*1*/ j: [ERROR : G] = ...): A + public final operator /*synthesized*/ fun component2(): [Error type: Unresolved type for G] + public final /*synthesized*/ fun copy(/*0*/ i: kotlin.Int = ..., /*1*/ j: [Error type: Unresolved type for G] = ...): A public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String } public final data class B { - public constructor B(/*0*/ i: [ERROR : G], /*1*/ j: [ERROR : G]) - public final val i: [ERROR : G] - public final val j: [ERROR : G] - public final operator /*synthesized*/ fun component1(): [ERROR : G] - public final operator /*synthesized*/ fun component2(): [ERROR : G] - public final /*synthesized*/ fun copy(/*0*/ i: [ERROR : G] = ..., /*1*/ j: [ERROR : G] = ...): B + public constructor B(/*0*/ i: [Error type: Unresolved type for G], /*1*/ j: [Error type: Unresolved type for G]) + public final val i: [Error type: Unresolved type for G] + public final val j: [Error type: Unresolved type for G] + public final operator /*synthesized*/ fun component1(): [Error type: Unresolved type for G] + public final operator /*synthesized*/ fun component2(): [Error type: Unresolved type for G] + public final /*synthesized*/ fun copy(/*0*/ i: [Error type: Unresolved type for G] = ..., /*1*/ j: [Error type: Unresolved type for G] = ...): B public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2096.txt b/compiler/testData/diagnostics/tests/declarationChecks/kt2096.txt index e7566c18566..ec41197e46b 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/kt2096.txt +++ b/compiler/testData/diagnostics/tests/declarationChecks/kt2096.txt @@ -4,7 +4,7 @@ package c { public abstract class Foo { public constructor Foo() - protected abstract val prop: [ERROR : No type, no body] + protected abstract val prop: [Error type: Return type for property prop cannot be resolved] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/backingField.txt b/compiler/testData/diagnostics/tests/delegatedProperty/backingField.txt index b4cd5e8059a..53f0d73b023 100644 --- a/compiler/testData/diagnostics/tests/delegatedProperty/backingField.txt +++ b/compiler/testData/diagnostics/tests/delegatedProperty/backingField.txt @@ -4,7 +4,7 @@ public final class B { public constructor B() public final val a: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): [ERROR : No type, no body] + public final fun foo(): [Error type: Return type for foo cannot be resolved] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.ni.txt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.ni.txt index 4ddd4907d5b..a35fad2aab0 100644 --- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.ni.txt +++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.ni.txt @@ -1,7 +1,7 @@ package public var a: kotlin.Int -public var a1: [ERROR : Type from delegate] +public var a1: [Error type: Error delegation type for A()] public var b: kotlin.Int public var c: kotlin.String public val cObj: C diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.txt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.txt index ed1092ec5ff..3da778ee0c1 100644 --- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.txt +++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.txt @@ -16,5 +16,5 @@ package second { } package test { - public val a12: [ERROR : Type from delegate] + public val a12: [Error type: Error delegation type for A()] } diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.ni.txt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.ni.txt index d84065a23cc..7519016173f 100644 --- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.ni.txt +++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.ni.txt @@ -2,7 +2,7 @@ package public final class A { public constructor A() - public final var a: [ERROR : Type from delegate] + public final var a: [Error type: Error delegation type for MyProperty()] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.txt b/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.txt index 441639b76e8..256c2d06a40 100644 --- a/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.txt +++ b/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.txt @@ -1,6 +1,6 @@ package -public val foo: [ERROR : Type from delegate] +public val foo: [Error type: Error delegation type for ValueWrapper()] public final class ValueWrapper { public constructor ValueWrapper() diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.ni.txt b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.ni.txt index aba62fe86a0..f1c6fb43397 100644 --- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.ni.txt +++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.ni.txt @@ -2,7 +2,7 @@ package public final class B { public constructor B() - public final val c: [ERROR : Type from delegate] + public final val c: [Error type: Error delegation type for Delegate(ag)] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver1.txt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver1.txt index 2530898e6b0..4e997cef16f 100644 --- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver1.txt +++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver1.txt @@ -2,7 +2,7 @@ package public object T1 { private constructor T1() - public final val test2: [ERROR : Type from delegate] + public final val test2: [Error type: Error delegation type for 1] public final val kotlin.String.test1: kotlin.Double public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.ni.txt b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.ni.txt index 763ab410665..4fe2081f379 100644 --- a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.ni.txt +++ b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.ni.txt @@ -1,9 +1,9 @@ package -public val a: [ERROR : ] +public val a: [Error type: Return type for function cannot be resolved] public val b: kotlin.Int -public val c: [ERROR : Type from delegate] -public val d: [ERROR : ] +public val c: [Error type: Error delegation type for d] +public val d: [Error type: Return type for function cannot be resolved] public final class Delegate { public constructor Delegate(/*0*/ i: kotlin.Int) diff --git a/compiler/testData/diagnostics/tests/delegation/kt44843.txt b/compiler/testData/diagnostics/tests/delegation/kt44843.txt index d86429e58ae..2aa1829642d 100644 --- a/compiler/testData/diagnostics/tests/delegation/kt44843.txt +++ b/compiler/testData/diagnostics/tests/delegation/kt44843.txt @@ -1,6 +1,6 @@ package -public val bar2: [ERROR : ] +public val bar2: [Error type: Return type for function cannot be resolved] package lt { @@ -10,7 +10,7 @@ package lt { public final class Foo { public constructor Foo() - public final val bar: [ERROR : ] + public final val bar: [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/delegation/kt48546.fir.kt b/compiler/testData/diagnostics/tests/delegation/kt48546.fir.kt new file mode 100644 index 00000000000..52c29ca15f8 --- /dev/null +++ b/compiler/testData/diagnostics/tests/delegation/kt48546.fir.kt @@ -0,0 +1,9 @@ +// WITH_STDLIB + +object DelegateTest { + var result = "" + val f by lazy { + result += f.toString() // Compiler crash + "hello" + } +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/delegation/kt48546.kt b/compiler/testData/diagnostics/tests/delegation/kt48546.kt new file mode 100644 index 00000000000..8f075c4176c --- /dev/null +++ b/compiler/testData/diagnostics/tests/delegation/kt48546.kt @@ -0,0 +1,9 @@ +// WITH_STDLIB + +object DelegateTest { + var result = "" + val f by lazy { + result += f.toString() // Compiler crash + "hello" + } +} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/delegation/kt48546.txt b/compiler/testData/diagnostics/tests/delegation/kt48546.txt new file mode 100644 index 00000000000..62ba3e9515a --- /dev/null +++ b/compiler/testData/diagnostics/tests/delegation/kt48546.txt @@ -0,0 +1,10 @@ +package + +public object DelegateTest { + private constructor DelegateTest() + public final val f: kotlin.String + public final var result: kotlin.String + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.txt index 779ab7a0dfa..8e2d8f9d94a 100644 --- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.txt +++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.txt @@ -1,9 +1,9 @@ package public interface T { - public abstract val x: [ERROR : ErrorType] + public abstract val x: [Error type: Unresolved type for ErrorType] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun getX(): [ERROR : ErrorType1] + public abstract fun getX(): [Error type: Unresolved type for ErrorType1] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_after.txt b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_after.txt index 49b2833c444..1b5bbd42d8c 100644 --- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_after.txt +++ b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_after.txt @@ -5,7 +5,7 @@ public fun f1(): kotlin.Unit public fun f2(): kotlin.Unit public fun f3(): kotlin.Unit public fun f4(): kotlin.Unit -public fun f5(): [ERROR : Error function type] +public fun f5(): [Error type: Return type for function cannot be resolved] public final enum class E : kotlin.Enum { enum entry FIRST diff --git a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_before.txt b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_before.txt index 49b2833c444..1b5bbd42d8c 100644 --- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_before.txt +++ b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_before.txt @@ -5,7 +5,7 @@ public fun f1(): kotlin.Unit public fun f2(): kotlin.Unit public fun f3(): kotlin.Unit public fun f4(): kotlin.Unit -public fun f5(): [ERROR : Error function type] +public fun f5(): [Error type: Return type for function cannot be resolved] public final enum class E : kotlin.Enum { enum entry FIRST diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt index 0acedf39b07..14e23d0ae55 100644 --- a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt +++ b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.txt @@ -1,6 +1,6 @@ package -public fun f(): [ERROR : Error function type] +public fun f(): [Error type: Return type for function cannot be resolved] public final enum class E : kotlin.Enum { enum entry FIRST diff --git a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/recursiveBounds.txt b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/recursiveBounds.txt index 06eb2d5a4f7..26d55b3e4b3 100644 --- a/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/recursiveBounds.txt +++ b/compiler/testData/diagnostics/tests/explicitDefinitelyNotNullableViaIntersection/recursiveBounds.txt @@ -1,7 +1,7 @@ package public fun bar(): kotlin.Unit -public fun baz(): kotlin.Unit +public fun baz(): kotlin.Unit public fun > sort1(): kotlin.Unit public fun ?> sort2(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/syntaxError.txt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/syntaxError.txt index 3921ad4f21c..6e01dca7ca6 100644 --- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/syntaxError.txt +++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/syntaxError.txt @@ -1,3 +1,3 @@ package -context([ERROR : No type element]) public fun foo(): kotlin.Unit +context([Error type: No type specified for unknown element]) public fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsClasses.txt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsClasses.txt index 23d255667b4..d18a0acae59 100644 --- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsClasses.txt +++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/thisWithReceiverLabelsClasses.txt @@ -10,9 +10,9 @@ public final class A { context(A) public final class B { public constructor B() - public final val prop: [ERROR : Type for x + this@A.x] + public final val prop: [Error type: Not found recorded type for x + this@A.x] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun f(): [ERROR : Error function type] + public final fun f(): [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.txt b/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.txt index 5a49905525d..ee7add7246f 100644 --- a/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.txt +++ b/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.txt @@ -1,7 +1,7 @@ package -public fun f1(): [ERROR : Error function type] -public fun f2(): [ERROR : Error function type] +public fun f1(): [Error type: Return type for function cannot be resolved] +public fun f2(): [Error type: Return type for function cannot be resolved] public fun kotlin.Any?.bar(): kotlin.Int public open class A { diff --git a/compiler/testData/diagnostics/tests/funInterface/funInterfaceDeclarationCheck.txt b/compiler/testData/diagnostics/tests/funInterface/funInterfaceDeclarationCheck.txt index 97988bad390..497b6720f93 100644 --- a/compiler/testData/diagnostics/tests/funInterface/funInterfaceDeclarationCheck.txt +++ b/compiler/testData/diagnostics/tests/funInterface/funInterfaceDeclarationCheck.txt @@ -184,7 +184,7 @@ public final class WithNestedFun { public fun interface NestedFun { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract fun inovke(/*0*/ element: [ERROR : K]): kotlin.Unit + public abstract fun inovke(/*0*/ element: [Error type: Unresolved type for K]): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.txt b/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.txt index b0974b42778..e82e6bdc43c 100644 --- a/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.txt +++ b/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.txt @@ -6,7 +6,7 @@ public val newSyntax2: (kotlin.Int, kotlin.Int) -> kotlin.Unit public val newSyntax3: (???, kotlin.Int) -> kotlin.Unit public val newSyntax4: (kotlin.Int, ???) -> kotlin.Unit public val none: () -> kotlin.Unit -public val parameterWithFunctionType: (((kotlin.Int) -> kotlin.Int) -> [ERROR : No type element]) -> kotlin.Unit +public val parameterWithFunctionType: (((kotlin.Int) -> kotlin.Int) -> [Error type: No type specified for unknown element]) -> kotlin.Unit public val parenthesizedParameters: (???) -> kotlin.Unit public val parenthesizedParameters2: (???) -> kotlin.Unit public val receiver: () -> ??? diff --git a/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.txt b/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.txt index fd1d64f618d..b24fc67ed31 100644 --- a/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.txt +++ b/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.txt @@ -1,3 +1,3 @@ package -public fun foo(/*0*/ a: kotlin.Any, /*1*/ b: [ERROR : Map]): kotlin.Unit +public fun foo(/*0*/ a: kotlin.Any, /*1*/ b: [Error type: Type for error type constructor (Map)]): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/generics/cyclicBounds/functions.txt b/compiler/testData/diagnostics/tests/generics/cyclicBounds/functions.txt index 9e5b6d38929..48bfddc9b57 100644 --- a/compiler/testData/diagnostics/tests/generics/cyclicBounds/functions.txt +++ b/compiler/testData/diagnostics/tests/generics/cyclicBounds/functions.txt @@ -1,6 +1,6 @@ package -public fun foo1(): kotlin.Unit -public fun foo2(): kotlin.Unit -public fun foo3(): kotlin.Unit -public fun foo4(): kotlin.Unit +public fun foo1(): kotlin.Unit +public fun foo2(): kotlin.Unit +public fun foo3(): kotlin.Unit +public fun foo4(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/generics/cyclicBounds/inClass.txt b/compiler/testData/diagnostics/tests/generics/cyclicBounds/inClass.txt index a4712d3ca3b..a5ea37dbf7d 100644 --- a/compiler/testData/diagnostics/tests/generics/cyclicBounds/inClass.txt +++ b/compiler/testData/diagnostics/tests/generics/cyclicBounds/inClass.txt @@ -1,28 +1,28 @@ package -public final class A1 { - public constructor A1() +public final class A1 { + public constructor A1() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public final class A2 { - public constructor A2() +public final class A2 { + public constructor A2() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public final class A3 { - public constructor A3() +public final class A3 { + public constructor A3() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public final class A4 { - public constructor A4() +public final class A4 { + public constructor A4() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/generics/genericsInType.txt b/compiler/testData/diagnostics/tests/generics/genericsInType.txt index 01766327b46..0d96522ec0a 100644 --- a/compiler/testData/diagnostics/tests/generics/genericsInType.txt +++ b/compiler/testData/diagnostics/tests/generics/genericsInType.txt @@ -1,10 +1,10 @@ package public fun a(): kotlin.Unit -public fun ex1(/*0*/ a: [ERROR : Bar]): [ERROR : Bar] +public fun ex1(/*0*/ a: [Error type: Type for error type constructor (Bar)]): [Error type: Type for error type constructor (Bar)] public fun test(): kotlin.Unit -public fun > x(): kotlin.Unit -public fun [ERROR : Bar].ext(): kotlin.Unit +public fun > x(): kotlin.Unit +public fun [Error type: Type for error type constructor (Bar)].ext(): kotlin.Unit public final class Foo { public constructor Foo() diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromCompanionObject_after.txt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromCompanionObject_after.txt index 608739004b7..d2f3c8197fb 100644 --- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromCompanionObject_after.txt +++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromCompanionObject_after.txt @@ -3,7 +3,7 @@ package public final class A { public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ x: [ERROR : Inner]): kotlin.Unit + public final fun foo(/*0*/ x: [Error type: Unresolved type for Inner]): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromCompanionObject_before.txt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromCompanionObject_before.txt index dd4e61a1fae..a25368f7973 100644 --- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromCompanionObject_before.txt +++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromCompanionObject_before.txt @@ -3,7 +3,7 @@ package public final class A { public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ x: [ERROR : Inner]): kotlin.Unit + public final fun foo(/*0*/ x: [Error type: Type for error type constructor (Inner)]): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/inStaticScope.txt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/inStaticScope.txt index 985bd6e49f7..98aadd7cb75 100644 --- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/inStaticScope.txt +++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/inStaticScope.txt @@ -26,14 +26,14 @@ public final class Outer { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - public final class Nested : Inv<[ERROR : Inner]> { + public final class Nested : Inv<[Error type: Type for error type constructor (Inner)]> { public constructor Nested() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } - public object Obj : Inv<[ERROR : Inner]> { + public object Obj : Inv<[Error type: Type for error type constructor (Inner)]> { private constructor Obj() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/importedInner.txt b/compiler/testData/diagnostics/tests/generics/innerClasses/importedInner.txt index 6f86f9c92e0..e26740e5983 100644 --- a/compiler/testData/diagnostics/tests/generics/innerClasses/importedInner.txt +++ b/compiler/testData/diagnostics/tests/generics/innerClasses/importedInner.txt @@ -1,6 +1,6 @@ package -public fun bar(/*0*/ x: [ERROR : Inner]): kotlin.Unit +public fun bar(/*0*/ x: [Error type: Type for error type constructor (Inner)]): kotlin.Unit public final class E { public constructor E() @@ -25,7 +25,7 @@ public final class Outer { public final class Nested { public constructor Nested() - public final fun bar(/*0*/ x: [ERROR : Inner]): kotlin.Unit + public final fun bar(/*0*/ x: [Error type: Type for error type constructor (Inner)]): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/outerArgumentsRequired.txt b/compiler/testData/diagnostics/tests/generics/innerClasses/outerArgumentsRequired.txt index 386a8307121..77017ab4c3b 100644 --- a/compiler/testData/diagnostics/tests/generics/innerClasses/outerArgumentsRequired.txt +++ b/compiler/testData/diagnostics/tests/generics/innerClasses/outerArgumentsRequired.txt @@ -36,12 +36,12 @@ public final class A { public final class Nested { public constructor Nested() - public final val c: [ERROR : C]? - public final val d: [ERROR : D]? - public final val innerMost: [ERROR : Innermost]? - public final val x: [ERROR : B]? - public final val y: [ERROR : C]? - public final val z: [ERROR : D]? + public final val c: [Error type: Type for error type constructor (C)]? + public final val d: [Error type: Type for error type constructor (D)]? + public final val innerMost: [Error type: Type for error type constructor (Innermost)]? + public final val x: [Error type: Type for error type constructor (B)]? + public final val y: [Error type: Type for error type constructor (C)]? + public final val z: [Error type: Type for error type constructor (D)]? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.txt b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.txt index b74cf7a3519..abc87ced31a 100644 --- a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.txt +++ b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.txt @@ -4,7 +4,7 @@ public final class Outer { public constructor Outer() public final fun bar(/*0*/ x: Outer.Nested): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ x: Outer.Inner, /*1*/ y: [ERROR : Inner], /*2*/ z: Outer.Inner): kotlin.Unit + public final fun foo(/*0*/ x: Outer.Inner, /*1*/ y: [Error type: Type for error type constructor (Inner)], /*2*/ z: Outer.Inner): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedTypesResolution.txt b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedTypesResolution.txt index bc1e58a68ae..4333fe4ce04 100644 --- a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedTypesResolution.txt +++ b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedTypesResolution.txt @@ -1,13 +1,13 @@ package -public fun error1(): [ERROR : Inner3] -public fun error2(): [ERROR : Inner2] -public fun error3(): [ERROR : Inner3] -public fun error4(): [ERROR : Inner4] -public fun error5(): [ERROR : Inner5] -public fun error6(): [ERROR : Inner5] -public fun error7(): [ERROR : Inner5] -public fun errorTypeWithArguments(): [ERROR : Q.W.R.M] +public fun error1(): [Error type: Type for error type constructor (Inner3)] +public fun error2(): [Error type: Type for error type constructor (Inner2)] +public fun error3(): [Error type: Type for error type constructor (Inner3)] +public fun error4(): [Error type: Type for error type constructor (Inner4)] +public fun error5(): [Error type: Type for error type constructor (Inner5)] +public fun error6(): [Error type: Type for error type constructor (Inner5)] +public fun error7(): [Error type: Type for error type constructor (Inner5)] +public fun errorTypeWithArguments(): [Error type: Unresolved type for Q.W.R.M] public fun ok1(): test.Outer.Inner.Inner2 public fun ok2(): test.Outer.Inner.Inner2 public fun ok22(): test.Outer.Inner.Inner3 diff --git a/compiler/testData/diagnostics/tests/generics/kt30590.ni.txt b/compiler/testData/diagnostics/tests/generics/kt30590.ni.txt index 7da0b4336a1..05856740265 100644 --- a/compiler/testData/diagnostics/tests/generics/kt30590.ni.txt +++ b/compiler/testData/diagnostics/tests/generics/kt30590.ni.txt @@ -1,7 +1,7 @@ package public fun emptyStrangeMap(): kotlin.collections.Map -public fun test(): [ERROR : Error function type] +public fun test(): [Error type: Return type for function cannot be resolved] public fun test7(): kotlin.collections.Map public interface A { diff --git a/compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.txt b/compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.txt index f86d2217848..d7494fb5dec 100644 --- a/compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.txt +++ b/compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.txt @@ -3,7 +3,7 @@ package package a { public interface A { - public abstract val a: [ERROR : A] + public abstract val a: [Error type: Unresolved type for A] public abstract val b: a.A public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.txt b/compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.txt index cf189d3a3d4..4757e363b16 100644 --- a/compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.txt +++ b/compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.txt @@ -27,6 +27,6 @@ public final class NotImported { package pkg { public val v: Klass.Nested - public val x: [ERROR : NotImported] + public val x: [Error type: Unresolved type for NotImported] public fun foo(): Klass } diff --git a/compiler/testData/diagnostics/tests/imports/NestedClassClash.txt b/compiler/testData/diagnostics/tests/imports/NestedClassClash.txt index a3855afaaf8..4bb8f313ade 100644 --- a/compiler/testData/diagnostics/tests/imports/NestedClassClash.txt +++ b/compiler/testData/diagnostics/tests/imports/NestedClassClash.txt @@ -1,7 +1,7 @@ package -public fun test(/*0*/ b: [ERROR : B]): kotlin.Unit -public fun test2(/*0*/ b: [ERROR : B]): kotlin.Unit +public fun test(/*0*/ b: [Error type: Unresolved type for B]): kotlin.Unit +public fun test2(/*0*/ b: [Error type: Unresolved type for B]): kotlin.Unit package a { diff --git a/compiler/testData/diagnostics/tests/imports/RenameOnImport.txt b/compiler/testData/diagnostics/tests/imports/RenameOnImport.txt index caf1b5076f7..20bb7b24c6c 100644 --- a/compiler/testData/diagnostics/tests/imports/RenameOnImport.txt +++ b/compiler/testData/diagnostics/tests/imports/RenameOnImport.txt @@ -12,5 +12,5 @@ package b { package c { public val v1: kotlin.Int = 1 public val v2: kotlin.String = "" - public val v3: [ERROR : Type for y] + public val v3: [Error type: Not found recorded type for y] } diff --git a/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.txt b/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.txt index 61e87caeda3..838962e6fd4 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.txt @@ -1,7 +1,7 @@ package package a { - public fun bar(/*0*/ i: kotlin.Int, /*1*/ a: [ERROR : U]): kotlin.Unit + public fun bar(/*0*/ i: kotlin.Int, /*1*/ a: [Error type: Unresolved type for U]): kotlin.Unit public inline fun comparator(/*0*/ fn: (T, T) -> kotlin.Int): java.util.Comparator public fun foo(): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.txt b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.txt index 00d475a9b9e..7e3fc75f397 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.txt @@ -1,4 +1,4 @@ package public fun test1(): kotlin.Unit -public fun test2(/*0*/ l: kotlin.collections.List<[ERROR : AA]>): kotlin.Unit +public fun test2(/*0*/ l: kotlin.collections.List<[Error type: Unresolved type for AA]>): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/declarationAfterDotSelectorExpected.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/declarationAfterDotSelectorExpected.txt index d07be9fe3dd..dd7df57adf9 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/declarationAfterDotSelectorExpected.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/declarationAfterDotSelectorExpected.txt @@ -4,13 +4,13 @@ public fun foo(/*0*/ x: kotlin.Any): kotlin.Unit public final class A { public constructor A() - public final var a: [ERROR : Type for 24.] + public final var a: [Error type: Not found recorded type for 24.] public final var b: kotlin.Double - public final val q: [ERROR : Type for "c". + public final val q: [Error type: Not found recorded type for "c". fun String.() = 6] public final val x: kotlin.Int = 4 - public final val y: [ERROR : Type for "b".] - public final val z: [ERROR : Type for "a".] + public final val y: [Error type: Not found recorded type for "b".] + public final val z: [Error type: Not found recorded type for "a".] public final fun baz(): kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/declarationAfterIncompleteElvis.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/declarationAfterIncompleteElvis.txt index c193d4d17a5..96feaeaa266 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/declarationAfterIncompleteElvis.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/declarationAfterIncompleteElvis.txt @@ -6,8 +6,8 @@ public final class A { public constructor A() public final val q: kotlin.String.() -> kotlin.Int public final val x: kotlin.Int = 4 - public final val y: [ERROR : Type for null ?:] - public final val z: [ERROR : Type for null ?:] + public final val y: [Error type: Not found recorded type for null ?:] + public final val z: [Error type: Not found recorded type for null ?:] public final fun baz(): kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funEquals.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funEquals.txt index 27fda0d0051..3d06577ab92 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funEquals.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funEquals.txt @@ -1,3 +1,3 @@ package -public fun foo(): [ERROR : No type, no body] +public fun foo(): [Error type: Return type for foo cannot be resolved] diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt index 7aa1cdcece7..a7852f4e946 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.txt @@ -1,9 +1,9 @@ package -public final class A : ([ERROR : No type element]) -> [ERROR : No type element] { +public final class A : ([Error type: No type specified for unknown element]) -> [Error type: No type specified for unknown element] { public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: [ERROR : No type element]): [ERROR : No type element] + public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: [Error type: No type specified for unknown element]): [Error type: No type specified for unknown element] public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteVal.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteVal.txt index 1add37f180e..d17e0dd7f76 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteVal.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteVal.txt @@ -1,5 +1,5 @@ package package c { - public val i: [ERROR : No type, no body] + public val i: [Error type: Return type for property i cannot be resolved] } diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt index bc042c02228..6fe20d1957b 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.txt @@ -2,11 +2,11 @@ package package typeReferenceError { - public final class Pair : ([ERROR : No type element]) -> [ERROR : main] { + public final class Pair : ([Error type: No type specified for unknown element]) -> [Error type: Unresolved type for main] { public constructor Pair() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: [ERROR : No type element]): [ERROR : main] + public abstract override /*1*/ /*fake_override*/ fun invoke(/*0*/ p1: [Error type: No type specified for unknown element]): [Error type: Unresolved type for main] public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } } diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/valNoName.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/valNoName.txt index 2696631fa2e..30bac61a69e 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/valNoName.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/valNoName.txt @@ -1,15 +1,16 @@ package -public val ``: [ERROR : No type, no body] -public var ``: [ERROR : No type, no body] +public val ``: [Error type: Return type for property cannot be resolved] +public var ``: [Error type: Return type for property cannot be resolved] public fun baz(): kotlin.Unit public fun foo(): kotlin.Unit public final class A { - public constructor A(/*0*/ ``: [ERROR : Type annotation was missing for parameter ], /*1*/ x: kotlin.Int, /*2*/ private: [ERROR : Type annotation was missing for parameter private], /*3*/ z: kotlin.Int, /*4*/ ``: [ERROR : Type annotation was missing for parameter ]) - public final val ``: [ERROR : Annotation is absent] - public final val ``: [ERROR : Annotation is absent] - public final val private: [ERROR : Annotation is absent] + public constructor A(/*0*/ ``: [Error type: Missed a type for a value parameter ], /*1*/ x: kotlin.Int, /*2*/ private: [Error type: Missed a type for a value parameter private], /*3*/ z: kotlin.Int, /*4*/ ``: [Error type: Missed a type for a value parameter ]) + public final val ``: [Error type: No type specified for val] + public final val ``: [Error type: No type specified for val] + public final val private: [Error type: No type specified for val + private] public final val x: kotlin.Int public final val z: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -19,7 +20,7 @@ public final class A { public final class B { public constructor B() - public final val ``: [ERROR : No type, no body] + public final val ``: [Error type: Return type for property cannot be resolved] public final fun bar(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final fun foo(): kotlin.Unit @@ -28,10 +29,11 @@ public final class B { } public final class C { - public constructor C(/*0*/ ``: [ERROR : Type annotation was missing for parameter ], /*1*/ x: kotlin.Int, /*2*/ private: [ERROR : Type annotation was missing for parameter private], /*3*/ z: kotlin.Int, /*4*/ ``: [ERROR : Type annotation was missing for parameter ]) - public final var ``: [ERROR : Annotation is absent] - public final var ``: [ERROR : Annotation is absent] - public final var private: [ERROR : Annotation is absent] + public constructor C(/*0*/ ``: [Error type: Missed a type for a value parameter ], /*1*/ x: kotlin.Int, /*2*/ private: [Error type: Missed a type for a value parameter private], /*3*/ z: kotlin.Int, /*4*/ ``: [Error type: Missed a type for a value parameter ]) + public final var ``: [Error type: No type specified for var] + public final var ``: [Error type: No type specified for var] + public final var private: [Error type: No type specified for var + private] public final val x: kotlin.Int public final val z: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -41,7 +43,7 @@ public final class C { public final class D { public constructor D() - public final var ``: [ERROR : No type, no body] + public final var ``: [Error type: Return type for property cannot be resolved] public final fun bar(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/valWithNoNameBeforeNextDeclarationWithModifiers.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/valWithNoNameBeforeNextDeclarationWithModifiers.txt index ad16f70453d..7889ada7936 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/valWithNoNameBeforeNextDeclarationWithModifiers.txt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/valWithNoNameBeforeNextDeclarationWithModifiers.txt @@ -2,10 +2,10 @@ package public abstract class A { public constructor A() - private final val ``: [ERROR : No type, no body] - private final val ``: [ERROR : No type, no body] - private final val ``: [ERROR : No type, no body] - private final val private: [ERROR : No type, no body] + private final val ``: [Error type: Return type for property cannot be resolved] + private final val ``: [Error type: Return type for property cannot be resolved] + private final val ``: [Error type: Return type for property cannot be resolved] + private final val private: [Error type: Return type for property private cannot be resolved] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final fun foo(): kotlin.Unit private final fun foo1(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.txt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.txt index 3d43b1731a2..1c94f68f4cc 100644 --- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.txt +++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.txt @@ -3,5 +3,5 @@ package package f { public fun h(/*0*/ a: kotlin.Any, /*1*/ i: kotlin.Int, /*2*/ r: R, /*3*/ f: (kotlin.Boolean) -> kotlin.Int): kotlin.Int public fun h(/*0*/ i: kotlin.Int, /*1*/ a: kotlin.Any, /*2*/ r: R, /*3*/ f: (kotlin.Boolean) -> kotlin.Int): kotlin.Int - public fun test(): [ERROR : Error function type] + public fun test(): [Error type: Return type for function cannot be resolved] } diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.txt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.txt index 37ff1155f5f..46354c63ba6 100644 --- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.txt +++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.txt @@ -4,5 +4,5 @@ package f { public fun getAnswer(): kotlin.Int public fun h(/*0*/ f: (kotlin.Boolean) -> R): kotlin.Int public fun h(/*0*/ f: (kotlin.String) -> R): kotlin.Int - public fun test(): [ERROR : Error function type] + public fun test(): [Error type: Return type for function cannot be resolved] } diff --git a/compiler/testData/diagnostics/tests/inference/commonSuperTypeOfTypesWithErrorSupertypes.kt b/compiler/testData/diagnostics/tests/inference/commonSuperTypeOfTypesWithErrorSupertypes.kt index 12e38db8ee4..49e25f791f9 100644 --- a/compiler/testData/diagnostics/tests/inference/commonSuperTypeOfTypesWithErrorSupertypes.kt +++ b/compiler/testData/diagnostics/tests/inference/commonSuperTypeOfTypesWithErrorSupertypes.kt @@ -8,7 +8,7 @@ interface Foo { fun select(vararg args: S): S = TODO() class BarB> : Foo { - val v = select( + val v = select( getSum(), 42 ) diff --git a/compiler/testData/diagnostics/tests/inference/commonSuperTypeOfTypesWithErrorSupertypes.txt b/compiler/testData/diagnostics/tests/inference/commonSuperTypeOfTypesWithErrorSupertypes.txt index 57f5d5250f2..26aefdfbb63 100644 --- a/compiler/testData/diagnostics/tests/inference/commonSuperTypeOfTypesWithErrorSupertypes.txt +++ b/compiler/testData/diagnostics/tests/inference/commonSuperTypeOfTypesWithErrorSupertypes.txt @@ -2,9 +2,9 @@ package public fun select(/*0*/ vararg args: S /*kotlin.Array*/): S -public final class Bar : Foo { - public constructor Bar() - public final val v: [ERROR : from type constructor([ERROR : Cyclic upper bounds])] +public final class Bar : Foo { + public constructor Bar() + public final val v: [Error type: Resolution error type (from type constructor [Error type: Cyclic upper bounds])] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun getSum(): B public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inference/completion/postponedArgumentsAnalysis/basic.kt b/compiler/testData/diagnostics/tests/inference/completion/postponedArgumentsAnalysis/basic.kt index 642ef541461..655dff3faab 100644 --- a/compiler/testData/diagnostics/tests/inference/completion/postponedArgumentsAnalysis/basic.kt +++ b/compiler/testData/diagnostics/tests/inference/completion/postponedArgumentsAnalysis/basic.kt @@ -184,7 +184,7 @@ fun main() { java.io.Serializable")!>select(A3(), { it }, { a -> a }) ")!>select(A3(), ")!>A3::foo1) // Should be error as `A3::foo1` is `KFunction2`, but the remaining arguments are `KFuncion1` or `Function1` - ")!>select(A3(), ")!>A3::foo1, { a -> ]")!>a }, { it -> ]")!>it }) + ")!>select(A3(), ")!>A3::foo1, { a -> a }, { it -> it }) // It's OK because `A3::foo2` is from companion of `A3` kotlin.Any")!>select(A3(), ")!>A3::foo2, { a -> a }, { it -> it }) {Comparable<*> & java.io.Serializable}")!>select(A4(), { x: Number -> "" }) @@ -192,10 +192,10 @@ fun main() { kotlin.Float")!>select(A2(), id { a, b, c -> a; b; c }) java.io.Serializable")!>select(id(A3()), { it }, { a -> a }) ")!>select(A3(), id(")!>A3::foo1)) - ")!>select(A3(), ")!>A3::foo1, id { a -> ]")!>a }, { it -> ]")!>it }) - ")!>select(A3(), ")!>A3::foo1, { a -> ]")!>a }, id { it -> ]")!>it }) - ")!>select(id(A3()), id(")!>A3::foo1), { a -> ]")!>a }, { it -> ]")!>it }) - ")!>select(id(A3()), id(")!>A3::foo1), { a -> ]")!>a }, id { it -> ]")!>it }) + ")!>select(A3(), ")!>A3::foo1, id { a -> a }, { it -> it }) + ")!>select(A3(), ")!>A3::foo1, { a -> a }, id { it -> it }) + ")!>select(id(A3()), id(")!>A3::foo1), { a -> a }, { it -> it }) + ")!>select(id(A3()), id(")!>A3::foo1), { a -> a }, id { it -> it }) // If lambdas' parameters are specified explicitly, we don't report an error, because there is proper CST – Function ")!>select(id(A3()), id(")!>A3::foo1), { a: Number -> a }) ")!>select(id(A3()), id(")!>A3::foo1), id { a: Number -> a }) diff --git a/compiler/testData/diagnostics/tests/inference/completion/postponedArgumentsAnalysis/notInferableParameterOfAnonymousFunction.kt b/compiler/testData/diagnostics/tests/inference/completion/postponedArgumentsAnalysis/notInferableParameterOfAnonymousFunction.kt index 59bb7b4438e..0ba974cd9af 100644 --- a/compiler/testData/diagnostics/tests/inference/completion/postponedArgumentsAnalysis/notInferableParameterOfAnonymousFunction.kt +++ b/compiler/testData/diagnostics/tests/inference/completion/postponedArgumentsAnalysis/notInferableParameterOfAnonymousFunction.kt @@ -4,13 +4,13 @@ fun select(vararg x: T) = x[0] fun id(x: K) = x fun main() { - val x1 = select(id { x, y -> }, { x: Int, y -> }) + val x1 = select(id { x, y -> }, { x: Int, y -> }) val x2 = select(id { x, y -> }, { x: Int, y -> }) val x3 = select(id(fun (x, y) {}), fun (x: Int, y) {}) val x4 = select((fun (x, y) {}), fun (x: Int, y) {}) - val x5 = select(id(fun (x, y) {}), fun (x: Int, y) {}) + val x5 = select(id(fun (x, y) {}), fun (x: Int, y) {}) val x6 = id(fun (x) {}) select(fun (x) {}, fun (x) {}) diff --git a/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInReturnPosition.txt b/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInReturnPosition.txt index bed2d0a0577..c6205951c56 100644 --- a/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInReturnPosition.txt +++ b/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInReturnPosition.txt @@ -150,8 +150,8 @@ public final class Main { public final val x164: Bar public final val x170: Bar public final val x171: Bar - public final val x180: [ERROR : ] - public final val x181: [ERROR : ] + public final val x180: [Error type: Return type for function cannot be resolved] + public final val x181: [Error type: Return type for function cannot be resolved] public final val x20: Foo> public final val x200: L public final val x201: L diff --git a/compiler/testData/diagnostics/tests/inference/constraints/errorUpperBoundConstraint.txt b/compiler/testData/diagnostics/tests/inference/constraints/errorUpperBoundConstraint.txt index c6adb9614d4..99a56f30513 100644 --- a/compiler/testData/diagnostics/tests/inference/constraints/errorUpperBoundConstraint.txt +++ b/compiler/testData/diagnostics/tests/inference/constraints/errorUpperBoundConstraint.txt @@ -1,6 +1,6 @@ package -public fun test(/*0*/ e: [ERROR : ErrorType]): kotlin.Unit +public fun test(/*0*/ e: [Error type: Unresolved type for ErrorType]): kotlin.Unit public open class Foo { public constructor Foo() diff --git a/compiler/testData/diagnostics/tests/inference/kt11963.txt b/compiler/testData/diagnostics/tests/inference/kt11963.txt index 2c8d728bfb1..3128a6cd8c7 100644 --- a/compiler/testData/diagnostics/tests/inference/kt11963.txt +++ b/compiler/testData/diagnostics/tests/inference/kt11963.txt @@ -1,3 +1,3 @@ package -public val abc: [ERROR : No type, no body] +public val abc: [Error type: Return type for property abc cannot be resolved] diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionLocations.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionLocations.kt index 62356758c2c..ea754ea3174 100644 --- a/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionLocations.kt +++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionLocations.kt @@ -6,7 +6,7 @@ fun test() { ")!>testIn() ")!>testOut() >")!>testStarProjection() - testErrorType() + testErrorType() ")!>testInProjection() ")!>testOutProjection() >>")!>testDeeplyNested() diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionLocations.txt b/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionLocations.txt index b69976ad150..fc6a44c897a 100644 --- a/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionLocations.txt +++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionLocations.txt @@ -6,7 +6,7 @@ public fun makeOutProjection(/*0*/ arg: O): Inv public fun makeStarProjection(): Inv<*> public fun test(): kotlin.Unit public fun testDeeplyNested(): Inv>> -public fun testErrorType(): [ERROR : Error function type] +public fun testErrorType(): [Error type: Return type for function cannot be resolved] public fun testIn(): In public fun testInProjection(): Inv public fun testInv(): Inv diff --git a/compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes/recursiveTypeWithTwoTypeParams.kt b/compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes/recursiveTypeWithTwoTypeParams.kt index 42901bb42b5..e401b2d72d7 100644 --- a/compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes/recursiveTypeWithTwoTypeParams.kt +++ b/compiler/testData/diagnostics/tests/inference/recursiveTypes/selfTypes/disabledInferenceOnSelfTypes/recursiveTypeWithTwoTypeParams.kt @@ -6,5 +6,5 @@ interface BodySpec> { fun test(b: BodySpec) { val x = b.isEqualTo("") - x + x } diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt34029.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt34029.txt index 1efd47201de..9b3fe381b14 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/kt34029.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/kt34029.txt @@ -1,7 +1,7 @@ package public val foo1: MyClass.MyObject -public val foo2: [ERROR : Type for MyClass.MyObject] +public val foo2: [Error type: Not found recorded type for MyClass.MyObject] public open class MyClass { public constructor MyClass() diff --git a/compiler/testData/diagnostics/tests/inference/regressions/noRecursionOnCallingPureKotlinFunctionAsSyntheticJavaAccessor.txt b/compiler/testData/diagnostics/tests/inference/regressions/noRecursionOnCallingPureKotlinFunctionAsSyntheticJavaAccessor.txt index 2327e56c33f..12211829977 100644 --- a/compiler/testData/diagnostics/tests/inference/regressions/noRecursionOnCallingPureKotlinFunctionAsSyntheticJavaAccessor.txt +++ b/compiler/testData/diagnostics/tests/inference/regressions/noRecursionOnCallingPureKotlinFunctionAsSyntheticJavaAccessor.txt @@ -3,7 +3,7 @@ package public final class B { public constructor B() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun getA(): [ERROR : Error function type] + public final fun getA(): [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.txt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.txt index ec9ccb8f0a7..65dc48fb645 100644 --- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.txt +++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.txt @@ -1,7 +1,7 @@ package package aa { - public fun bar(/*0*/ f: ([ERROR : A]) -> kotlin.Unit): kotlin.Unit + public fun bar(/*0*/ f: ([Error type: Unresolved type for A]) -> kotlin.Unit): kotlin.Unit public fun foo(/*0*/ block: (T) -> R): (T) -> R public fun test1(): kotlin.Unit public fun test2(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/inference/underscoredTypeInForbiddenPositions.txt b/compiler/testData/diagnostics/tests/inference/underscoredTypeInForbiddenPositions.txt index 20fe034b2a6..0d27978bca4 100644 --- a/compiler/testData/diagnostics/tests/inference/underscoredTypeInForbiddenPositions.txt +++ b/compiler/testData/diagnostics/tests/inference/underscoredTypeInForbiddenPositions.txt @@ -2,10 +2,10 @@ package public fun bar(): Foo<_> public fun foo(/*0*/ x: (K) -> T): kotlin.Pair -public fun foo1(/*0*/ x: [ERROR : _]): kotlin.Unit -public fun foo2(/*0*/ x: Foo<[ERROR : _]>): kotlin.Unit -public fun foo3(): [ERROR : _] -public fun foo5(): Foo<[ERROR : _]> +public fun foo1(/*0*/ x: [Error type: Unresolved type for _]): kotlin.Unit +public fun foo2(/*0*/ x: Foo<[Error type: Unresolved type for _]>): kotlin.Unit +public fun foo3(): [Error type: Unresolved type for _] +public fun foo5(): Foo<[Error type: Unresolved type for _]> public fun foo6(): Foo<_> public fun foo7(): Foo<_> public fun test(): kotlin.Unit @@ -17,7 +17,7 @@ public final class AA1 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public final class AA2 : Foo<[ERROR : _]> { +public final class AA2 : Foo<[Error type: Unresolved type for _]> { public constructor AA2() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -39,8 +39,8 @@ public final class Bar0 { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public final class Bar1> { - public constructor Bar1>() +public final class Bar1> { + public constructor Bar1>() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -74,7 +74,8 @@ public final class Foo { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } public typealias A1 = _ -public typealias A2 = Foo<[ERROR : _]> -public typealias A3 = ([ERROR : _]) -> T -public typealias A4 = (T) -> () -> [ERROR : _] -public typealias A5 = (T) -> ([ERROR : _]) -> T +public typealias A2 = Foo<[Error type: Unresolved type for _]> +public typealias A3 = ([Error type: Unresolved type for _]) -> T +public typealias A4 = (T) -> () -> [Error type: Unresolved type for _] +public typealias A5 = (T) -> ([Error type: Unresolved type for _]) -> T + diff --git a/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.txt b/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.txt index 55358c7f94b..98b38bbfd5c 100644 --- a/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.txt +++ b/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.txt @@ -51,7 +51,7 @@ public final class TestPCParameters : Super { public final val y: kotlin.Int public final var z: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): [ERROR : Error function type] + public final fun foo(): [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/inlineClasses/unsignedLiteralsWithoutArtifactOnClasspath.txt b/compiler/testData/diagnostics/tests/inlineClasses/unsignedLiteralsWithoutArtifactOnClasspath.txt index 1fd389d53fc..2e81ac078d2 100644 --- a/compiler/testData/diagnostics/tests/inlineClasses/unsignedLiteralsWithoutArtifactOnClasspath.txt +++ b/compiler/testData/diagnostics/tests/inlineClasses/unsignedLiteralsWithoutArtifactOnClasspath.txt @@ -1,5 +1,5 @@ package -public val u1: [ERROR : Type cannot be resolved. Please make sure you have the required dependencies for unsigned types in the classpath] -public val u2: [ERROR : Type cannot be resolved. Please make sure you have the required dependencies for unsigned types in the classpath] -public val u3: [ERROR : Type cannot be resolved. Please make sure you have the required dependencies for unsigned types in the classpath] +public val u1: [Error type: Error constant value Type cannot be resolved. Please make sure you have the required dependencies for unsigned types in the classpath] +public val u2: [Error type: Error constant value Type cannot be resolved. Please make sure you have the required dependencies for unsigned types in the classpath] +public val u3: [Error type: Error constant value Type cannot be resolved. Please make sure you have the required dependencies for unsigned types in the classpath] diff --git a/compiler/testData/diagnostics/tests/inner/constructorAccess.txt b/compiler/testData/diagnostics/tests/inner/constructorAccess.txt index 7ab49a4bf2c..587619d54ee 100644 --- a/compiler/testData/diagnostics/tests/inner/constructorAccess.txt +++ b/compiler/testData/diagnostics/tests/inner/constructorAccess.txt @@ -40,7 +40,7 @@ public final class Outer1 { public final class C5 { public constructor C5() - public final val b: [ERROR : Type for Inner()] + public final val b: [Error type: Not found recorded type for Inner()] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -103,7 +103,7 @@ public final class Outer2 { public final class Nested { public constructor Nested() - public final fun bar(): [ERROR : Error function type] + public final fun bar(): [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final fun foo(): Outer2 public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt index f613a8fead2..79d4bbb6d1e 100644 --- a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt +++ b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.txt @@ -38,7 +38,7 @@ public final class TestSome { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public companion object Companion : SomeClass<[ERROR : P]> { + public companion object Companion : SomeClass<[Error type: Unresolved type for P]> { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.txt b/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.txt index b9ef2e4e8b1..f0730cc28d4 100644 --- a/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.txt +++ b/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.txt @@ -38,7 +38,7 @@ public final class TestSome { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public object Some : SomeClass<[ERROR : P]> { + public object Some : SomeClass<[Error type: Unresolved type for P]> { private constructor Some() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/inner/innerThisSuper.ni.txt b/compiler/testData/diagnostics/tests/inner/innerThisSuper.ni.txt index 21856dbc5a7..d4771cea9e7 100644 --- a/compiler/testData/diagnostics/tests/inner/innerThisSuper.ni.txt +++ b/compiler/testData/diagnostics/tests/inner/innerThisSuper.ni.txt @@ -18,16 +18,16 @@ public final class Outer : Trait { public final class Nested { public constructor Nested() - public final val s: [ERROR : ] - public final val t: [ERROR : ] + public final val s: [Error type: Return type for function cannot be resolved] + public final val t: [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final inner class NestedInner { public constructor NestedInner() - public final val s: [ERROR : ] - public final val t: [ERROR : ] + public final val s: [Error type: Return type for function cannot be resolved] + public final val t: [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.ni.txt b/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.ni.txt index f426fc18b7c..0557423ca39 100644 --- a/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.ni.txt +++ b/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.ni.txt @@ -33,11 +33,11 @@ public final class Outer { public final class Nested { public constructor Nested() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun f(): [ERROR : Error function type] - public final fun g(): [ERROR : Error function type] - public final fun h(): [ERROR : ] + public final fun f(): [Error type: Return type for function cannot be resolved] + public final fun g(): [Error type: Return type for function cannot be resolved] + public final fun h(): [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final fun i(): [ERROR : ] + public final fun i(): [Error type: Error property type] public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } } diff --git a/compiler/testData/diagnostics/tests/inner/outerGenericParam.txt b/compiler/testData/diagnostics/tests/inner/outerGenericParam.txt index c45f9658229..eac6c9a7497 100644 --- a/compiler/testData/diagnostics/tests/inner/outerGenericParam.txt +++ b/compiler/testData/diagnostics/tests/inner/outerGenericParam.txt @@ -17,7 +17,7 @@ public final class Outer { public final class Nested { public constructor Nested() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ t: [ERROR : T]): [ERROR : T] + public final fun foo(/*0*/ t: [Error type: Unresolved type for T]): [Error type: Unresolved type for T] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.txt b/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.txt index 2383e74acca..f1c2058afd7 100644 --- a/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.txt +++ b/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.txt @@ -17,7 +17,7 @@ public final class Derived : Base { public final class Nested { public constructor Nested() - public final fun bar(): [ERROR : Error function type] + public final fun bar(): [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.txt index a048dd7182f..1bb731aaa45 100644 --- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.txt +++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.txt @@ -3,8 +3,8 @@ package public fun f1(): Outer public fun f2(): Outer.Nested public fun f3(): Outer.Nested.NestedNested -public fun f4(): [ERROR : Error function type] -public fun f5(): [ERROR : Error function type] +public fun f4(): [Error type: Return type for function cannot be resolved] +public fun f5(): [Error type: Return type for function cannot be resolved] public fun f6(): Outer.Inner public fun f7(): Outer.Inner.InnerInner diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.ni.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.ni.txt index 817b72a1d17..d370b99f7e2 100644 --- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.ni.txt +++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.ni.txt @@ -1,8 +1,8 @@ package -public fun manyArguments(): [ERROR : Error function type] +public fun manyArguments(): [Error type: Return type for function cannot be resolved] public fun nested(): Outer.Nested -public fun noArguments(): [ERROR : Error function type] +public fun noArguments(): [Error type: Return type for function cannot be resolved] public fun noArgumentsExpectedType(): Outer.Nested public final class Outer { diff --git a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt index aaf99a9cd91..266316cba23 100644 --- a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt +++ b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt @@ -6,7 +6,7 @@ public final class Test { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - @[ERROR : ClassObjectAnnotation] /* annotation class not found */ @Test.NestedAnnotation public companion object Companion { + @[Error type: Unresolved type for ClassObjectAnnotation] /* annotation class not found */ @Test.NestedAnnotation public companion object Companion { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.txt b/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.txt index bf9fc111836..e08fe3a5a8e 100644 --- a/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.txt +++ b/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.txt @@ -11,7 +11,7 @@ public final class Foo { public final val bar: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final fun test(/*0*/ a: [ERROR : Foo.`object`]): kotlin.Unit + public final fun test(/*0*/ a: [Error type: Unresolved type for Foo.`object`]): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } } diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.txt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.txt index 84946d18c31..46af7ba5d8b 100644 --- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.txt +++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.txt @@ -3,7 +3,7 @@ package public fun foo(): C public open class C { - public constructor C(/*0*/ t: T!) + public constructor C(/*0*/ t: T!) public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/j+k/recursionWithJavaSyntheticProperty.txt b/compiler/testData/diagnostics/tests/j+k/recursionWithJavaSyntheticProperty.txt index 6b6931497e2..54d4d96861d 100644 --- a/compiler/testData/diagnostics/tests/j+k/recursionWithJavaSyntheticProperty.txt +++ b/compiler/testData/diagnostics/tests/j+k/recursionWithJavaSyntheticProperty.txt @@ -3,7 +3,7 @@ package public final class A : X { public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - protected open override /*1*/ fun getFoo(): [ERROR : Error function type] + protected open override /*1*/ fun getFoo(): [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound2.txt b/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound2.txt index 90f0caed94c..76f323cdca9 100644 --- a/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound2.txt +++ b/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound2.txt @@ -1,10 +1,10 @@ package -public fun main(/*0*/ xyz: XYZ<*>): XYZ<(raw) [ERROR : Cyclic upper bounds]>! +public fun main(/*0*/ xyz: XYZ<*>): XYZ<(raw) [Error type: Cyclic upper bounds]>! -public interface XYZ { +public interface XYZ { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(): XYZ<(raw) [ERROR : Cyclic upper bounds]>! + public abstract fun foo(): XYZ<(raw) [Error type: Cyclic upper bounds]>! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.txt b/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.txt index d55cd2baae0..cc4f5cabb02 100644 --- a/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.txt +++ b/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.txt @@ -1,10 +1,10 @@ package -public fun main(/*0*/ xyz: XYZ<*, *, *>): XYZ<(raw) [ERROR : Cyclic upper bounds], (raw) [ERROR : Cyclic upper bounds], (raw) [ERROR : Cyclic upper bounds]>! +public fun main(/*0*/ xyz: XYZ<*, *, *>): XYZ<(raw) [Error type: Cyclic upper bounds], (raw) [Error type: Cyclic upper bounds], (raw) [Error type: Cyclic upper bounds]>! -public interface XYZ { +public interface XYZ { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(): XYZ<(raw) [ERROR : Cyclic upper bounds], (raw) [ERROR : Cyclic upper bounds], (raw) [ERROR : Cyclic upper bounds]>! + public abstract fun foo(): XYZ<(raw) [Error type: Cyclic upper bounds], (raw) [Error type: Cyclic upper bounds], (raw) [Error type: Cyclic upper bounds]>! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/javac/imports/AllUnderImportsAmbiguity.txt b/compiler/testData/diagnostics/tests/javac/imports/AllUnderImportsAmbiguity.txt index 7ce7b375630..a845e863ffd 100644 --- a/compiler/testData/diagnostics/tests/javac/imports/AllUnderImportsAmbiguity.txt +++ b/compiler/testData/diagnostics/tests/javac/imports/AllUnderImportsAmbiguity.txt @@ -21,7 +21,7 @@ package b { } package c { - public fun test(): [ERROR : x] + public fun test(): [Error type: Unresolved type for x] public open class d { public constructor d() diff --git a/compiler/testData/diagnostics/tests/javac/inheritance/InheritedInner2.txt b/compiler/testData/diagnostics/tests/javac/inheritance/InheritedInner2.txt index 077820baeec..a0b09dcac66 100644 --- a/compiler/testData/diagnostics/tests/javac/inheritance/InheritedInner2.txt +++ b/compiler/testData/diagnostics/tests/javac/inheritance/InheritedInner2.txt @@ -2,7 +2,7 @@ package package a { public fun test1(): a.x.S.B! - public fun test2(): [ERROR : Error function type] + public fun test2(): [Error type: Return type for function cannot be resolved] public fun test3(): kotlin.String! public open class x { diff --git a/compiler/testData/diagnostics/tests/javac/qualifiedExpression/visibleClassVsQualifiedClass.txt b/compiler/testData/diagnostics/tests/javac/qualifiedExpression/visibleClassVsQualifiedClass.txt index b31ea49b02d..b3791f03253 100644 --- a/compiler/testData/diagnostics/tests/javac/qualifiedExpression/visibleClassVsQualifiedClass.txt +++ b/compiler/testData/diagnostics/tests/javac/qualifiedExpression/visibleClassVsQualifiedClass.txt @@ -13,7 +13,7 @@ package a { } package other { - public fun test(/*0*/ a_: [ERROR : a.b]): kotlin.Unit + public fun test(/*0*/ a_: [Error type: Unresolved type for a.b]): kotlin.Unit public final class a { public constructor a() diff --git a/compiler/testData/diagnostics/tests/modifiers/const/types.txt b/compiler/testData/diagnostics/tests/modifiers/const/types.txt index 509e14d4697..86d5d11b4d3 100644 --- a/compiler/testData/diagnostics/tests/modifiers/const/types.txt +++ b/compiler/testData/diagnostics/tests/modifiers/const/types.txt @@ -7,9 +7,9 @@ public const val intArrayConst: kotlin.IntArray public const val intConst: kotlin.Int = 1 public const val longConst: kotlin.Long = 1.toLong() public const val stringConst: kotlin.String = "empty" -public const val unresolvedConst1: [ERROR : Type for Unresolved] -public const var unresolvedConst2: [ERROR : Type for Unresolved] -public const val unresolvedConst3: [ERROR : Type for Unresolved] +public const val unresolvedConst1: [Error type: Not found recorded type for Unresolved] +public const var unresolvedConst2: [Error type: Not found recorded type for Unresolved] +public const val unresolvedConst3: [Error type: Not found recorded type for Unresolved] public final enum class MyEnum : kotlin.Enum { enum entry A diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt index e709e60a9ae..5fccedb393d 100644 --- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt +++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt @@ -12,7 +12,7 @@ package p { public final class M1 { public constructor M1() - public final val a: [ERROR : A] + public final val a: [Error type: Type for error type constructor (A)] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -23,7 +23,7 @@ package p { package package p { - public fun foo(/*0*/ a: [ERROR : A]): kotlin.Unit + public fun foo(/*0*/ a: [Error type: Type for error type constructor (A)]): kotlin.Unit public final class A { public constructor A() diff --git a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt index 4a92e816676..76b3579ec68 100644 --- a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt +++ b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt @@ -43,6 +43,6 @@ package p3 { // -- Module: -- package -public fun test(/*0*/ a: [ERROR : A]): kotlin.Unit +public fun test(/*0*/ a: [Error type: Unresolved type for A]): kotlin.Unit public fun test(/*0*/ a: p2.A): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt index 25c51bd6b37..c8c53e628ee 100644 --- a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt +++ b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt @@ -43,6 +43,6 @@ package p3 { // -- Module: -- package -public fun test(/*0*/ a: [ERROR : A]): kotlin.Unit +public fun test(/*0*/ a: [Error type: Unresolved type for A]): kotlin.Unit public fun test(/*0*/ a: p2.A): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.txt index 5b9d01569d1..3e629184441 100644 --- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.txt +++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.txt @@ -1,6 +1,6 @@ package package a { - public fun bar(): [ERROR : Error function type] + public fun bar(): [Error type: Return type for function cannot be resolved] public fun foo(): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.txt b/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.txt index 276a19a21b0..5baee42eb24 100644 --- a/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.txt +++ b/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.txt @@ -1,6 +1,6 @@ package -public fun bar(): [ERROR : Error function type] +public fun bar(): [Error type: Return type for function cannot be resolved] public fun dependOn(/*0*/ x: T): T public fun notNull(): T public fun nullable(): T? diff --git a/compiler/testData/diagnostics/tests/objects/ObjectsLocal.ni.txt b/compiler/testData/diagnostics/tests/objects/ObjectsLocal.ni.txt index 1db96fa7660..3c0d0263110 100644 --- a/compiler/testData/diagnostics/tests/objects/ObjectsLocal.ni.txt +++ b/compiler/testData/diagnostics/tests/objects/ObjectsLocal.ni.txt @@ -1,7 +1,7 @@ package package localObjects { - public val bb: [ERROR : ] + public val bb: [Error type: Return type for function cannot be resolved] public fun test(): kotlin.Unit public object A { diff --git a/compiler/testData/diagnostics/tests/objects/ObjectsNested.txt b/compiler/testData/diagnostics/tests/objects/ObjectsNested.txt index 20e44febe5c..9e551c90db2 100644 --- a/compiler/testData/diagnostics/tests/objects/ObjectsNested.txt +++ b/compiler/testData/diagnostics/tests/objects/ObjectsNested.txt @@ -5,7 +5,7 @@ package nestedObejcts { public val b: nestedObejcts.B public val c: nestedObejcts.A.B public val d: nestedObejcts.A.B.A - public val e: [ERROR : ] + public val e: [Error type: Error property type] public object A { private constructor A() @@ -28,7 +28,7 @@ package nestedObejcts { public final val a: nestedObejcts.A.B.A public final val b: nestedObejcts.A.B public final val x: nestedObejcts.A.B.A - public final val y: [ERROR : Type for this@A] + public final val y: [Error type: Not found recorded type for this@A] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesNew.txt b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesNew.txt index 0e7b838c140..98f5c515e99 100644 --- a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesNew.txt +++ b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesNew.txt @@ -2,23 +2,23 @@ package public final class C : O.B { public constructor C() - public final val a: [ERROR : Type for A::foo] - public final val b: [ERROR : Type for A::foo] + public final val a: [Error type: Not found recorded type for A::foo] + public final val b: [Error type: Not found recorded type for A::foo] public final val c: kotlin.reflect.KFunction1 public final val d: kotlin.reflect.KFunction1 - public final val e: [ERROR : Type for FromCompanionA::foo] - public final val f: [ERROR : Type for FromCompanionB::foo] - public final val g: [ERROR : Type for Alpha::foo] - public final val h: [ERROR : Type for Beta::foo] - public final val i: [ERROR : Type for Gamma::foo] - public final val k: [ERROR : Type for FromAlpha::foo] - public final val l: [ERROR : Type for FromBeta::foo] - public final val m: [ERROR : Type for FromGamma::foo] + public final val e: [Error type: Not found recorded type for FromCompanionA::foo] + public final val f: [Error type: Not found recorded type for FromCompanionB::foo] + public final val g: [Error type: Not found recorded type for Alpha::foo] + public final val h: [Error type: Not found recorded type for Beta::foo] + public final val i: [Error type: Not found recorded type for Gamma::foo] + public final val k: [Error type: Not found recorded type for FromAlpha::foo] + public final val l: [Error type: Not found recorded type for FromBeta::foo] + public final val m: [Error type: Not found recorded type for FromGamma::foo] public final val n: kotlin.reflect.KFunction1 - public final val o: [ERROR : Type for FromCompanionAlpha::foo] - public final val p: [ERROR : Type for FromCompanionBeta::foo] - public final val q: [ERROR : Type for FromCompanionGamma::foo] - public final val r: [ERROR : Type for FromDelta::foo] + public final val o: [Error type: Not found recorded type for FromCompanionAlpha::foo] + public final val p: [Error type: Not found recorded type for FromCompanionBeta::foo] + public final val q: [Error type: Not found recorded type for FromCompanionGamma::foo] + public final val r: [Error type: Not found recorded type for FromDelta::foo] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ fun foo(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOld.txt b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOld.txt index a669e74aa6b..5f7e7651dad 100644 --- a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOld.txt +++ b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOld.txt @@ -2,22 +2,22 @@ package public final class C : O.B { public constructor C() - public final val a: [ERROR : Type for A::foo] - public final val b: [ERROR : Type for A::foo] + public final val a: [Error type: Not found recorded type for A::foo] + public final val b: [Error type: Not found recorded type for A::foo] public final val c: kotlin.reflect.KFunction1 public final val d: kotlin.reflect.KFunction1 public final val e: kotlin.reflect.KFunction1 public final val f: kotlin.reflect.KFunction1 - public final val g: [ERROR : Type for Alpha::foo] - public final val h: [ERROR : Type for Beta::foo] - public final val i: [ERROR : Type for Gamma::foo] + public final val g: [Error type: Not found recorded type for Alpha::foo] + public final val h: [Error type: Not found recorded type for Beta::foo] + public final val i: [Error type: Not found recorded type for Gamma::foo] public final val k: kotlin.reflect.KFunction1 public final val l: kotlin.reflect.KFunction1 public final val m: kotlin.reflect.KFunction1 public final val n: kotlin.reflect.KFunction1 - public final val o: [ERROR : Type for FromCompanionAlpha::foo] - public final val p: [ERROR : Type for FromCompanionBeta::foo] - public final val q: [ERROR : Type for FromCompanionGamma::foo] + public final val o: [Error type: Not found recorded type for FromCompanionAlpha::foo] + public final val p: [Error type: Not found recorded type for FromCompanionBeta::foo] + public final val q: [Error type: Not found recorded type for FromCompanionGamma::foo] public final val r: kotlin.reflect.KFunction1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ fun foo(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectNew.txt b/compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectNew.txt index 2a65af87583..77192eec7a7 100644 --- a/compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectNew.txt +++ b/compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectNew.txt @@ -2,23 +2,23 @@ package public final class C : O.B { public constructor C() - public final val a: [ERROR : A]? - public final val b: [ERROR : B]? + public final val a: [Error type: Unresolved type for A]? + public final val b: [Error type: Unresolved type for B]? public final val c: O.A.FromA? = null public final val d: O.B.FromB? = null - public final val e: [ERROR : FromCompanionA]? - public final val f: [ERROR : FromCompanionB]? - public final val g: [ERROR : Alpha]? - public final val h: [ERROR : Beta]? - public final val i: [ERROR : Gamma]? - public final val k: [ERROR : FromAlpha]? - public final val l: [ERROR : FromBeta]? - public final val m: [ERROR : FromGamma]? + public final val e: [Error type: Unresolved type for FromCompanionA]? + public final val f: [Error type: Unresolved type for FromCompanionB]? + public final val g: [Error type: Unresolved type for Alpha]? + public final val h: [Error type: Unresolved type for Beta]? + public final val i: [Error type: Unresolved type for Gamma]? + public final val k: [Error type: Unresolved type for FromAlpha]? + public final val l: [Error type: Unresolved type for FromBeta]? + public final val m: [Error type: Unresolved type for FromGamma]? public final val n: C.Companion.FromCompanionC? = null - public final val o: [ERROR : FromCompanionAlpha]? - public final val p: [ERROR : FromCompanionBeta]? - public final val q: [ERROR : FromCompanionGamma]? - public final val r: [ERROR : FromDelta]? + public final val o: [Error type: Unresolved type for FromCompanionAlpha]? + public final val p: [Error type: Unresolved type for FromCompanionBeta]? + public final val q: [Error type: Unresolved type for FromCompanionGamma]? + public final val r: [Error type: Unresolved type for FromDelta]? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectOld.txt b/compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectOld.txt index 25cf5aab348..b01f805294c 100644 --- a/compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectOld.txt +++ b/compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectOld.txt @@ -2,22 +2,22 @@ package public final class C : O.B { public constructor C() - public final val a: [ERROR : A]? - public final val b: [ERROR : B]? + public final val a: [Error type: Unresolved type for A]? + public final val b: [Error type: Unresolved type for B]? public final val c: O.A.FromA? = null public final val d: O.B.FromB? = null public final val e: O.A.Companion.FromCompanionA? = null public final val f: O.B.Companion.FromCompanionB? = null - public final val g: [ERROR : Alpha]? - public final val h: [ERROR : Beta]? - public final val i: [ERROR : Gamma]? + public final val g: [Error type: Unresolved type for Alpha]? + public final val h: [Error type: Unresolved type for Beta]? + public final val i: [Error type: Unresolved type for Gamma]? public final val k: O.Alpha.FromAlpha? = null public final val l: O.Beta.FromBeta? = null public final val m: O.Gamma.FromGamma? = null public final val n: C.Companion.FromCompanionC? = null - public final val o: [ERROR : FromCompanionAlpha]? - public final val p: [ERROR : FromCompanionBeta]? - public final val q: [ERROR : FromCompanionGamma]? + public final val o: [Error type: Unresolved type for FromCompanionAlpha]? + public final val p: [Error type: Unresolved type for FromCompanionBeta]? + public final val q: [Error type: Unresolved type for FromCompanionGamma]? public final val r: Delta.FromDelta? = null public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaNew.txt b/compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaNew.txt index df6243ef39a..da8f82f933d 100644 --- a/compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaNew.txt +++ b/compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaNew.txt @@ -22,7 +22,7 @@ package test { public constructor Derived() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final fun test(/*0*/ javaStaticInTypePosition: [ERROR : Classifier]): kotlin.Unit + public final fun test(/*0*/ javaStaticInTypePosition: [Error type: Unresolved type for Classifier]): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public final class JavaStaticInSupertypeList { diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorNew.txt b/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorNew.txt index 23e30e8a3dd..51a072af38f 100644 --- a/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorNew.txt +++ b/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorNew.txt @@ -2,23 +2,23 @@ package public final class C : O.B { public constructor C() - public final val a: [ERROR : Type for A()] - public final val b: [ERROR : Type for B()] + public final val a: [Error type: Not found recorded type for A()] + public final val b: [Error type: Not found recorded type for B()] public final val c: O.A.FromA public final val d: O.B.FromB - public final val e: [ERROR : Type for FromCompanionA()] - public final val f: [ERROR : Type for FromCompanionB()] - public final val g: [ERROR : Type for Alpha()] - public final val h: [ERROR : Type for Beta()] - public final val i: [ERROR : Type for Gamma()] - public final val k: [ERROR : Type for FromAlpha()] - public final val l: [ERROR : Type for FromBeta()] - public final val m: [ERROR : Type for FromGamma()] + public final val e: [Error type: Not found recorded type for FromCompanionA()] + public final val f: [Error type: Not found recorded type for FromCompanionB()] + public final val g: [Error type: Not found recorded type for Alpha()] + public final val h: [Error type: Not found recorded type for Beta()] + public final val i: [Error type: Not found recorded type for Gamma()] + public final val k: [Error type: Not found recorded type for FromAlpha()] + public final val l: [Error type: Not found recorded type for FromBeta()] + public final val m: [Error type: Not found recorded type for FromGamma()] public final val n: C.Companion.FromCompanionC - public final val o: [ERROR : Type for FromCompanionAlpha()] - public final val p: [ERROR : Type for FromCompanionBeta()] - public final val q: [ERROR : Type for FromCompanionGamma()] - public final val r: [ERROR : Type for FromDelta()] + public final val o: [Error type: Not found recorded type for FromCompanionAlpha()] + public final val p: [Error type: Not found recorded type for FromCompanionBeta()] + public final val q: [Error type: Not found recorded type for FromCompanionGamma()] + public final val r: [Error type: Not found recorded type for FromDelta()] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorOld.txt b/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorOld.txt index 9b990c7cc5e..a41c32e3c41 100644 --- a/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorOld.txt +++ b/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorOld.txt @@ -2,22 +2,22 @@ package public final class C : O.B { public constructor C() - public final val a: [ERROR : Type for A()] - public final val b: [ERROR : Type for B()] + public final val a: [Error type: Not found recorded type for A()] + public final val b: [Error type: Not found recorded type for B()] public final val c: O.A.FromA public final val d: O.B.FromB public final val e: O.A.Companion.FromCompanionA public final val f: O.B.Companion.FromCompanionB - public final val g: [ERROR : Type for Alpha()] - public final val h: [ERROR : Type for Beta()] - public final val i: [ERROR : Type for Gamma()] + public final val g: [Error type: Not found recorded type for Alpha()] + public final val h: [Error type: Not found recorded type for Beta()] + public final val i: [Error type: Not found recorded type for Gamma()] public final val k: O.Alpha.FromAlpha public final val l: O.Beta.FromBeta public final val m: O.Gamma.FromGamma public final val n: C.Companion.FromCompanionC - public final val o: [ERROR : Type for FromCompanionAlpha()] - public final val p: [ERROR : Type for FromCompanionBeta()] - public final val q: [ERROR : Type for FromCompanionGamma()] + public final val o: [Error type: Not found recorded type for FromCompanionAlpha()] + public final val p: [Error type: Not found recorded type for FromCompanionBeta()] + public final val q: [Error type: Not found recorded type for FromCompanionGamma()] public final val r: Delta.FromDelta public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/override/OverrideWithErrors.txt b/compiler/testData/diagnostics/tests/override/OverrideWithErrors.txt index 5b7336e48ad..4473d58ba18 100644 --- a/compiler/testData/diagnostics/tests/override/OverrideWithErrors.txt +++ b/compiler/testData/diagnostics/tests/override/OverrideWithErrors.txt @@ -5,7 +5,7 @@ package test { public open class A { public constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ a: [ERROR : E]): kotlin.Unit + public open fun foo(/*0*/ a: [Error type: Unresolved type for E]): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -13,7 +13,7 @@ package test { public final class B : test.A { public constructor B() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ fun foo(/*0*/ a: [ERROR : E]): kotlin.Unit + public open override /*1*/ fun foo(/*0*/ a: [Error type: Unresolved type for E]): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt index fba60f9d614..5ff35d48929 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt @@ -1,7 +1,7 @@ package public var A: kotlin.String! -public var B: [ERROR : Type from delegate] +public var B: [Error type: Error delegation type for J.staticN] public var C: kotlin.String! public open class J { diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/blockBodyGetter.txt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/blockBodyGetter.txt index cc166f318d5..14a3d84121f 100644 --- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/blockBodyGetter.txt +++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/blockBodyGetter.txt @@ -1,3 +1,3 @@ package -public val x: [ERROR : No type, no body] +public val x: [Error type: Return type for property x cannot be resolved] diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.ni.txt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.ni.txt index 74f05e17888..87451911498 100644 --- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.ni.txt +++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.ni.txt @@ -1,6 +1,6 @@ package -public val x: [ERROR : Error function type] -public val y: [ERROR : Error function type] +public val x: [Error type: Return type for function cannot be resolved] +public val y: [Error type: Return type for function cannot be resolved] public fun bar(): kotlin.collections.List public fun foo(): E diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/primaryConstructorParameter.txt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/primaryConstructorParameter.txt index 10619316db1..3238dd2f642 100644 --- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/primaryConstructorParameter.txt +++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/primaryConstructorParameter.txt @@ -4,10 +4,10 @@ public fun delegateFactory(/*0*/ p: kotlin.Any): Delegate public final class C { public constructor C(/*0*/ p: kotlin.Any, /*1*/ v: kotlin.Any) - public final val test1: [ERROR : Error function type] + public final val test1: [Error type: Return type for function cannot be resolved] public final val test2: kotlin.Any - public final val test4: [ERROR : No type, no body] - public final var test5: [ERROR : No type, no body] + public final val test4: [Error type: Return type for property test4 cannot be resolved] + public final var test5: [Error type: Return type for property test5 cannot be resolved] public final val v: kotlin.Any public final val kotlin.collections.List.test3: kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.ni.txt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.ni.txt index 83c24b9000a..6cd34026e71 100644 --- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.ni.txt +++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.ni.txt @@ -1,17 +1,17 @@ package -public val x: [ERROR : Error function type] +public val x: [Error type: Return type for function cannot be resolved] public fun id(/*0*/ x: E): E public fun l(/*0*/ x: E): kotlin.collections.List public final class A { public constructor A() - public final val a: [ERROR : Error function type] - public final val b: [ERROR : Error function type] - public final val u: [ERROR : Error function type] - public final val y: [ERROR : Error function type] - public final val z1: [ERROR : Error function type] - public final val z2: [ERROR : Error function type] + public final val a: [Error type: Return type for function cannot be resolved] + public final val b: [Error type: Return type for function cannot be resolved] + public final val u: [Error type: Return type for function cannot be resolved] + public final val y: [Error type: Return type for function cannot be resolved] + public final val z1: [Error type: Return type for function cannot be resolved] + public final val z2: [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt index 74b2ba4f0d9..0773895fc6f 100644 --- a/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt +++ b/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt @@ -30,7 +30,7 @@ package a { package package test { - public val x: [ERROR : Type for a.b()] + public val x: [Error type: Not found recorded type for a.b()] public final class a { public constructor a() diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.txt index 75e052a5cd7..85125edb66d 100644 --- a/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.txt +++ b/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.txt @@ -1,11 +1,11 @@ package -public fun test(/*0*/ a: [ERROR : A.]): [ERROR : A.] -public fun test1(/*0*/ a: [ERROR : A.B.]): [ERROR : A.B.] -public fun test2(/*0*/ a: [ERROR : A.e.C]): [ERROR : A.e.C] -public fun test3(/*0*/ a: [ERROR : a.A.C]): [ERROR : a.A.C] -public fun test4(/*0*/ a: [ERROR : A.B.ee]): [ERROR : A.B.ee] -public fun test5(/*0*/ a: [ERROR : A.ee]): [ERROR : A.ee] +public fun test(/*0*/ a: [Error type: No type specified for A.]): [Error type: No type specified for A.] +public fun test1(/*0*/ a: [Error type: No type specified for A.B.]): [Error type: No type specified for A.B.] +public fun test2(/*0*/ a: [Error type: Unresolved type for A.e.C]): [Error type: Unresolved type for A.e.C] +public fun test3(/*0*/ a: [Error type: Unresolved type for a.A.C]): [Error type: Unresolved type for a.A.C] +public fun test4(/*0*/ a: [Error type: Unresolved type for A.B.ee]): [Error type: Unresolved type for A.B.ee] +public fun test5(/*0*/ a: [Error type: Unresolved type for A.ee]): [Error type: Unresolved type for A.ee] public final class A { public constructor A() diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.txt index ae47311958c..b7572644e78 100644 --- a/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.txt +++ b/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.txt @@ -1,3 +1,3 @@ package -public val unwrapped: [ERROR : Type for some::unwrap] +public val unwrapped: [Error type: Not found recorded type for some::unwrap] diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.ni.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.ni.txt index d67025dfa37..4dc8183994e 100644 --- a/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.ni.txt +++ b/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.ni.txt @@ -1,3 +1,3 @@ package -public val unwrapped: [ERROR : ] +public val unwrapped: [Error type: Return type for function cannot be resolved] diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt index 5656716e414..cec52b78f06 100644 --- a/compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt +++ b/compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt @@ -37,7 +37,7 @@ package some { package package other { - public fun test(/*0*/ a_: [ERROR : a.b]): kotlin.Unit + public fun test(/*0*/ a_: [Error type: Unresolved type for a.b]): kotlin.Unit public final class a { public constructor a() diff --git a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt index d0c3a29d6cf..69b77985066 100644 --- a/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt +++ b/compiler/testData/diagnostics/tests/recovery/namelessMembers.txt @@ -41,8 +41,8 @@ public final class C1`> { } public final class C2 { - public constructor C2(/*0*/ ``: [ERROR : Type annotation was missing for parameter ]) - public final val ``: [ERROR : Annotation is absent] + public constructor C2(/*0*/ ``: [Error type: Missed a type for a value parameter ]) + public final val ``: [Error type: No type specified for val] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclaringPrivateToFile.txt b/compiler/testData/diagnostics/tests/redeclarations/RedeclaringPrivateToFile.txt index a9ea5823362..2233ada0657 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/RedeclaringPrivateToFile.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclaringPrivateToFile.txt @@ -18,8 +18,8 @@ package a { internal fun invalidFun4(): kotlin.Unit private fun invalidFun4(): kotlin.Unit public fun invalidFun4(): kotlin.Unit - public fun useInvalidFun0(): [ERROR : Error function type] - public fun useInvalidProp0(): [ERROR : Error function type] + public fun useInvalidFun0(): [Error type: Return type for function cannot be resolved] + public fun useInvalidProp0(): [Error type: Return type for function cannot be resolved] private fun validFun(): kotlin.Unit private fun validFun(): kotlin.Unit public fun validFun2(/*0*/ a: a.A): a.A diff --git a/compiler/testData/diagnostics/tests/redeclarations/shadowedExtension/extensionOnErrorType.txt b/compiler/testData/diagnostics/tests/redeclarations/shadowedExtension/extensionOnErrorType.txt index 928eb2ecdbb..e8d74ca1bfd 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/shadowedExtension/extensionOnErrorType.txt +++ b/compiler/testData/diagnostics/tests/redeclarations/shadowedExtension/extensionOnErrorType.txt @@ -1,7 +1,7 @@ package -public val [ERROR : G].bar: kotlin.Int -public fun [ERROR : G].foo(): kotlin.Unit +public val [Error type: Type for error type constructor (G)].bar: kotlin.Int +public fun [Error type: Type for error type constructor (G)].foo(): kotlin.Unit public interface G { public abstract val bar: kotlin.Int diff --git a/compiler/testData/diagnostics/tests/regressions/Jet81.ni.txt b/compiler/testData/diagnostics/tests/regressions/Jet81.ni.txt index a8dd7f42979..206bf9caa0f 100644 --- a/compiler/testData/diagnostics/tests/regressions/Jet81.ni.txt +++ b/compiler/testData/diagnostics/tests/regressions/Jet81.ni.txt @@ -11,7 +11,7 @@ public object A { public final class Test { public constructor Test() private final val y: Test.y.`` - public final val z: [ERROR : Type for y] + public final val z: [Error type: Not found recorded type for y] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -20,7 +20,7 @@ public final class Test { public final class Test2 { public constructor Test2() private final val a: Test2.a.`` - public final val b: [ERROR : Type for a.x] + public final val b: [Error type: Not found recorded type for a.x] public final val c: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.txt b/compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.txt index 3e9d0e4f64f..20aa9b5eacb 100644 --- a/compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.txt +++ b/compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.txt @@ -1,6 +1,6 @@ package -public val b: [ERROR : B] +public val b: [Error type: Type for error type constructor (B)] public final class B { public constructor B() diff --git a/compiler/testData/diagnostics/tests/regressions/ea65509.txt b/compiler/testData/diagnostics/tests/regressions/ea65509.txt index 9ed968b9a6b..20679a9445e 100644 --- a/compiler/testData/diagnostics/tests/regressions/ea65509.txt +++ b/compiler/testData/diagnostics/tests/regressions/ea65509.txt @@ -2,7 +2,7 @@ package public final class ClassB { public constructor ClassB() - @[ERROR : ClassA] /* annotation class not found */ public final fun ``(): kotlin.Unit + @[Error type: Unresolved type for ClassA] /* annotation class not found */ public final fun ``(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/regressions/ea66984.txt b/compiler/testData/diagnostics/tests/regressions/ea66984.txt index 260f7d9f0fb..918a332e5f5 100644 --- a/compiler/testData/diagnostics/tests/regressions/ea66984.txt +++ b/compiler/testData/diagnostics/tests/regressions/ea66984.txt @@ -1,7 +1,7 @@ package public final class Tree { - public constructor Tree(/*0*/ T: [ERROR : Type annotation was missing for parameter T], /*1*/ ``: Tree, /*2*/ left: [ERROR : Type annotation was missing for parameter left], /*3*/ ``: Tree, /*4*/ right: [ERROR : Type annotation was missing for parameter right]) + public constructor Tree(/*0*/ T: [Error type: Missed a type for a value parameter T], /*1*/ ``: Tree, /*2*/ left: [Error type: Missed a type for a value parameter left], /*3*/ ``: Tree, /*4*/ right: [Error type: Missed a type for a value parameter right]) public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/regressions/ea76264.txt b/compiler/testData/diagnostics/tests/regressions/ea76264.txt index 532057053cd..cf5b8bc3f63 100644 --- a/compiler/testData/diagnostics/tests/regressions/ea76264.txt +++ b/compiler/testData/diagnostics/tests/regressions/ea76264.txt @@ -1,4 +1,4 @@ package -public val p: [ERROR : Type for ::p] -public fun foo(): [ERROR : Error function type] +public val p: [Error type: Not found recorded type for ::p] +public fun foo(): [Error type: Return type for function cannot be resolved] diff --git a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBound.txt b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBound.txt index a257a5a2084..3f120b0a5f1 100644 --- a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBound.txt +++ b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBound.txt @@ -1,4 +1,4 @@ package -public val prop: [ERROR : No type, no body] -public fun foo(): kotlin.Unit +public val prop: [Error type: Return type for property prop cannot be resolved] +public fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundInClass.txt b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundInClass.txt index aae2a425860..819645df8d7 100644 --- a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundInClass.txt +++ b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundInClass.txt @@ -1,7 +1,7 @@ package -public final class MyClass { - public constructor MyClass() +public final class MyClass { + public constructor MyClass() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundInClassNotNull.txt b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundInClassNotNull.txt index aae2a425860..819645df8d7 100644 --- a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundInClassNotNull.txt +++ b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundInClassNotNull.txt @@ -1,7 +1,7 @@ package -public final class MyClass { - public constructor MyClass() +public final class MyClass { + public constructor MyClass() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundMember.txt b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundMember.txt index 97459d03c6d..dd50da0e702 100644 --- a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundMember.txt +++ b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundMember.txt @@ -2,9 +2,9 @@ package public final class My { public constructor My() - public final val prop: [ERROR : ?] + public final val prop: [Error type: Error type parameter] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit + public final fun foo(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundNotNull.txt b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundNotNull.txt index 1648ff0b222..332ac6a422c 100644 --- a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundNotNull.txt +++ b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundNotNull.txt @@ -1,4 +1,4 @@ package -public val prop: [ERROR : ?] -public fun foo(): kotlin.Unit +public val prop: [Error type: Error type parameter] +public fun foo(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/regressions/kt10843.ni.txt b/compiler/testData/diagnostics/tests/regressions/kt10843.ni.txt index 13a7c7da10b..a54db6024fb 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt10843.ni.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt10843.ni.txt @@ -1,3 +1,3 @@ package -public fun lambda(/*0*/ x: kotlin.Int?): [ERROR : ] +public fun lambda(/*0*/ x: kotlin.Int?): [Error type: Return type for function cannot be resolved] diff --git a/compiler/testData/diagnostics/tests/regressions/kt31975.txt b/compiler/testData/diagnostics/tests/regressions/kt31975.txt index fb0c297b3ba..a07d09468b9 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt31975.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt31975.txt @@ -16,7 +16,7 @@ public interface MemoizedFunctionToNotNull { public final class Refiner { public constructor Refiner() - public final val memoizedFunctionLambda: [ERROR : Type for createMemoizedFunction { it.foo() }] + public final val memoizedFunctionLambda: [Error type: Not found recorded type for createMemoizedFunction { it.foo() }] public final val memoizedFunctionReference: MemoizedFunctionToNotNull public final val memoizedFunctionTypes: MemoizedFunctionToNotNull public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/regressions/kt328.txt b/compiler/testData/diagnostics/tests/regressions/kt328.txt index 1fc05649122..2c3d995e1a0 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt328.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt328.txt @@ -1,7 +1,7 @@ package public val x: () -> ??? -public val z: [ERROR : Type for z] +public val z: [Error type: Not found recorded type for z] public fun bar1(): () -> ??? public fun bar2(): () -> kotlin.Unit public fun bar3(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/regressions/kt41.txt b/compiler/testData/diagnostics/tests/regressions/kt41.txt index f20e4b9aa4a..b16cd5790e4 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt41.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt41.txt @@ -1,6 +1,6 @@ package package kt41 { - public fun aaa(): [ERROR : Error function type] + public fun aaa(): [Error type: Return type for function cannot be resolved] public fun bbb(): kotlin.Unit } diff --git a/compiler/testData/diagnostics/tests/regressions/kt5362.txt b/compiler/testData/diagnostics/tests/regressions/kt5362.txt index 737f5090cda..783f14cb39d 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt5362.txt +++ b/compiler/testData/diagnostics/tests/regressions/kt5362.txt @@ -10,7 +10,7 @@ public final class Activity { public final class Fragment { public constructor Fragment() - public final fun call(): [ERROR : Error function type] + public final fun call(): [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -44,7 +44,7 @@ public final class Outer { public final class Nested { public constructor Nested() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(/*0*/ s: kotlin.String): [ERROR : Error function type] + public final fun foo(/*0*/ s: kotlin.String): [Error type: Return type for function cannot be resolved] public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/resolve/CycleInTypeArgs.txt b/compiler/testData/diagnostics/tests/resolve/CycleInTypeArgs.txt index b80791ec8eb..6a84c2411b5 100644 --- a/compiler/testData/diagnostics/tests/resolve/CycleInTypeArgs.txt +++ b/compiler/testData/diagnostics/tests/resolve/CycleInTypeArgs.txt @@ -1,14 +1,14 @@ package -public final class Class1>> { - public constructor Class1>>() +public final class Class1>> { + public constructor Class1>>() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public final class Class2>> { - public constructor Class2>>() +public final class Class2>> { + public constructor Class2>>() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/resolve/constructorVsCompanion.txt b/compiler/testData/diagnostics/tests/resolve/constructorVsCompanion.txt index 8a73be8eb4e..f2f0b8d0e73 100644 --- a/compiler/testData/diagnostics/tests/resolve/constructorVsCompanion.txt +++ b/compiler/testData/diagnostics/tests/resolve/constructorVsCompanion.txt @@ -1,8 +1,8 @@ package -public val a: [ERROR : Type for A] +public val a: [Error type: Not found recorded type for A] public val b: B.Companion -public val c: [ERROR : Type for C] +public val c: [Error type: Not found recorded type for C] public val d: D.Companion public val e: kotlin.Int diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.ni.txt b/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.ni.txt index 85b84edc4ff..b5e3db8559b 100644 --- a/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.ni.txt +++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.ni.txt @@ -2,7 +2,7 @@ package public fun test(): kotlin.Unit public fun Foo.foo(/*0*/ body: Foo.() -> kotlin.Unit): kotlin.Unit -public fun Foo.zbar(/*0*/ body: [ERROR : Recursive type alias: ZBar].() -> kotlin.Unit): kotlin.Unit +public fun Foo.zbar(/*0*/ body: [Error type: Recursive type alias ZBar].() -> kotlin.Unit): kotlin.Unit public final class Bar { public constructor Bar() diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.txt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.txt index 029838db363..de692f87281 100644 --- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.txt +++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.txt @@ -1,7 +1,7 @@ package -public val test1: [ERROR : Type for overloadedFun5("")] -public val test2: [ERROR : Type for overloadedFun5("", "")] +public val test1: [Error type: Not found recorded type for overloadedFun5("")] +public val test2: [Error type: Not found recorded type for overloadedFun5("", "")] public val test3: X2 public val test4: X1 public fun overloadedFun5(/*0*/ vararg ss: kotlin.String /*kotlin.Array*/): X1 diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.txt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.txt index 0044ce51ede..2596ed7c808 100644 --- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.txt +++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.txt @@ -2,7 +2,7 @@ package public fun A.foo(): X1 public fun A.foo(): X2 -public fun A.test(): [ERROR : Error function type] +public fun A.test(): [Error type: Return type for function cannot be resolved] public final class A { public constructor A() diff --git a/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.txt b/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.txt index 5571812ce2c..9efa3f80784 100644 --- a/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.txt +++ b/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.txt @@ -1,7 +1,7 @@ package -public val ff: [ERROR : Type for f()] -public val vv: [ERROR : Type for v] +public val ff: [Error type: Not found recorded type for f()] +public val vv: [Error type: Not found recorded type for v] package a { public val v: kotlin.Int = 1 diff --git a/compiler/testData/diagnostics/tests/scopes/classHeader/classParents.txt b/compiler/testData/diagnostics/tests/scopes/classHeader/classParents.txt index 10b4fa08ef1..92c73e2ae36 100644 --- a/compiler/testData/diagnostics/tests/scopes/classHeader/classParents.txt +++ b/compiler/testData/diagnostics/tests/scopes/classHeader/classParents.txt @@ -1,6 +1,6 @@ package -public final class A : I<[ERROR : Nested], [ERROR : Interface], [ERROR : Inner]> { +public final class A : I<[Error type: Unresolved type for Nested], [Error type: Unresolved type for Interface], [Error type: Unresolved type for Inner]> { public constructor A(/*0*/ impl: A.Interface) public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/scopes/classHeader/companionObjectParents.txt b/compiler/testData/diagnostics/tests/scopes/classHeader/companionObjectParents.txt index 99849da3a86..257f562b4fa 100644 --- a/compiler/testData/diagnostics/tests/scopes/classHeader/companionObjectParents.txt +++ b/compiler/testData/diagnostics/tests/scopes/classHeader/companionObjectParents.txt @@ -8,7 +8,7 @@ public interface A { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public companion object Companion : I<[ERROR : Nested], [ERROR : Interface]> { + public companion object Companion : I<[Error type: Unresolved type for Nested], [Error type: Unresolved type for Interface]> { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -35,7 +35,7 @@ public final class B { public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public companion object Companion : I<[ERROR : Nested], [ERROR : Interface]> { + public companion object Companion : I<[Error type: Unresolved type for Nested], [Error type: Unresolved type for Interface]> { private constructor Companion() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/scopes/classHeader/objectParents.txt b/compiler/testData/diagnostics/tests/scopes/classHeader/objectParents.txt index 8a394cd03c7..6451fdbdbed 100644 --- a/compiler/testData/diagnostics/tests/scopes/classHeader/objectParents.txt +++ b/compiler/testData/diagnostics/tests/scopes/classHeader/objectParents.txt @@ -2,7 +2,7 @@ package public val aImpl: A.Interface -public object A : I<[ERROR : Nested], [ERROR : Interface]> { +public object A : I<[Error type: Unresolved type for Nested], [Error type: Unresolved type for Interface]> { private constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/nestedClassesFromInterface.txt b/compiler/testData/diagnostics/tests/scopes/inheritance/nestedClassesFromInterface.txt index 05e8461bbd7..bf0d50d97cd 100644 --- a/compiler/testData/diagnostics/tests/scopes/inheritance/nestedClassesFromInterface.txt +++ b/compiler/testData/diagnostics/tests/scopes/inheritance/nestedClassesFromInterface.txt @@ -28,7 +28,7 @@ public interface B { public final class X : A { public constructor X() - public final val a: [ERROR : A_] + public final val a: [Error type: Unresolved type for A_] public final val b: A.A_ public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -36,7 +36,7 @@ public final class X : A { public companion object Companion { private constructor Companion() - public final val a: [ERROR : A_] + public final val a: [Error type: Unresolved type for A_] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -45,7 +45,7 @@ public final class X : A { public final class Y : B { public constructor Y() - public final val a: [ERROR : B_] + public final val a: [Error type: Unresolved type for B_] public final val b: B.B_ public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -53,7 +53,7 @@ public final class Y : B { public companion object Companion { private constructor Companion() - public final val b: [ERROR : B_] + public final val b: [Error type: Unresolved type for B_] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/nestedFromJava.txt b/compiler/testData/diagnostics/tests/scopes/inheritance/nestedFromJava.txt index 7a220a68c43..cf3e62c20c0 100644 --- a/compiler/testData/diagnostics/tests/scopes/inheritance/nestedFromJava.txt +++ b/compiler/testData/diagnostics/tests/scopes/inheritance/nestedFromJava.txt @@ -43,14 +43,14 @@ public open class C : B, A { public final class X : A { public constructor X() - public final val a_s: [ERROR : A_S] + public final val a_s: [Error type: Unresolved type for A_S] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public object xD { private constructor xD() - public final val a_: [ERROR : A_S] + public final val a_: [Error type: Unresolved type for A_S] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String @@ -77,7 +77,7 @@ public final class Y : B { public final class Z : C { public constructor Z() - public final val a_s: [ERROR : A_S] + public final val a_s: [Error type: Unresolved type for A_S] public final val b_: B.B_ public final val b_s: B.B_S public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -86,7 +86,7 @@ public final class Z : C { public object X { private constructor X() - public final val a_s: [ERROR : A_S] + public final val a_s: [Error type: Unresolved type for A_S] public final val b_: B.B_ public final val b_s: B.B_S public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.ni.txt b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.ni.txt index 15f5eef9160..a9836dceb1f 100644 --- a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.ni.txt +++ b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.ni.txt @@ -2,13 +2,13 @@ package package i { public val i.C.bar: i.C.D - public val kotlin.String.bd: [ERROR : ] + public val kotlin.String.bd: [Error type: Return type for function cannot be resolved] public val kotlin.String.bd1: kotlin.String - public val i.A.foo: [ERROR : Type for ii] + public val i.A.foo: [Error type: Not found recorded type for ii] public val i.C.foo: i.C.D public val i.A.foo1: kotlin.Int public val i.C.foo1: i.C.D - public val kotlin.collections.List.length: [ERROR : Type for size] + public val kotlin.collections.List.length: [Error type: Not found recorded type for size] public val kotlin.collections.List.length1: kotlin.Int public final class A { diff --git a/compiler/testData/diagnostics/tests/script/destructuringDeclarationsScript.txt b/compiler/testData/diagnostics/tests/script/destructuringDeclarationsScript.txt index a4b21192ba4..141c9b48eb2 100644 --- a/compiler/testData/diagnostics/tests/script/destructuringDeclarationsScript.txt +++ b/compiler/testData/diagnostics/tests/script/destructuringDeclarationsScript.txt @@ -7,7 +7,7 @@ public final class DestructuringDeclarationsScript : kotlin.script.templates.sta public final override /*1*/ /*fake_override*/ val args: kotlin.Array public final val b1: kotlin.Int public final val b2: kotlin.String - public final val c1: [ERROR : component1() return type] + public final val c1: [Error type: component1() return type] public final val d1: kotlin.Int public final val e1: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/script/topLevelPropertiesWithGetSet.txt b/compiler/testData/diagnostics/tests/script/topLevelPropertiesWithGetSet.txt index 853ce2c1498..5ffbb711d6a 100644 --- a/compiler/testData/diagnostics/tests/script/topLevelPropertiesWithGetSet.txt +++ b/compiler/testData/diagnostics/tests/script/topLevelPropertiesWithGetSet.txt @@ -7,7 +7,7 @@ public final class TopLevelPropertiesWithGetSet : kotlin.script.templates.standa public final val testValLineBreak: kotlin.Int public final val testValLineBreakNoType: kotlin.Int public final val testValLineBreakSemi: kotlin.Int - public final val testValLineBreakSemiNoType: [ERROR : No type, no body] + public final val testValLineBreakSemiNoType: [Error type: Return type for property testValLineBreakSemiNoType cannot be resolved] public final val testValNoType: kotlin.Int public final var testVar: kotlin.Int public final var testVarLineBreak: kotlin.Int diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.ni.txt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.ni.txt index 78dcbf37e8b..1c407be16b7 100644 --- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.ni.txt +++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.ni.txt @@ -4,7 +4,7 @@ public val x1: A public val x2: A public val x3: A public val y1: B -public val y10: [ERROR : Type for B("")] +public val y10: [Error type: Not found recorded type for B("")] public val y2: B public val y3: B public val y4: B diff --git a/compiler/testData/diagnostics/tests/smartCasts/localDelegatedPropertyAfter.txt b/compiler/testData/diagnostics/tests/smartCasts/localDelegatedPropertyAfter.txt index b6761c37614..5a5caf7f2f5 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/localDelegatedPropertyAfter.txt +++ b/compiler/testData/diagnostics/tests/smartCasts/localDelegatedPropertyAfter.txt @@ -6,7 +6,7 @@ public final class AlternatingDelegate { public constructor AlternatingDelegate() public final var counter: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final operator fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: [ERROR : KProperty<*>]): kotlin.Any? + public final operator fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: [Error type: Unresolved type for KProperty<*>]): kotlin.Any? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/smartCasts/localDelegatedPropertyBefore.txt b/compiler/testData/diagnostics/tests/smartCasts/localDelegatedPropertyBefore.txt index b6761c37614..5a5caf7f2f5 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/localDelegatedPropertyBefore.txt +++ b/compiler/testData/diagnostics/tests/smartCasts/localDelegatedPropertyBefore.txt @@ -6,7 +6,7 @@ public final class AlternatingDelegate { public constructor AlternatingDelegate() public final var counter: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final operator fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: [ERROR : KProperty<*>]): kotlin.Any? + public final operator fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: [Error type: Unresolved type for KProperty<*>]): kotlin.Any? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/overriddenMembers.txt b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/overriddenMembers.txt index a102829c3de..3376373a301 100644 --- a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/overriddenMembers.txt +++ b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/overriddenMembers.txt @@ -1,7 +1,7 @@ package public fun f1(/*0*/ x: I10): kotlin.Unit -public fun f2(/*0*/ x: I11): [ERROR : Error function type] +public fun f2(/*0*/ x: I11): [Error type: Return type for function cannot be resolved] public fun f3(/*0*/ x: J): kotlin.Unit public fun f4(/*0*/ x: BothI1): kotlin.Unit public fun f5(/*0*/ x: BothI2): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/simpleMembers.txt b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/simpleMembers.txt index 2f406ad6fc6..fb78f7136c5 100644 --- a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/simpleMembers.txt +++ b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/simpleMembers.txt @@ -2,8 +2,8 @@ package @kotlin.SinceKotlin(version = "1.1") public var p: kotlin.Unit @kotlin.SinceKotlin(version = "1.1") public fun f(): kotlin.Unit -public fun t1(): [ERROR : Error function type] -public fun t2(): [ERROR : Error function type] +public fun t1(): [Error type: Return type for function cannot be resolved] +public fun t2(): [Error type: Return type for function cannot be resolved] public fun t3(): kotlin.Unit public fun t4(): kotlin.Unit @kotlin.SinceKotlin(version = "1.1.2") public fun z(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsCompanionObjects.txt b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsCompanionObjects.txt index ebef14662dc..3f39271daf3 100644 --- a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsCompanionObjects.txt +++ b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsCompanionObjects.txt @@ -1,9 +1,9 @@ package -public val test1: [ERROR : Type for CA] -public val test2: [ERROR : Type for CA.Companion] +public val test1: [Error type: Not found recorded type for CA] +public val test2: [Error type: Not found recorded type for CA.Companion] public val test3: kotlin.Int = 42 -public val test4: [ERROR : ] +public val test4: [Error type: Error property type] public final class C { public constructor C() diff --git a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsConstructors.txt b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsConstructors.txt index 2110377b938..fd02d639942 100644 --- a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsConstructors.txt +++ b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsConstructors.txt @@ -1,6 +1,6 @@ package -public val test1: [ERROR : Type for C1_Alias()] +public val test1: [Error type: Not found recorded type for C1_Alias()] public val test2: C2_Alias /* = C2 */ @kotlin.SinceKotlin(version = "1.1") public open class C1 { diff --git a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsObjects.txt b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsObjects.txt index 9cced66c220..3e909b7dfb0 100644 --- a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsObjects.txt +++ b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsObjects.txt @@ -1,6 +1,6 @@ package -public val test1: [ERROR : Type for Since_1_1_Alias] +public val test1: [Error type: Not found recorded type for Since_1_1_Alias] public val test2: kotlin.Int = 42 @kotlin.SinceKotlin(version = "1.1") public object Since_1_1 { diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.txt b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.txt index a9d3f99f532..0fa1525c6a2 100644 --- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.txt +++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.txt @@ -1,6 +1,6 @@ package -public fun f1(/*0*/ l: [ERROR : List1]): T -public fun f1(/*0*/ l: [ERROR : List2]): T +public fun f1(/*0*/ l: [Error type: Unresolved type for List1]): T +public fun f1(/*0*/ l: [Error type: Unresolved type for List2]): T public fun f1(/*0*/ c: kotlin.collections.Collection): T public fun test(/*0*/ l: kotlin.collections.List): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.txt b/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.txt index c30a61d8f3f..5dff54e5188 100644 --- a/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.txt +++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.txt @@ -1,3 +1,3 @@ package -public typealias R> = kotlin.collections.List +public typealias R> = kotlin.collections.List diff --git a/compiler/testData/diagnostics/tests/typealias/capturingTypeParametersFromOuterClass.txt b/compiler/testData/diagnostics/tests/typealias/capturingTypeParametersFromOuterClass.txt index 7f0d07cf85e..873e2d06db0 100644 --- a/compiler/testData/diagnostics/tests/typealias/capturingTypeParametersFromOuterClass.txt +++ b/compiler/testData/diagnostics/tests/typealias/capturingTypeParametersFromOuterClass.txt @@ -21,10 +21,10 @@ public final class Outer { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public typealias LTI /*captured type parameters: /*0*/ TI, /*1*/ TN*/ = kotlin.collections.List public typealias LTN /*captured type parameters: /*0*/ TI, /*1*/ TN*/ = kotlin.collections.List - public typealias LTO = kotlin.collections.List<[ERROR : TO]> + public typealias LTO = kotlin.collections.List<[Error type: Unresolved type for TO]> } public typealias LTN /*captured type parameters: /*0*/ TN*/ = kotlin.collections.List - public typealias LTO = kotlin.collections.List<[ERROR : TO]> + public typealias LTO = kotlin.collections.List<[Error type: Unresolved type for TO]> } public typealias LTO /*captured type parameters: /*0*/ TO*/ = kotlin.collections.List } diff --git a/compiler/testData/diagnostics/tests/typealias/importMemberFromJavaViaAlias.txt b/compiler/testData/diagnostics/tests/typealias/importMemberFromJavaViaAlias.txt index b0a8f6f8045..d92ed579e23 100644 --- a/compiler/testData/diagnostics/tests/typealias/importMemberFromJavaViaAlias.txt +++ b/compiler/testData/diagnostics/tests/typealias/importMemberFromJavaViaAlias.txt @@ -1,6 +1,6 @@ package -public fun foo(/*0*/ sample: [ERROR : JavaSample], /*1*/ alias: test.kot.JavaAlias /* = test.jv.JavaSample */): kotlin.Unit +public fun foo(/*0*/ sample: [Error type: Unresolved type for JavaSample], /*1*/ alias: test.kot.JavaAlias /* = test.jv.JavaSample */): kotlin.Unit package test { diff --git a/compiler/testData/diagnostics/tests/typealias/inhreritedTypeAliasQualifiedByDerivedClass.txt b/compiler/testData/diagnostics/tests/typealias/inhreritedTypeAliasQualifiedByDerivedClass.txt index f359b5d90ed..d81c9514d46 100644 --- a/compiler/testData/diagnostics/tests/typealias/inhreritedTypeAliasQualifiedByDerivedClass.txt +++ b/compiler/testData/diagnostics/tests/typealias/inhreritedTypeAliasQualifiedByDerivedClass.txt @@ -1,7 +1,7 @@ package -public fun test(/*0*/ x: [ERROR : Derived.Nested]): [ERROR : Derived.Nested] -public fun Base.testWithImplicitReceiver(/*0*/ x: [ERROR : Nested]): kotlin.Unit +public fun test(/*0*/ x: [Error type: Unresolved type for Derived.Nested]): [Error type: Unresolved type for Derived.Nested] +public fun Base.testWithImplicitReceiver(/*0*/ x: [Error type: Unresolved type for Nested]): kotlin.Unit public open class Base { public constructor Base() diff --git a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.ni.txt b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.ni.txt index d5d77e3aff9..391c49dade5 100644 --- a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.ni.txt +++ b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.ni.txt @@ -4,7 +4,7 @@ public fun test1(/*0*/ x: Outer): OI /* = Outer.Inner */ public fun test2(/*0*/ x: Generic): GI /* = Generic.Inner */ public fun test3(/*0*/ x: Generic): GI /* = Generic.Inner */ public fun test4(/*0*/ x: Generic>): GI> /* = Generic>.Inner */ -public fun test5(/*0*/ x: Generic): [ERROR : Error function type] +public fun test5(/*0*/ x: Generic): [Error type: Return type for function cannot be resolved] public fun Generic.test6(): GIntI /* = Generic.Inner */ public final class Generic { diff --git a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType.txt b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType.txt index 281ff743b6e..3771a7bf028 100644 --- a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType.txt +++ b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType.txt @@ -1,19 +1,19 @@ package -public fun test1(/*0*/ x: [ERROR : NestedAlias]): [ERROR : NestedAlias] +public fun test1(/*0*/ x: [Error type: Type for error type constructor (NestedAlias)]): [Error type: Type for error type constructor (NestedAlias)] public fun test10(/*0*/ x: Outer.InnerAlias /* = Outer.Inner */): Outer.InnerAlias /* = Outer.Inner */ public fun test11(/*0*/ x: Outer.InnerAlias /* = Outer.Inner */): Outer.InnerAlias /* = Outer.Inner */ -public fun test12(/*0*/ x: [ERROR : GenericInnerAlias]): [ERROR : GenericInnerAlias] +public fun test12(/*0*/ x: [Error type: Type for error type constructor (GenericInnerAlias)]): [Error type: Type for error type constructor (GenericInnerAlias)] public fun test13(/*0*/ x: Outer.GenericInnerAlias /* = Outer.GenericInner */): Outer.GenericInnerAlias /* = Outer.GenericInner */ public fun test14(/*0*/ x: Outer.GenericInnerAlias /* = Outer.GenericInner */): Outer.GenericInnerAlias /* = Outer.GenericInner */ -public fun test2(/*0*/ x: [ERROR : NestedAlias]): [ERROR : NestedAlias] +public fun test2(/*0*/ x: [Error type: Type for error type constructor (NestedAlias)]): [Error type: Type for error type constructor (NestedAlias)] public fun test3(/*0*/ x: Outer.NestedAlias /* = Outer.Nested */): Outer.NestedAlias /* = Outer.Nested */ -public fun test4(/*0*/ x: [ERROR : GenericNestedAlias]): [ERROR : GenericNestedAlias] -public fun test5(/*0*/ x: [ERROR : GenericNestedAlias]): [ERROR : GenericNestedAlias] -public fun test6(/*0*/ x: [ERROR : GenericNestedAlias]): [ERROR : GenericNestedAlias] +public fun test4(/*0*/ x: [Error type: Type for error type constructor (GenericNestedAlias)]): [Error type: Type for error type constructor (GenericNestedAlias)] +public fun test5(/*0*/ x: [Error type: Type for error type constructor (GenericNestedAlias)]): [Error type: Type for error type constructor (GenericNestedAlias)] +public fun test6(/*0*/ x: [Error type: Type for error type constructor (GenericNestedAlias)]): [Error type: Type for error type constructor (GenericNestedAlias)] public fun test7(/*0*/ x: Outer.GenericNestedAlias /* = Outer.GenericNested */): Outer.GenericNestedAlias /* = Outer.GenericNested */ public fun test8(/*0*/ x: Outer.GenericNestedAlias /* = Outer.GenericNested */): Outer.GenericNestedAlias /* = Outer.GenericNested */ -public fun test9(/*0*/ x: [ERROR : InnerAlias]): [ERROR : InnerAlias] +public fun test9(/*0*/ x: [Error type: Type for error type constructor (InnerAlias)]): [Error type: Type for error type constructor (InnerAlias)] public final class Outer { public constructor Outer() @@ -59,3 +59,4 @@ public final class Outer { public typealias InnerAlias /*captured type parameters: /*0*/ T*/ = Outer.Inner public typealias NestedAlias = Outer.Nested } + diff --git a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.txt index 380d19ffdff..51f9290544e 100644 --- a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.txt +++ b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.txt @@ -1,10 +1,10 @@ package -public val test0: [ERROR : Type for C.P(1, 1)] -public val test1: [ERROR : Type for C.P1("", 1)] -public val test2: [ERROR : Type for C.P2(1, "")] -public val test3: [ERROR : Type for C.P1("", 1)] -public val test4: [ERROR : Type for C.P2(1, "")] +public val test0: [Error type: Not found recorded type for C.P(1, 1)] +public val test1: [Error type: Not found recorded type for C.P1("", 1)] +public val test2: [Error type: Not found recorded type for C.P2(1, "")] +public val test3: [Error type: Not found recorded type for C.P1("", 1)] +public val test4: [Error type: Not found recorded type for C.P2(1, "")] public val test5: C.P /* = Pair */ public val test6: C.P1 /* = Pair */ public val test7: C.P2 /* = Pair */ diff --git a/compiler/testData/diagnostics/tests/typealias/javaStaticMembersViaTypeAlias.txt b/compiler/testData/diagnostics/tests/typealias/javaStaticMembersViaTypeAlias.txt index 29d44ddbc84..a503d2c43bf 100644 --- a/compiler/testData/diagnostics/tests/typealias/javaStaticMembersViaTypeAlias.txt +++ b/compiler/testData/diagnostics/tests/typealias/javaStaticMembersViaTypeAlias.txt @@ -4,16 +4,16 @@ public val seeAlsoDerivedFoo: kotlin.String public val seeAlsoFoo: kotlin.String public val testDerivedFoo: kotlin.String public val testFoo: kotlin.String -public val testInner1: [ERROR : JT.Inner] -public val testInner2: [ERROR : KT.Inner] -public val testNested1: [ERROR : JT.Nested] -public val testNested2: [ERROR : KT.Nested] -public val testNested3: [ERROR : IT.Nested] -public fun testInnerAsTypeArgument1(/*0*/ x: kotlin.collections.List<[ERROR : JT.Inner]>): kotlin.Unit -public fun testInnerAsTypeArgument2(/*0*/ x: kotlin.collections.List<[ERROR : KT.Inner]>): kotlin.Unit -public fun testNestedAsTypeArgument1(/*0*/ x: kotlin.collections.List<[ERROR : JT.Nested]>): kotlin.Unit -public fun testNestedAsTypeArgument2(/*0*/ x: kotlin.collections.List<[ERROR : KT.Nested]>): kotlin.Unit -public fun testNestedAsTypeArgument3(/*0*/ x: kotlin.collections.List<[ERROR : IT.Nested]>): kotlin.Unit +public val testInner1: [Error type: Unresolved type for JT.Inner] +public val testInner2: [Error type: Unresolved type for KT.Inner] +public val testNested1: [Error type: Unresolved type for JT.Nested] +public val testNested2: [Error type: Unresolved type for KT.Nested] +public val testNested3: [Error type: Unresolved type for IT.Nested] +public fun testInnerAsTypeArgument1(/*0*/ x: kotlin.collections.List<[Error type: Unresolved type for JT.Inner]>): kotlin.Unit +public fun testInnerAsTypeArgument2(/*0*/ x: kotlin.collections.List<[Error type: Unresolved type for KT.Inner]>): kotlin.Unit +public fun testNestedAsTypeArgument1(/*0*/ x: kotlin.collections.List<[Error type: Unresolved type for JT.Nested]>): kotlin.Unit +public fun testNestedAsTypeArgument2(/*0*/ x: kotlin.collections.List<[Error type: Unresolved type for KT.Nested]>): kotlin.Unit +public fun testNestedAsTypeArgument3(/*0*/ x: kotlin.collections.List<[Error type: Unresolved type for IT.Nested]>): kotlin.Unit public interface ITest { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/typealias/kt14518.txt b/compiler/testData/diagnostics/tests/typealias/kt14518.txt index 62250182560..125b49b09c6 100644 --- a/compiler/testData/diagnostics/tests/typealias/kt14518.txt +++ b/compiler/testData/diagnostics/tests/typealias/kt14518.txt @@ -14,6 +14,6 @@ public final class OuterClass { } public typealias NestedType = OuterClass.NestedClass } -public typealias ON1 = [ERROR : NestedClass] -public typealias ON2 = [ERROR : NestedType] +public typealias ON1 = [Error type: Type for error type constructor (NestedClass)] +public typealias ON2 = [Error type: Type for error type constructor (NestedType)] public typealias ON3 = OuterClass.NestedType diff --git a/compiler/testData/diagnostics/tests/typealias/noRHS.txt b/compiler/testData/diagnostics/tests/typealias/noRHS.txt index 7a30a6795ac..d41473b6c37 100644 --- a/compiler/testData/diagnostics/tests/typealias/noRHS.txt +++ b/compiler/testData/diagnostics/tests/typealias/noRHS.txt @@ -1,7 +1,7 @@ package -public typealias `` = [ERROR : No type element] -public typealias A1 = [ERROR : No type element] -public typealias A2 = [ERROR : No type element] +public typealias `` = [Error type: No type specified for unknown element] +public typealias A1 = [Error type: No type specified for unknown element] +public typealias A2 = [Error type: No type specified for unknown element] public typealias Valid = kotlin.String diff --git a/compiler/testData/diagnostics/tests/typealias/parameterRestrictions.txt b/compiler/testData/diagnostics/tests/typealias/parameterRestrictions.txt index 400c3cd68a8..58c976b272d 100644 --- a/compiler/testData/diagnostics/tests/typealias/parameterRestrictions.txt +++ b/compiler/testData/diagnostics/tests/typealias/parameterRestrictions.txt @@ -1,7 +1,7 @@ package public val x: WithVariance /* = kotlin.Int */ = 0 -public typealias WithBounds1 = kotlin.Int -public typealias WithBounds2 = kotlin.Int +public typealias WithBounds1 = kotlin.Int +public typealias WithBounds2 = kotlin.Int public typealias WithBounds3 = kotlin.Int public typealias WithVariance = kotlin.Int diff --git a/compiler/testData/diagnostics/tests/typealias/recursive.txt b/compiler/testData/diagnostics/tests/typealias/recursive.txt index bab06724e69..59afc359747 100644 --- a/compiler/testData/diagnostics/tests/typealias/recursive.txt +++ b/compiler/testData/diagnostics/tests/typealias/recursive.txt @@ -1,6 +1,6 @@ package -public val x: F3 /* = (F1 /* = (kotlin.Int) -> F2 /* = ([ERROR : Recursive type alias: F1]) -> kotlin.Int */ */) -> kotlin.Int */ +public val x: F3 /* = (F1 /* = (kotlin.Int) -> F2 /* = ([Error type: Recursive type alias F1]) -> kotlin.Int */ */) -> kotlin.Int */ public typealias A = B public typealias B = A public typealias F1 = (kotlin.Int) -> F2 diff --git a/compiler/testData/diagnostics/tests/typealias/substitutionVariance.ni.txt b/compiler/testData/diagnostics/tests/typealias/substitutionVariance.ni.txt index 0bb4ff8e8cc..63d3e015368 100644 --- a/compiler/testData/diagnostics/tests/typealias/substitutionVariance.ni.txt +++ b/compiler/testData/diagnostics/tests/typealias/substitutionVariance.ni.txt @@ -3,15 +3,15 @@ package public val inv1: Inv1 /* = Inv */ public fun inIn_In(/*0*/ x: In2 /* = In */): In2 /* = In */ public fun inIn_Inv(/*0*/ x: In2 /* = In */): In2 /* = In */ -public fun inIn_Out(/*0*/ x: In2 /* = In */): [ERROR : Inconsistent type: In (0 parameter has declared variance: in, but argument variance is out)] +public fun inIn_Out(/*0*/ x: In2 /* = In */): [Error type: Resolution error type (Inconsistent type: In (0 parameter has declared variance: in, but argument variance is out))] public fun inIn_Star(/*0*/ x: In2<*> /* = In<*> */): In2<*> /* = In<*> */ public fun inInv_In(/*0*/ x: In1 /* = In */): In1 /* = In */ public fun inInv_Inv(/*0*/ x: In1 /* = In */): In1 /* = In */ -public fun inInv_Out(/*0*/ x: In1 /* = In */): [ERROR : Inconsistent type: In (0 parameter has declared variance: in, but argument variance is out)] +public fun inInv_Out(/*0*/ x: In1 /* = In */): [Error type: Resolution error type (Inconsistent type: In (0 parameter has declared variance: in, but argument variance is out))] public fun inInv_Star(/*0*/ x: In1<*> /* = In<*> */): In1<*> /* = In<*> */ public fun inOut_In(/*0*/ x: In3 /* = In */): In3 /* = In */ -public fun inOut_Inv(/*0*/ x: In3 /* = In */): [ERROR : Inconsistent type: In (0 parameter has declared variance: in, but argument variance is out)] -public fun inOut_Out(/*0*/ x: In3 /* = In */): [ERROR : Inconsistent type: In (0 parameter has declared variance: in, but argument variance is out)] +public fun inOut_Inv(/*0*/ x: In3 /* = In */): [Error type: Resolution error type (Inconsistent type: In (0 parameter has declared variance: in, but argument variance is out))] +public fun inOut_Out(/*0*/ x: In3 /* = In */): [Error type: Resolution error type (Inconsistent type: In (0 parameter has declared variance: in, but argument variance is out))] public fun inOut_Star(/*0*/ x: In3<*> /* = In<*> */): In3<*> /* = In<*> */ public fun invIn_In(/*0*/ x: Inv2 /* = Inv */): Inv2 /* = Inv */ public fun invIn_Inv(/*0*/ x: Inv2 /* = Inv */): Inv2 /* = Inv */ @@ -25,17 +25,17 @@ public fun invOut_In(/*0*/ x: Inv3 /* = Inv */): I public fun invOut_Inv(/*0*/ x: Inv3 /* = Inv */): Inv3 /* = Inv */ public fun invOut_Out(/*0*/ x: Inv3 /* = Inv */): Inv3 /* = Inv */ public fun invOut_Star(/*0*/ x: Inv3<*> /* = Inv<*> */): Inv3<*> /* = Inv<*> */ -public fun nested_conflicting_type_argument(/*0*/ x: In>): In<[ERROR : Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in)]> +public fun nested_conflicting_type_argument(/*0*/ x: In>): In<[Error type: Resolution error type (Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in))]> public fun nested_redundant_type_argument(/*0*/ x: In>): In> -public fun outIn_In(/*0*/ x: Out2 /* = Out */): [ERROR : Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in)] -public fun outIn_Inv(/*0*/ x: Out2 /* = Out */): [ERROR : Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in)] +public fun outIn_In(/*0*/ x: Out2 /* = Out */): [Error type: Resolution error type (Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in))] +public fun outIn_Inv(/*0*/ x: Out2 /* = Out */): [Error type: Resolution error type (Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in))] public fun outIn_Out(/*0*/ x: Out2 /* = Out */): Out2 /* = Out */ public fun outIn_Star(/*0*/ x: Out2<*> /* = Out<*> */): Out2<*> /* = Out<*> */ -public fun outInv_In(/*0*/ x: Out1 /* = Out */): [ERROR : Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in)] +public fun outInv_In(/*0*/ x: Out1 /* = Out */): [Error type: Resolution error type (Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in))] public fun outInv_Inv(/*0*/ x: Out1 /* = Out */): Out1 /* = Out */ public fun outInv_Out(/*0*/ x: Out1 /* = Out */): Out1 /* = Out */ public fun outInv_Star(/*0*/ x: Out1<*> /* = Out<*> */): Out1<*> /* = Out<*> */ -public fun outOut_In(/*0*/ x: Out3 /* = Out */): [ERROR : Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in)] +public fun outOut_In(/*0*/ x: Out3 /* = Out */): [Error type: Resolution error type (Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in))] public fun outOut_Inv(/*0*/ x: Out3 /* = Out */): Out3 /* = Out */ public fun outOut_Out(/*0*/ x: Out3 /* = Out */): Out3 /* = Out */ public fun outOut_Star(/*0*/ x: Out3<*> /* = Out<*> */): Out3<*> /* = Out<*> */ diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasAsQualifier.ni.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasAsQualifier.ni.txt index bcc2798d9f6..3ba165b5348 100644 --- a/compiler/testData/diagnostics/tests/typealias/typeAliasAsQualifier.ni.txt +++ b/compiler/testData/diagnostics/tests/typealias/typeAliasAsQualifier.ni.txt @@ -1,11 +1,11 @@ package -public val c: [ERROR : Type for C.Self.Self()] -public val ic: [ERROR : Type for C.Self.InCompanion()] -public val n: [ERROR : Type for C.Self.Nested()] -public val n2: [ERROR : ] +public val c: [Error type: Not found recorded type for C.Self.Self()] +public val ic: [Error type: Not found recorded type for C.Self.InCompanion()] +public val n: [Error type: Not found recorded type for C.Self.Nested()] +public val n2: [Error type: Return type for function cannot be resolved] public val ok: kotlin.String = "OK" -public val x: [ERROR : Type for C.Self.X] +public val x: [Error type: Not found recorded type for C.Self.X] public final class C { public constructor C() diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.txt index e1de949947e..7fe1b649e71 100644 --- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.txt +++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructor.txt @@ -4,11 +4,11 @@ public val test1: C public val test2: TC /* = C */ public val test3: C public val test4: TC /* = C */ -public val test5: [ERROR : Type for TC("", "")] -public val test6: [ERROR : Type for TI()] -public val test6a: [ERROR : Type for Interface()] -public val test7: [ERROR : Type for TO()] -public val test7a: [ERROR : Type for AnObject()] +public val test5: [Error type: Not found recorded type for TC("", "")] +public val test6: [Error type: Not found recorded type for TI()] +public val test6a: [Error type: Not found recorded type for Interface()] +public val test7: [Error type: Not found recorded type for TO()] +public val test7a: [Error type: Not found recorded type for AnObject()] public object AnObject { private constructor AnObject() diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.ni.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.ni.txt index 07f8031809d..d139354b147 100644 --- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.ni.txt +++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.ni.txt @@ -1,6 +1,6 @@ package -public val test1: [ERROR : Type for BOutIn(listOf(), null!!)] +public val test1: [Error type: Not found recorded type for BOutIn(listOf(), null!!)] public val test2: BInIn /* = Bound, in kotlin.Nothing> */ public fun listOf(): kotlin.collections.List diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForInterface.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForInterface.txt index bfc96fcc1ce..47d24625abe 100644 --- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForInterface.txt +++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForInterface.txt @@ -1,7 +1,7 @@ package -public val testAsFunction: [ERROR : Type for Test()] -public val testAsValue: [ERROR : Type for Test] +public val testAsFunction: [Error type: Not found recorded type for Test()] +public val testAsValue: [Error type: Not found recorded type for Test] public interface IFoo { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.ni.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.ni.txt index 004785feb88..2910277a9b3 100644 --- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.ni.txt +++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.ni.txt @@ -3,7 +3,7 @@ package public val test1: CStar /* = C<*> */ public val test2: CIn /* = C */ public val test3: COut /* = C */ -public val test4: [ERROR : Type for CT<*>()] +public val test4: [Error type: Not found recorded type for CT<*>()] public val test5: CT /* = C<*> */> /* = C /* = C<*> */> */ public final class C { diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.ni.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.ni.txt index 82524b39e19..ae5d95953a9 100644 --- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.ni.txt +++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.ni.txt @@ -3,7 +3,7 @@ package public val test0: N /* = Num */ public val test1: N /* = Num */ public val test2: C /* = Cons */ -public val test3: [ERROR : Type for CC(1, 2)] +public val test3: [Error type: Not found recorded type for CC(1, 2)] public val test4: CC /* = Cons> */ public val test5: PL /* = Pair> */ public fun testProjections1(/*0*/ x: Pair): Foo diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongClass.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongClass.txt index 9abd398cf90..f03a4aee17a 100644 --- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongClass.txt +++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongClass.txt @@ -8,10 +8,10 @@ public val test3: Test3 /* = EnumClass */ public val test3a: EnumClass public val test4: Test4 /* = SealedClass */ public val test4a: SealedClass -public val test5: [ERROR : Type for Test5()] -public val test5a: [ERROR : Type for Outer.Inner()] -public val test5b: [ERROR : Type for Outer.TestInner()] -public val test5c: [ERROR : Type for Outer().TestInner()] +public val test5: [Error type: Not found recorded type for Test5()] +public val test5a: [Error type: Not found recorded type for Outer.Inner()] +public val test5b: [Error type: Not found recorded type for Outer.TestInner()] +public val test5c: [Error type: Not found recorded type for Outer().TestInner()] public val test5d: Outer.Inner public val test5e: Test5 /* = Outer.Inner */ diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt index 2e554ee69f3..3d6a763dd80 100644 --- a/compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt +++ b/compiler/testData/diagnostics/tests/typealias/typeAliasShouldExpandToClass.txt @@ -10,7 +10,7 @@ public final class Outer { public typealias ToTypeParam3 = Outer.ToTypeParam2 public typealias ToTypeParam4 = Outer.ToTypeParam1 } -public typealias Dyn = [ERROR : dynamic type in wrong context] +public typealias Dyn = [Error type: Dynamic type in a not allowed context] public typealias ToFun1 = () -> kotlin.Unit public typealias ToFun2 = (T) -> kotlin.Unit public typealias ToTypeParam1 = T diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.txt b/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.txt index 65226d254ca..1f0d3601a84 100644 --- a/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.txt +++ b/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.txt @@ -1,6 +1,6 @@ package -public fun foo(/*0*/ a0: test.ClassSample.Nested, /*1*/ a1: [ERROR : test.ClassAlias.Nested], /*2*/ b0: test.ObjectSample.Nested, /*3*/ b1: [ERROR : test.ObjectAlias.Nested], /*4*/ c0: test.EnumSample.Nested, /*5*/ c1: [ERROR : test.EnumAlias.Nested]): kotlin.Unit +public fun foo(/*0*/ a0: test.ClassSample.Nested, /*1*/ a1: [Error type: Unresolved type for test.ClassAlias.Nested], /*2*/ b0: test.ObjectSample.Nested, /*3*/ b1: [Error type: Unresolved type for test.ObjectAlias.Nested], /*4*/ c0: test.EnumSample.Nested, /*5*/ c1: [Error type: Unresolved type for test.EnumAlias.Nested]): kotlin.Unit package test { diff --git a/compiler/testData/diagnostics/tests/unsignedTypes/explicitUnsignedLongTypeCheck.txt b/compiler/testData/diagnostics/tests/unsignedTypes/explicitUnsignedLongTypeCheck.txt index c376a8f1437..25ffeeaaa18 100644 --- a/compiler/testData/diagnostics/tests/unsignedTypes/explicitUnsignedLongTypeCheck.txt +++ b/compiler/testData/diagnostics/tests/unsignedTypes/explicitUnsignedLongTypeCheck.txt @@ -4,6 +4,6 @@ public val a0: kotlin.Int = 1.toULong() public val a1: kotlin.UInt = 1.toULong() public val a3: kotlin.ULong = 1.toULong() public val a4: kotlin.ULong -public val a5: [ERROR : Type for -1UL] +public val a5: [Error type: Not found recorded type for -1UL] public fun takeULong(/*0*/ u: kotlin.ULong): kotlin.Unit public fun test(): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/unsignedTypes/unsignedLiteralsTypeCheck.txt b/compiler/testData/diagnostics/tests/unsignedTypes/unsignedLiteralsTypeCheck.txt index 8d7712457ac..14fa9aa1d5d 100644 --- a/compiler/testData/diagnostics/tests/unsignedTypes/unsignedLiteralsTypeCheck.txt +++ b/compiler/testData/diagnostics/tests/unsignedTypes/unsignedLiteralsTypeCheck.txt @@ -8,7 +8,7 @@ public val c1: kotlin.Comparable public val h1: kotlin.UInt = 255.toUInt() public val h2: kotlin.UShort = 255.toUShort() public val i0: kotlin.Int = 1.toUInt() -public val m0: [ERROR : Type for -1u] +public val m0: [Error type: Not found recorded type for -1u] public val m1: kotlin.UInt public val n0: kotlin.Number = 1.toUInt() public val u0: kotlin.UInt = 1.toUInt() diff --git a/compiler/testData/diagnostics/tests/valueClasses/unsignedLiteralsWithoutArtifactOnClasspath.txt b/compiler/testData/diagnostics/tests/valueClasses/unsignedLiteralsWithoutArtifactOnClasspath.txt index 1fd389d53fc..2e81ac078d2 100644 --- a/compiler/testData/diagnostics/tests/valueClasses/unsignedLiteralsWithoutArtifactOnClasspath.txt +++ b/compiler/testData/diagnostics/tests/valueClasses/unsignedLiteralsWithoutArtifactOnClasspath.txt @@ -1,5 +1,5 @@ package -public val u1: [ERROR : Type cannot be resolved. Please make sure you have the required dependencies for unsigned types in the classpath] -public val u2: [ERROR : Type cannot be resolved. Please make sure you have the required dependencies for unsigned types in the classpath] -public val u3: [ERROR : Type cannot be resolved. Please make sure you have the required dependencies for unsigned types in the classpath] +public val u1: [Error type: Error constant value Type cannot be resolved. Please make sure you have the required dependencies for unsigned types in the classpath] +public val u2: [Error type: Error constant value Type cannot be resolved. Please make sure you have the required dependencies for unsigned types in the classpath] +public val u3: [Error type: Error constant value Type cannot be resolved. Please make sure you have the required dependencies for unsigned types in the classpath] diff --git a/compiler/testData/diagnostics/tests/variance/InPosition.txt b/compiler/testData/diagnostics/tests/variance/InPosition.txt index 17c918de3a3..a183bf9546e 100644 --- a/compiler/testData/diagnostics/tests/variance/InPosition.txt +++ b/compiler/testData/diagnostics/tests/variance/InPosition.txt @@ -43,12 +43,12 @@ public interface Test { public abstract fun neOk12(/*0*/ i: Inv): kotlin.Unit public abstract fun neOk2(/*0*/ i: In): kotlin.Unit public abstract fun neOk3(/*0*/ i: In>): kotlin.Unit - public abstract fun neOk30(/*0*/ i: [ERROR : Pair]): kotlin.Unit - public abstract fun neOk31(/*0*/ i: Pair): kotlin.Unit - public abstract fun neOk32(/*0*/ i: [ERROR : Inv]): kotlin.Unit - public abstract fun neOk33(/*0*/ i: Inv<[ERROR : No type element]>): kotlin.Unit - public abstract fun neOk34(/*0*/ i: Inv<[ERROR : C]>): kotlin.Unit - public abstract fun neOk35(/*0*/ i: [ERROR : Inv]): kotlin.Unit + public abstract fun neOk30(/*0*/ i: [Error type: Type for error type constructor (Pair)]): kotlin.Unit + public abstract fun neOk31(/*0*/ i: Pair): kotlin.Unit + public abstract fun neOk32(/*0*/ i: [Error type: Type for error type constructor (Inv)]): kotlin.Unit + public abstract fun neOk33(/*0*/ i: Inv<[Error type: No type specified for unknown element]>): kotlin.Unit + public abstract fun neOk34(/*0*/ i: Inv<[Error type: Unresolved type for C]>): kotlin.Unit + public abstract fun neOk35(/*0*/ i: [Error type: Type for error type constructor (Inv)]): kotlin.Unit public abstract fun neOk4(/*0*/ i: Inv): kotlin.Unit public abstract fun neOk5(/*0*/ i: Inv): kotlin.Unit public abstract fun neOk6(/*0*/ i: In>): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/variance/InvariantPosition.txt b/compiler/testData/diagnostics/tests/variance/InvariantPosition.txt index 5f98f85de1d..64fa308854e 100644 --- a/compiler/testData/diagnostics/tests/variance/InvariantPosition.txt +++ b/compiler/testData/diagnostics/tests/variance/InvariantPosition.txt @@ -40,12 +40,12 @@ public interface Test { public abstract var neOk22: Inv public abstract var neOk23: Inv public abstract var neOk3: In> - public abstract var neOk30: [ERROR : Pair] - public abstract var neOk31: Pair - public abstract var neOk32: [ERROR : Inv] - public abstract var neOk33: Inv<[ERROR : No type element]> - public abstract var neOk34: Inv<[ERROR : C]> - public abstract var neOk35: [ERROR : Inv] + public abstract var neOk30: [Error type: Type for error type constructor (Pair)] + public abstract var neOk31: Pair + public abstract var neOk32: [Error type: Type for error type constructor (Inv)] + public abstract var neOk33: Inv<[Error type: No type specified for unknown element]> + public abstract var neOk34: Inv<[Error type: Unresolved type for C]> + public abstract var neOk35: [Error type: Type for error type constructor (Inv)] public abstract var neOk4: Inv public abstract var neOk5: Inv public abstract var neOk6: In> diff --git a/compiler/testData/diagnostics/tests/variance/OutPosition.txt b/compiler/testData/diagnostics/tests/variance/OutPosition.txt index fe9aacbe2e3..b0a163d586e 100644 --- a/compiler/testData/diagnostics/tests/variance/OutPosition.txt +++ b/compiler/testData/diagnostics/tests/variance/OutPosition.txt @@ -32,12 +32,12 @@ public interface Test { public abstract fun neOk11(): Inv public abstract fun neOk2(): In public abstract fun neOk3(): In> - public abstract fun neOk30(): [ERROR : Pair] - public abstract fun neOk31(): Pair - public abstract fun neOk32(): [ERROR : Inv] - public abstract fun neOk33(): Inv<[ERROR : No type element]> - public abstract fun neOk34(): Inv<[ERROR : C]> - public abstract fun neOk35(): [ERROR : Inv] + public abstract fun neOk30(): [Error type: Type for error type constructor (Pair)] + public abstract fun neOk31(): Pair + public abstract fun neOk32(): [Error type: Type for error type constructor (Inv)] + public abstract fun neOk33(): Inv<[Error type: No type specified for unknown element]> + public abstract fun neOk34(): Inv<[Error type: Unresolved type for C]> + public abstract fun neOk35(): [Error type: Type for error type constructor (Inv)] public abstract fun neOk4(): Inv public abstract fun neOk5(): Inv public abstract fun neOk6(): Pair, I> diff --git a/compiler/testData/diagnostics/tests/variance/ea1337846.txt b/compiler/testData/diagnostics/tests/variance/ea1337846.txt index fc4323da719..5a47c264cf8 100644 --- a/compiler/testData/diagnostics/tests/variance/ea1337846.txt +++ b/compiler/testData/diagnostics/tests/variance/ea1337846.txt @@ -1,7 +1,7 @@ package public interface ComputablePath { - public abstract fun anyTwoSegments(/*0*/ comparator: EachSegmentComparator<[ERROR : ComputableSegment]> /* = ([ERROR : ComputableSegment], [ERROR : ComputableSegment], relationship: kotlin.Int) -> kotlin.Boolean */): kotlin.Boolean + public abstract fun anyTwoSegments(/*0*/ comparator: EachSegmentComparator<[Error type: Unresolved type for ComputableSegment]> /* = ([Error type: Unresolved type for ComputableSegment], [Error type: Unresolved type for ComputableSegment], relationship: kotlin.Int) -> kotlin.Boolean */): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/classLiteral/arrays_after.txt b/compiler/testData/diagnostics/testsWithJsStdLib/classLiteral/arrays_after.txt index 9a31b37a57a..75b116a3814 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/classLiteral/arrays_after.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/classLiteral/arrays_after.txt @@ -1,7 +1,7 @@ package public val a01: kotlin.reflect.KClass> -public val a02: kotlin.reflect.KClass> +public val a02: kotlin.reflect.KClass> public val a03: kotlin.reflect.KClass> public val a04: kotlin.reflect.KClass?>> public val a05: kotlin.reflect.KClass> diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/classLiteral/arrays_before.txt b/compiler/testData/diagnostics/testsWithJsStdLib/classLiteral/arrays_before.txt index 9a31b37a57a..75b116a3814 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/classLiteral/arrays_before.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/classLiteral/arrays_before.txt @@ -1,7 +1,7 @@ package public val a01: kotlin.reflect.KClass> -public val a02: kotlin.reflect.KClass> +public val a02: kotlin.reflect.KClass> public val a03: kotlin.reflect.KClass> public val a04: kotlin.reflect.KClass?>> public val a05: kotlin.reflect.KClass> diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasExpandingToDynamic.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasExpandingToDynamic.txt index 45e6ed560ae..1ab2c36cfed 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasExpandingToDynamic.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/typealiasExpandingToDynamic.txt @@ -1,6 +1,6 @@ package -public typealias Dyn = [ERROR : dynamic type in wrong context] +public typealias Dyn = [Error type: Dynamic type in a not allowed context] public typealias Dyn2 = Dyn public typealias Dyn3 = Dyn2 public typealias Dyn4 = Type diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/jvmDeclarations/cloneable.txt b/compiler/testData/diagnostics/testsWithJsStdLib/jvmDeclarations/cloneable.txt index 7b01c793e11..c6f7b4bf798 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/jvmDeclarations/cloneable.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/jvmDeclarations/cloneable.txt @@ -1,3 +1,3 @@ package -public fun cloneable(): [ERROR : Cloneable] +public fun cloneable(): [Error type: Unresolved type for Cloneable] diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelExtensionFun.txt b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelExtensionFun.txt index fdc58108e74..a9116ec96f6 100644 --- a/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelExtensionFun.txt +++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelExtensionFun.txt @@ -1,7 +1,7 @@ package @kotlin.js.nativeSetter public fun kotlin.Any.foo(/*0*/ a: kotlin.String = ..., /*1*/ v: kotlin.String = ...): kotlin.String -@kotlin.js.nativeSetter public fun kotlin.Int.set(/*0*/ a: [ERROR : A]): kotlin.Int? +@kotlin.js.nativeSetter public fun kotlin.Int.set(/*0*/ a: [Error type: Unresolved type for A]): kotlin.Int? @kotlin.js.nativeSetter public fun kotlin.Int.set(/*0*/ a: kotlin.String, /*1*/ v: kotlin.Int): kotlin.Unit @kotlin.js.nativeSetter public fun kotlin.Int.set2(): kotlin.String? @kotlin.js.nativeSetter public fun kotlin.Int.set2(/*0*/ a: kotlin.Number, /*1*/ v: kotlin.String?): kotlin.Any? diff --git a/compiler/testData/diagnostics/testsWithStdLib/RenameOnImportHidesDefaultImport.txt b/compiler/testData/diagnostics/testsWithStdLib/RenameOnImportHidesDefaultImport.txt index dde5b3e6d6f..520f677d3c4 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/RenameOnImportHidesDefaultImport.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/RenameOnImportHidesDefaultImport.txt @@ -1,4 +1,4 @@ package public fun f(): kotlin.Unit -public fun g(/*0*/ a1: kotlin.Array, /*1*/ a2: [ERROR : Array]): kotlin.Unit +public fun g(/*0*/ a1: kotlin.Array, /*1*/ a2: [Error type: Unresolved type for Array]): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/callableReferenceOnUnresolvedLHS.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/callableReferenceOnUnresolvedLHS.txt index 463ac36505d..34e10c628ae 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/callableReferenceOnUnresolvedLHS.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/callableReference/callableReferenceOnUnresolvedLHS.txt @@ -14,8 +14,8 @@ public interface Inv { } public final class Scope { - public constructor Scope(/*0*/ implClass: [ERROR : j.Class]) - private final val implClass: [ERROR : j.Class] + public constructor Scope(/*0*/ implClass: [Error type: Unresolved type for j.Class]) + private final val implClass: [Error type: Unresolved type for j.Class] public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final fun foo(/*0*/ c: kotlin.collections.Collection): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.ni.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.ni.txt index f3a2ee1919d..0972b686d7f 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.ni.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.ni.txt @@ -1,7 +1,7 @@ package public val test1: kotlin.String -public val test2: [ERROR : Type for generate { +public val test2: [Error type: Not found recorded type for generate { baseExtension() }] public val test3: kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.ni.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.ni.txt index fd48df2e0e9..e76daded9af 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.ni.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.ni.txt @@ -1,13 +1,13 @@ package public val test1: kotlin.String -public val test2: [ERROR : Type for generate { +public val test2: [Error type: Not found recorded type for generate { starBase() }] public val test3: kotlin.String public val test4: kotlin.Int public val test5: kotlin.Int -public val test6: [ERROR : Type for generateSpecific { +public val test6: [Error type: Not found recorded type for generateSpecific { stringBase() }] public fun generate(/*0*/ @kotlin.BuilderInference g: suspend Controller.() -> kotlin.Unit): S diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.ni.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.ni.txt index e1c830c8f28..a9e794c6cff 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.ni.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.ni.txt @@ -1,6 +1,6 @@ package -public val test1: [ERROR : Type for generate { +public val test1: [Error type: Not found recorded type for generate { yield(A) }] public val test2: kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt28658.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt28658.txt index 8493bf7b6b3..bb57cac859d 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt28658.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt28658.txt @@ -3,7 +3,7 @@ package public fun f1(/*0*/ f: Foo.() -> kotlin.Unit): kotlin.Unit @kotlin.OptIn(markerClass = {kotlin.experimental.ExperimentalTypeInference::class}) public fun f2(/*0*/ @kotlin.BuilderInference f: Foo.() -> kotlin.Unit): kotlin.Unit public fun test1(): kotlin.Unit -public fun test2(): [ERROR : Error function type] +public fun test2(): [Error type: Return type for function cannot be resolved] public fun test3(): kotlin.Unit public final class Foo { diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt index ecd5c30af16..963685c8eb3 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/noDefaultCoroutineImports.txt @@ -1,4 +1,4 @@ package -public fun test(/*0*/ c: [ERROR : Continuation]): kotlin.Unit +public fun test(/*0*/ c: [Error type: Unresolved type for Continuation]): kotlin.Unit public fun test2(/*0*/ c: kotlin.coroutines.Continuation): kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.txt index db83bfa873b..c52401dbf7c 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.txt @@ -1,5 +1,5 @@ package -public typealias Test1 = [ERROR : SuspendFunction0] -public typealias Test2 = [ERROR : kotlin.SuspendFunction0] +public typealias Test1 = [Error type: Unresolved type for SuspendFunction0] +public typealias Test2 = [Error type: Unresolved type for kotlin.SuspendFunction0] public typealias Test3 = suspend () -> kotlin.Unit diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt36951.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt36951.txt index ae626f8ca0c..bdfa63d269e 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt36951.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt36951.txt @@ -1,7 +1,7 @@ package -public final class Base : kotlin.collections.HashSet /* = java.util.HashSet */ { - public constructor Base() +public final class Base : kotlin.collections.HashSet /* = java.util.HashSet */ { + public constructor Base() invisible_fake final override /*1*/ /*fake_override*/ var map: java.util.HashMap! public open override /*1*/ /*fake_override*/ val size: kotlin.Int public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt index 6f7541f9aa8..e1c6e18fdae 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.txt @@ -7,7 +7,7 @@ package test { public val a3: java.lang.Class public val a4: java.lang.Class public val a5: java.lang.Class - public val e0: [ERROR : Type for E.javaClass] + public val e0: [Error type: Not found recorded type for E.javaClass] public val e1: java.lang.Class public val e2: java.lang.Class public val int0: java.lang.Class diff --git a/compiler/testData/diagnostics/testsWithStdLib/reflection/noReflectionInClassPath.txt b/compiler/testData/diagnostics/testsWithStdLib/reflection/noReflectionInClassPath.txt index 35aaa651fa1..d8b8f45bd45 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/reflection/noReflectionInClassPath.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/reflection/noReflectionInClassPath.txt @@ -15,7 +15,7 @@ public fun n11(): kotlin.Unit public fun y01(): kotlin.reflect.KProperty1.Getter public fun y02(): kotlin.collections.Collection> public fun y03(): kotlin.String? -public fun y04(): [ERROR : Error function type] +public fun y04(): [Error type: Return type for function cannot be resolved] public final class Foo { public constructor Foo(/*0*/ prop: kotlin.Any) diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/ea65206.txt b/compiler/testData/diagnostics/testsWithStdLib/regression/ea65206.txt index 498748299fd..71d49485bee 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/regression/ea65206.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/regression/ea65206.txt @@ -2,7 +2,7 @@ package public final class A { public constructor A() - public final val x: kotlin.collections.ArrayList<([ERROR : A]<[ERROR : No type element]>) -> kotlin.Unit> /* = java.util.ArrayList<([ERROR : A]<[ERROR : No type element]>) -> kotlin.Unit> */ + public final val x: kotlin.collections.ArrayList<([Error type: Type for error type constructor (A)]<[Error type: No type specified for unknown element]>) -> kotlin.Unit> /* = java.util.ArrayList<([Error type: Type for error type constructor (A)]<[Error type: No type specified for unknown element]>) -> kotlin.Unit> */ public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public final fun foo(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/kt37727.txt b/compiler/testData/diagnostics/testsWithStdLib/regression/kt37727.txt index 08ceed617d2..a26184bc808 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/regression/kt37727.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/regression/kt37727.txt @@ -1,12 +1,12 @@ package public final data class A { - public constructor A(/*0*/ x: kotlin.collections.Set<[ERROR : CLassNotFound]> = ...) - public final val x: kotlin.collections.Set<[ERROR : CLassNotFound]> - public final operator /*synthesized*/ fun component1(): kotlin.collections.Set<[ERROR : CLassNotFound]> - public final /*synthesized*/ fun copy(/*0*/ x: kotlin.collections.Set<[ERROR : CLassNotFound]> = ...): A + public constructor A(/*0*/ x: kotlin.collections.Set<[Error type: Unresolved type for CLassNotFound]> = ...) + public final val x: kotlin.collections.Set<[Error type: Unresolved type for CLassNotFound]> + public final operator /*synthesized*/ fun component1(): kotlin.collections.Set<[Error type: Unresolved type for CLassNotFound]> + public final /*synthesized*/ fun copy(/*0*/ x: kotlin.collections.Set<[Error type: Unresolved type for CLassNotFound]> = ...): A public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String - public final fun with(/*0*/ x: kotlin.collections.Set<[ERROR : CLassNotFound]>? = ...): kotlin.Unit + public final fun with(/*0*/ x: kotlin.collections.Set<[Error type: Unresolved type for CLassNotFound]>? = ...): kotlin.Unit } diff --git a/compiler/testData/diagnostics/testsWithStdLib/typealias/exceptionTypeAliasesInvisibleWithApiVersion1_0.txt b/compiler/testData/diagnostics/testsWithStdLib/typealias/exceptionTypeAliasesInvisibleWithApiVersion1_0.txt index 2f65e9970c7..8eef4d1538c 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/typealias/exceptionTypeAliasesInvisibleWithApiVersion1_0.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/typealias/exceptionTypeAliasesInvisibleWithApiVersion1_0.txt @@ -1,4 +1,4 @@ package -public val barException: [ERROR : Type for kotlin.Exception("bar")] +public val barException: [Error type: Not found recorded type for kotlin.Exception("bar")] public val fooException: java.lang.Exception diff --git a/compiler/testData/ir/irText/errors/unresolvedReference.ir.txt b/compiler/testData/ir/irText/errors/unresolvedReference.ir.txt index 08ca416ea47..b765f8750d0 100644 --- a/compiler/testData/ir/irText/errors/unresolvedReference.ir.txt +++ b/compiler/testData/ir/irText/errors/unresolvedReference.ir.txt @@ -1,39 +1,39 @@ FILE fqName: fileName:/unresolvedReference.kt PROPERTY name:test1 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType([ERROR : Type for unresolved]) visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType([Error type: Not found recorded type for unresolved]) visibility:private [final,static] EXPRESSION_BODY - ERROR_CALL 'unresolved' type=IrErrorType([ERROR : ]) - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:IrErrorType([ERROR : Type for unresolved]) + ERROR_CALL 'unresolved' type=IrErrorType([Error type: Error expression type]) + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:IrErrorType([Error type: Not found recorded type for unresolved]) correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): IrErrorType([ERROR : Type for unresolved]) declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType([ERROR : Type for unresolved]) visibility:private [final,static]' type=IrErrorType([ERROR : Type for unresolved]) origin=null + RETURN type=kotlin.Nothing from='public final fun (): IrErrorType([Error type: Not found recorded type for unresolved]) declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType([Error type: Not found recorded type for unresolved]) visibility:private [final,static]' type=IrErrorType([Error type: Not found recorded type for unresolved]) origin=null PROPERTY name:test2 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType([ERROR : Unresolved]) visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType([Error type: Unresolved type for Unresolved]) visibility:private [final,static] EXPRESSION_BODY - ERROR_CALL 'unresolved()' type=IrErrorType([ERROR : ]) - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:IrErrorType([ERROR : Unresolved]) + ERROR_CALL 'unresolved()' type=IrErrorType([Error type: Error expression type]) + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:IrErrorType([Error type: Unresolved type for Unresolved]) correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): IrErrorType([ERROR : Unresolved]) declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType([ERROR : Unresolved]) visibility:private [final,static]' type=IrErrorType([ERROR : Unresolved]) origin=null + RETURN type=kotlin.Nothing from='public final fun (): IrErrorType([Error type: Unresolved type for Unresolved]) declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType([Error type: Unresolved type for Unresolved]) visibility:private [final,static]' type=IrErrorType([Error type: Unresolved type for Unresolved]) origin=null PROPERTY name:test3 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test3 type:IrErrorType([ERROR : Type for 42.unresolved(56)]) visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test3 type:IrErrorType([Error type: Not found recorded type for 42.unresolved(56)]) visibility:private [final,static] EXPRESSION_BODY - ERROR_CALL 'unresolved(56)' type=IrErrorType([ERROR : ]) + ERROR_CALL 'unresolved(56)' type=IrErrorType([Error type: Error expression type]) receiver: CONST Int type=kotlin.Int value=42 CONST Int type=kotlin.Int value=56 - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:IrErrorType([ERROR : Type for 42.unresolved(56)]) + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:IrErrorType([Error type: Not found recorded type for 42.unresolved(56)]) correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): IrErrorType([ERROR : Type for 42.unresolved(56)]) declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:IrErrorType([ERROR : Type for 42.unresolved(56)]) visibility:private [final,static]' type=IrErrorType([ERROR : Type for 42.unresolved(56)]) origin=null + RETURN type=kotlin.Nothing from='public final fun (): IrErrorType([Error type: Not found recorded type for 42.unresolved(56)]) declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:IrErrorType([Error type: Not found recorded type for 42.unresolved(56)]) visibility:private [final,static]' type=IrErrorType([Error type: Not found recorded type for 42.unresolved(56)]) origin=null PROPERTY name:test4 visibility:public modality:FINAL [val] - FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType([ERROR : Type for 42 *]) visibility:private [final,static] + FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType([Error type: Not found recorded type for 42 *]) visibility:private [final,static] EXPRESSION_BODY - ERROR_EXPR '42 *' type=IrErrorType([ERROR : ]) - FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:IrErrorType([ERROR : Type for 42 *]) + ERROR_EXPR '42 *' type=IrErrorType([Error type: Error expression type]) + FUN DEFAULT_PROPERTY_ACCESSOR name: visibility:public modality:FINAL <> () returnType:IrErrorType([Error type: Not found recorded type for 42 *]) correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val] BLOCK_BODY - RETURN type=kotlin.Nothing from='public final fun (): IrErrorType([ERROR : Type for 42 *]) declared in ' - GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType([ERROR : Type for 42 *]) visibility:private [final,static]' type=IrErrorType([ERROR : Type for 42 *]) origin=null + RETURN type=kotlin.Nothing from='public final fun (): IrErrorType([Error type: Not found recorded type for 42 *]) declared in ' + GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType([Error type: Not found recorded type for 42 *]) visibility:private [final,static]' type=IrErrorType([Error type: Not found recorded type for 42 *]) origin=null diff --git a/compiler/testData/type/binding/explicit/errorPair.kt b/compiler/testData/type/binding/explicit/errorPair.kt index 87b295376aa..d6cfc3eb330 100644 --- a/compiler/testData/type/binding/explicit/errorPair.kt +++ b/compiler/testData/type/binding/explicit/errorPair.kt @@ -1,11 +1,11 @@ val foo: Pair>, String> = null!! /* psi: Pair>, String> -type: Pair<[ERROR : Pair]>, String> +type: Pair<[Error type: Type for error type constructor (Pair)]>, String> typeParameter: defined in kotlin.Pair - typeProjection: [ERROR : Pair]> + typeProjection: [Error type: Type for error type constructor (Pair)]> psi: Pair> - type: [ERROR : Pair]> + type: [Error type: Type for error type constructor (Pair)]> typeParameter: null typeProjection: List psi: List diff --git a/compiler/testData/type/binding/explicit/errorWithProjection.kt b/compiler/testData/type/binding/explicit/errorWithProjection.kt index d794b6186c5..6375682cda8 100644 --- a/compiler/testData/type/binding/explicit/errorWithProjection.kt +++ b/compiler/testData/type/binding/explicit/errorWithProjection.kt @@ -1,7 +1,7 @@ val foo: List = null!! /* psi: List -type: [ERROR : List] +type: [Error type: Type for error type constructor (List)] typeParameter: null typeProjection: Int psi: Int diff --git a/compiler/testData/type/binding/explicit/list0.kt b/compiler/testData/type/binding/explicit/list0.kt index 17615f9d48f..840659cc3c1 100644 --- a/compiler/testData/type/binding/explicit/list0.kt +++ b/compiler/testData/type/binding/explicit/list0.kt @@ -1,5 +1,5 @@ val foo: List = null!! /* psi: List -type: [ERROR : List] +type: [Error type: Type for error type constructor (List)] */ \ No newline at end of file diff --git a/compiler/testData/type/binding/explicit/list2.kt b/compiler/testData/type/binding/explicit/list2.kt index 0485fc1e87d..3e40f0ca039 100644 --- a/compiler/testData/type/binding/explicit/list2.kt +++ b/compiler/testData/type/binding/explicit/list2.kt @@ -1,7 +1,7 @@ val foo: List> = null!! /* psi: List> -type: [ERROR : List]> +type: [Error type: Type for error type constructor (List)]> typeParameter: null typeProjection: String psi: String diff --git a/compiler/testData/type/binding/explicit/unresolvedType.kt b/compiler/testData/type/binding/explicit/unresolvedType.kt index 16d754ba5b3..048356e0f8f 100644 --- a/compiler/testData/type/binding/explicit/unresolvedType.kt +++ b/compiler/testData/type/binding/explicit/unresolvedType.kt @@ -1,17 +1,17 @@ val foo: List>> = null!! /* psi: List>> -type: List<[ERROR : adad>]>> +type: List<[Error type: Unresolved type for adad>]>> typeParameter: defined in kotlin.collections.List - typeProjection: [ERROR : adad>]> + typeProjection: [Error type: Unresolved type for adad>]> psi: adad> - type: [ERROR : adad>]> + type: [Error type: Unresolved type for adad>]> typeParameter: null - typeProjection: List<[ERROR : dd]> + typeProjection: List<[Error type: Unresolved type for dd]> psi: List
- type: List<[ERROR : dd]> + type: List<[Error type: Unresolved type for dd]> typeParameter: defined in kotlin.collections.List - typeProjection: [ERROR : dd] + typeProjection: [Error type: Unresolved type for dd] psi: dd - type: [ERROR : dd] + type: [Error type: Unresolved type for dd] */ \ No newline at end of file diff --git a/compiler/testData/type/binding/implicit/conflictingProjection.kt b/compiler/testData/type/binding/implicit/conflictingProjection.kt index 69f803554d9..977b16a41b9 100644 --- a/compiler/testData/type/binding/implicit/conflictingProjection.kt +++ b/compiler/testData/type/binding/implicit/conflictingProjection.kt @@ -3,5 +3,5 @@ fun getT(): T = null!! val foo = getT>() /* psi: val foo = getT>() -type: [ERROR : Inconsistent type: List (0 parameter has declared variance: out, but argument variance is in)] +type: [Error type: Resolution error type (Inconsistent type: List (0 parameter has declared variance: out, but argument variance is in))] */ \ No newline at end of file diff --git a/compiler/testData/type/binding/implicit/conflictingProjection2.kt b/compiler/testData/type/binding/implicit/conflictingProjection2.kt index 243efabe34e..da83fd7359e 100644 --- a/compiler/testData/type/binding/implicit/conflictingProjection2.kt +++ b/compiler/testData/type/binding/implicit/conflictingProjection2.kt @@ -3,5 +3,5 @@ fun getT(): T = null!! val foo = getT>>() /* psi: val foo = getT>>() -type: [ERROR : Inconsistent type: List> (0 parameter has declared variance: out, but argument variance is in)] +type: [Error type: Resolution error type (Inconsistent type: List> (0 parameter has declared variance: out, but argument variance is in))] */ \ No newline at end of file diff --git a/compiler/testData/type/binding/implicit/errorPair.kt b/compiler/testData/type/binding/implicit/errorPair.kt index ba812818a51..b66c70be0fa 100644 --- a/compiler/testData/type/binding/implicit/errorPair.kt +++ b/compiler/testData/type/binding/implicit/errorPair.kt @@ -3,11 +3,11 @@ fun getT(): T = null!! val foo = getT>, String>>() /* psi: val foo = getT>, String>>() -type: Pair<[ERROR : Pair]>, String> +type: Pair<[Error type: Type for error type constructor (Pair)]>, String> typeParameter: defined in kotlin.Pair - typeProjection: [ERROR : Pair]> + typeProjection: [Error type: Type for error type constructor (Pair)]> psi: val foo = getT>, String>>() - type: [ERROR : Pair]> + type: [Error type: Type for error type constructor (Pair)]> typeParameter: null typeProjection: List psi: val foo = getT>, String>>() diff --git a/compiler/testData/type/binding/implicit/errorWithProjection.kt b/compiler/testData/type/binding/implicit/errorWithProjection.kt index c74b0105256..d36516e6da1 100644 --- a/compiler/testData/type/binding/implicit/errorWithProjection.kt +++ b/compiler/testData/type/binding/implicit/errorWithProjection.kt @@ -3,5 +3,5 @@ fun getT(): T = null!! val foo = getT>() /* psi: val foo = getT>() -type: [ERROR : Type for getT>()] +type: [Error type: Not found recorded type for getT>()] */ \ No newline at end of file diff --git a/compiler/testData/type/binding/implicit/inProjection.kt b/compiler/testData/type/binding/implicit/inProjection.kt index 4341140bbc6..9c388a13044 100644 --- a/compiler/testData/type/binding/implicit/inProjection.kt +++ b/compiler/testData/type/binding/implicit/inProjection.kt @@ -8,13 +8,13 @@ fun getT(): T = null!! val foo = getT>>>() /* psi: val foo = getT>>>() -type: Inv (0 parameter has declared variance: out, but argument variance is in)]>> +type: Inv (0 parameter has declared variance: out, but argument variance is in))]>> typeParameter: defined in Inv - typeProjection: in In<[ERROR : Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in)]> + typeProjection: in In<[Error type: Resolution error type (Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in))]> psi: val foo = getT>>>() - type: In<[ERROR : Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in)]> + type: In<[Error type: Resolution error type (Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in))]> typeParameter: defined in In - typeProjection: [ERROR : Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in)] + typeProjection: [Error type: Resolution error type (Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in))] psi: val foo = getT>>>() - type: [ERROR : Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in)] + type: [Error type: Resolution error type (Inconsistent type: Out (0 parameter has declared variance: out, but argument variance is in))] */ \ No newline at end of file diff --git a/compiler/testData/type/binding/implicit/list0.kt b/compiler/testData/type/binding/implicit/list0.kt index 0ca9dcde8c4..e3070d58f10 100644 --- a/compiler/testData/type/binding/implicit/list0.kt +++ b/compiler/testData/type/binding/implicit/list0.kt @@ -3,5 +3,5 @@ fun getT(): T = null!! val foo = getT() /* psi: val foo = getT() -type: [ERROR : Type for getT()] +type: [Error type: Not found recorded type for getT()] */ \ No newline at end of file diff --git a/compiler/testData/type/binding/implicit/list2.kt b/compiler/testData/type/binding/implicit/list2.kt index 2691c4eedb8..64a15bed232 100644 --- a/compiler/testData/type/binding/implicit/list2.kt +++ b/compiler/testData/type/binding/implicit/list2.kt @@ -3,5 +3,5 @@ fun getT(): T = null!! val foo = getT>>() /* psi: val foo = getT>>() -type: [ERROR : Type for getT>>()] +type: [Error type: Not found recorded type for getT>>()] */ \ No newline at end of file diff --git a/compiler/testData/type/binding/implicit/outProjection.kt b/compiler/testData/type/binding/implicit/outProjection.kt index 6f90465f1a3..916cbd7014e 100644 --- a/compiler/testData/type/binding/implicit/outProjection.kt +++ b/compiler/testData/type/binding/implicit/outProjection.kt @@ -8,9 +8,9 @@ fun getT(): T = null!! val foo = getT>>>() /* psi: val foo = getT>>>() -type: Inv> (0 parameter has declared variance: in, but argument variance is out)]> +type: Inv> (0 parameter has declared variance: in, but argument variance is out))]> typeParameter: defined in Inv - typeProjection: out [ERROR : Inconsistent type: In> (0 parameter has declared variance: in, but argument variance is out)] + typeProjection: out [Error type: Resolution error type (Inconsistent type: In> (0 parameter has declared variance: in, but argument variance is out))] psi: val foo = getT>>>() - type: [ERROR : Inconsistent type: In> (0 parameter has declared variance: in, but argument variance is out)] + type: [Error type: Resolution error type (Inconsistent type: In> (0 parameter has declared variance: in, but argument variance is out))] */ \ No newline at end of file diff --git a/compiler/testData/type/binding/implicit/unresolvedType.kt b/compiler/testData/type/binding/implicit/unresolvedType.kt index be2cb48fed8..cd092b73fb4 100644 --- a/compiler/testData/type/binding/implicit/unresolvedType.kt +++ b/compiler/testData/type/binding/implicit/unresolvedType.kt @@ -3,5 +3,5 @@ fun getT(): T = null!! val foo = getT>>() /* psi: val foo = getT>>() -type: [ERROR : Type for getT>>()] +type: [Error type: Not found recorded type for getT>>()] */ \ No newline at end of file diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.2.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.2.txt index 0f9b2997d6e..1baf41b8bf9 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.2.txt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.2.txt @@ -1,13 +1,13 @@ package -public val value_1: [ERROR : Type for _____0b0_1_1_1_0_1] -public val value_10: [ERROR : Type for _b] -public val value_12: [ERROR : Type for _b_] -public val value_2: [ERROR : Type for _0B1_______1_______1_______0] -public val value_3: [ERROR : Type for _0_0B1_0_1_1_1_0_1_1] -public val value_4: [ERROR : Type for _0B000000000] -public val value_5: [ERROR : Type for _0000000000b] -public val value_6: [ERROR : Type for _0_1b] -public val value_7: [ERROR : Type for ____________0b] -public val value_8: [ERROR : Type for _0_b_0] -public val value_9: [ERROR : Type for _b_0] +public val value_1: [Error type: Not found recorded type for _____0b0_1_1_1_0_1] +public val value_10: [Error type: Not found recorded type for _b] +public val value_12: [Error type: Not found recorded type for _b_] +public val value_2: [Error type: Not found recorded type for _0B1_______1_______1_______0] +public val value_3: [Error type: Not found recorded type for _0_0B1_0_1_1_1_0_1_1] +public val value_4: [Error type: Not found recorded type for _0B000000000] +public val value_5: [Error type: Not found recorded type for _0000000000b] +public val value_6: [Error type: Not found recorded type for _0_1b] +public val value_7: [Error type: Not found recorded type for ____________0b] +public val value_8: [Error type: Not found recorded type for _0_b_0] +public val value_9: [Error type: Not found recorded type for _b_0] diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.txt index 7545aba43f2..097641ae54b 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.txt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.txt @@ -1,10 +1,10 @@ package -public val value_1: [ERROR : Type for _5678_90] -public val value_2: [ERROR : Type for _2_3_4_5_6_7_8_9_] -public val value_3: [ERROR : Type for _____________0000] -public val value_4: [ERROR : Type for _______________________________________________________________________________________________________________________________________________________0] -public val value_5: [ERROR : Type for ____________________________________________________] -public val value_6: [ERROR : Type for _] -public val value_7: [ERROR : Type for _0_] -public val value_8: [ERROR : Type for _9_] +public val value_1: [Error type: Not found recorded type for _5678_90] +public val value_2: [Error type: Not found recorded type for _2_3_4_5_6_7_8_9_] +public val value_3: [Error type: Not found recorded type for _____________0000] +public val value_4: [Error type: Not found recorded type for _______________________________________________________________________________________________________________________________________________________0] +public val value_5: [Error type: Not found recorded type for ____________________________________________________] +public val value_6: [Error type: Not found recorded type for _] +public val value_7: [Error type: Not found recorded type for _0_] +public val value_8: [Error type: Not found recorded type for _9_] diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.2.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.2.txt index 7545aba43f2..097641ae54b 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.2.txt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.2.txt @@ -1,10 +1,10 @@ package -public val value_1: [ERROR : Type for _5678_90] -public val value_2: [ERROR : Type for _2_3_4_5_6_7_8_9_] -public val value_3: [ERROR : Type for _____________0000] -public val value_4: [ERROR : Type for _______________________________________________________________________________________________________________________________________________________0] -public val value_5: [ERROR : Type for ____________________________________________________] -public val value_6: [ERROR : Type for _] -public val value_7: [ERROR : Type for _0_] -public val value_8: [ERROR : Type for _9_] +public val value_1: [Error type: Not found recorded type for _5678_90] +public val value_2: [Error type: Not found recorded type for _2_3_4_5_6_7_8_9_] +public val value_3: [Error type: Not found recorded type for _____________0000] +public val value_4: [Error type: Not found recorded type for _______________________________________________________________________________________________________________________________________________________0] +public val value_5: [Error type: Not found recorded type for ____________________________________________________] +public val value_6: [Error type: Not found recorded type for _] +public val value_7: [Error type: Not found recorded type for _0_] +public val value_8: [Error type: Not found recorded type for _9_] diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.3.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.3.txt index 7545aba43f2..097641ae54b 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.3.txt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.3.txt @@ -1,10 +1,10 @@ package -public val value_1: [ERROR : Type for _5678_90] -public val value_2: [ERROR : Type for _2_3_4_5_6_7_8_9_] -public val value_3: [ERROR : Type for _____________0000] -public val value_4: [ERROR : Type for _______________________________________________________________________________________________________________________________________________________0] -public val value_5: [ERROR : Type for ____________________________________________________] -public val value_6: [ERROR : Type for _] -public val value_7: [ERROR : Type for _0_] -public val value_8: [ERROR : Type for _9_] +public val value_1: [Error type: Not found recorded type for _5678_90] +public val value_2: [Error type: Not found recorded type for _2_3_4_5_6_7_8_9_] +public val value_3: [Error type: Not found recorded type for _____________0000] +public val value_4: [Error type: Not found recorded type for _______________________________________________________________________________________________________________________________________________________0] +public val value_5: [Error type: Not found recorded type for ____________________________________________________] +public val value_6: [Error type: Not found recorded type for _] +public val value_7: [Error type: Not found recorded type for _0_] +public val value_8: [Error type: Not found recorded type for _9_] diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.2.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.2.txt index 565b7d2f196..86c4f191de6 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.2.txt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.2.txt @@ -1,13 +1,13 @@ package -public val value_1: [ERROR : Type for _____0x3_4_5_6_7_8] -public val value_10: [ERROR : Type for _x] -public val value_11: [ERROR : Type for _x_] -public val value_2: [ERROR : Type for _0X4_______5_______6_______7] -public val value_3: [ERROR : Type for _0_0X4_3_4_5_6_7_8_9] -public val value_4: [ERROR : Type for _0X000000000] -public val value_5: [ERROR : Type for _0000000000x] -public val value_6: [ERROR : Type for _0_9x] -public val value_7: [ERROR : Type for ____________0x] -public val value_8: [ERROR : Type for _0_x_0] -public val value_9: [ERROR : Type for _x_0] +public val value_1: [Error type: Not found recorded type for _____0x3_4_5_6_7_8] +public val value_10: [Error type: Not found recorded type for _x] +public val value_11: [Error type: Not found recorded type for _x_] +public val value_2: [Error type: Not found recorded type for _0X4_______5_______6_______7] +public val value_3: [Error type: Not found recorded type for _0_0X4_3_4_5_6_7_8_9] +public val value_4: [Error type: Not found recorded type for _0X000000000] +public val value_5: [Error type: Not found recorded type for _0000000000x] +public val value_6: [Error type: Not found recorded type for _0_9x] +public val value_7: [Error type: Not found recorded type for ____________0x] +public val value_8: [Error type: Not found recorded type for _0_x_0] +public val value_9: [Error type: Not found recorded type for _x_0] diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.txt index 565b7d2f196..86c4f191de6 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.txt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.txt @@ -1,13 +1,13 @@ package -public val value_1: [ERROR : Type for _____0x3_4_5_6_7_8] -public val value_10: [ERROR : Type for _x] -public val value_11: [ERROR : Type for _x_] -public val value_2: [ERROR : Type for _0X4_______5_______6_______7] -public val value_3: [ERROR : Type for _0_0X4_3_4_5_6_7_8_9] -public val value_4: [ERROR : Type for _0X000000000] -public val value_5: [ERROR : Type for _0000000000x] -public val value_6: [ERROR : Type for _0_9x] -public val value_7: [ERROR : Type for ____________0x] -public val value_8: [ERROR : Type for _0_x_0] -public val value_9: [ERROR : Type for _x_0] +public val value_1: [Error type: Not found recorded type for _____0x3_4_5_6_7_8] +public val value_10: [Error type: Not found recorded type for _x] +public val value_11: [Error type: Not found recorded type for _x_] +public val value_2: [Error type: Not found recorded type for _0X4_______5_______6_______7] +public val value_3: [Error type: Not found recorded type for _0_0X4_3_4_5_6_7_8_9] +public val value_4: [Error type: Not found recorded type for _0X000000000] +public val value_5: [Error type: Not found recorded type for _0000000000x] +public val value_6: [Error type: Not found recorded type for _0_9x] +public val value_7: [Error type: Not found recorded type for ____________0x] +public val value_8: [Error type: Not found recorded type for _0_x_0] +public val value_9: [Error type: Not found recorded type for _x_0] diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.txt index 1a7a4fd9bd3..1f7b0c14aa2 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.txt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.txt @@ -1,15 +1,15 @@ package -public val value_1: [ERROR : Type for E0] -public val value_10: [ERROR : Type for e666666] -public val value_11: [ERROR : Type for E7777777] -public val value_12: [ERROR : ] -public val value_13: [ERROR : ] -public val value_2: [ERROR : Type for e000] -public val value_3: [ERROR : ] -public val value_4: [ERROR : Type for e00] -public val value_5: [ERROR : ] -public val value_6: [ERROR : Type for e22] -public val value_7: [ERROR : ] -public val value_8: [ERROR : Type for e4444] -public val value_9: [ERROR : ] +public val value_1: [Error type: Not found recorded type for E0] +public val value_10: [Error type: Not found recorded type for e666666] +public val value_11: [Error type: Not found recorded type for E7777777] +public val value_12: [Error type: Return type for function cannot be resolved] +public val value_13: [Error type: Return type for function cannot be resolved] +public val value_2: [Error type: Not found recorded type for e000] +public val value_3: [Error type: Return type for function cannot be resolved] +public val value_4: [Error type: Not found recorded type for e00] +public val value_5: [Error type: Return type for function cannot be resolved] +public val value_6: [Error type: Not found recorded type for e22] +public val value_7: [Error type: Return type for function cannot be resolved] +public val value_8: [Error type: Not found recorded type for e4444] +public val value_9: [Error type: Return type for function cannot be resolved] diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.txt index 4cb4c271728..8eedff46486 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.txt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.txt @@ -1,15 +1,15 @@ package -public val value_1: [ERROR : Type for E0f] -public val value_10: [ERROR : Type for e666666F] -public val value_11: [ERROR : Type for E7777777f] -public val value_12: [ERROR : ] -public val value_13: [ERROR : ] -public val value_2: [ERROR : Type for e000F] -public val value_3: [ERROR : ] -public val value_4: [ERROR : Type for e00f] -public val value_5: [ERROR : ] -public val value_6: [ERROR : Type for e22F] -public val value_7: [ERROR : ] -public val value_8: [ERROR : Type for e4444f] -public val value_9: [ERROR : ] +public val value_1: [Error type: Not found recorded type for E0f] +public val value_10: [Error type: Not found recorded type for e666666F] +public val value_11: [Error type: Not found recorded type for E7777777f] +public val value_12: [Error type: Return type for function cannot be resolved] +public val value_13: [Error type: Return type for function cannot be resolved] +public val value_2: [Error type: Not found recorded type for e000F] +public val value_3: [Error type: Return type for function cannot be resolved] +public val value_4: [Error type: Not found recorded type for e00f] +public val value_5: [Error type: Return type for function cannot be resolved] +public val value_6: [Error type: Not found recorded type for e22F] +public val value_7: [Error type: Return type for function cannot be resolved] +public val value_8: [Error type: Not found recorded type for e4444f] +public val value_9: [Error type: Return type for function cannot be resolved] diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.txt index b2692d2a38c..d719e272d24 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.txt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.txt @@ -13,7 +13,7 @@ public val value_18: kotlin.Float = 8.8888888E7.toFloat() public val value_19: kotlin.Double public val value_2: kotlin.Double = 0.0.toDouble() public val value_20: kotlin.Float = Infinity.toFloat() -public val value_21: [ERROR : Type for 1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9e_-_0] +public val value_21: [Error type: Not found recorded type for 1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9e_-_0] public val value_22: kotlin.Float = Infinity.toFloat() public val value_23: kotlin.Float = 4560000.0.toFloat() public val value_24: kotlin.Double = 0.0654765.toDouble() diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.txt index 4f87db23bb7..283c46931b0 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.txt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.txt @@ -5,11 +5,11 @@ public val value_10: kotlin.Double = 0.0.toDouble() public val value_11: kotlin.Double = 0.0.toDouble() public val value_12: kotlin.Double = 3.33E102.toDouble() public val value_13: kotlin.Float = 0.0.toFloat() -public val value_14: [ERROR : Type for 5_________555_________5.0____e____-____9] +public val value_14: [Error type: Not found recorded type for 5_________555_________5.0____e____-____9] public val value_15: kotlin.Float = 6.66666E25.toFloat() public val value_16: kotlin.Double public val value_17: kotlin.Float = Infinity.toFloat() -public val value_18: [ERROR : Type for 1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9_e_-_0] +public val value_18: [Error type: Not found recorded type for 1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9_e_-_0] public val value_19: kotlin.Float = 4560000.0.toFloat() public val value_2: kotlin.Double = 210.0.toDouble() public val value_20: kotlin.Double = 4.565E8.toDouble() diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/14.txt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/14.txt index b0fcc76eeb8..e38111bf838 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/14.txt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/14.txt @@ -7,12 +7,12 @@ public inline fun case_4(/*0*/ block: () -> kotlin.Unit): kotlin.Unit public inline fun case_5(/*0*/ block: () -> kotlin.Unit): kotlin.Unit public inline fun case_6(/*0*/ block: () -> kotlin.Unit): kotlin.Unit public inline fun case_7(/*0*/ block: () -> kotlin.Unit): kotlin.Unit -public fun expandIn(/*0*/ vararg x: [ERROR : In] /*kotlin.Array]>*/): K -public fun expandInWithRemoveNullable(/*0*/ vararg x: [ERROR : In] /*kotlin.Array]>*/): K -public fun expandInv(/*0*/ vararg x: [ERROR : Inv] /*kotlin.Array]>*/): K -public fun expandInvWithRemoveNullable(/*0*/ vararg x: [ERROR : Inv] /*kotlin.Array]>*/): K -public fun expandOut(/*0*/ vararg x: [ERROR : Out] /*kotlin.Array]>*/): K -public fun expandOutWithRemoveNullable(/*0*/ vararg x: [ERROR : Out] /*kotlin.Array]>*/): K +public fun expandIn(/*0*/ vararg x: [Error type: Unresolved type for In] /*kotlin.Array]>*/): K +public fun expandInWithRemoveNullable(/*0*/ vararg x: [Error type: Unresolved type for In] /*kotlin.Array]>*/): K +public fun expandInv(/*0*/ vararg x: [Error type: Unresolved type for Inv] /*kotlin.Array]>*/): K +public fun expandInvWithRemoveNullable(/*0*/ vararg x: [Error type: Unresolved type for Inv] /*kotlin.Array]>*/): K +public fun expandOut(/*0*/ vararg x: [Error type: Unresolved type for Out] /*kotlin.Array]>*/): K +public fun expandOutWithRemoveNullable(/*0*/ vararg x: [Error type: Unresolved type for Out] /*kotlin.Array]>*/): K public fun funNothingQuest(): kotlin.Nothing? public fun funWithAnyArg(/*0*/ value_1: kotlin.Any): kotlin.Int public fun funWithoutArgs(): kotlin.Int diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.kt index d55360b665b..4b921a689f3 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.kt @@ -193,8 +193,8 @@ fun case_13(x: otherp if ((x == null !is Boolean) !== true) { throw Exception() } else { - x - x.equals(x) + x + x.equals(x) } // TESTCASE NUMBER: 14 @@ -225,8 +225,8 @@ fun case_14() { if (a.x !== null is Boolean) { if (a.x != null is Boolean) { if ((a.x !== null !is Boolean) == false) { - a.x - a.x.equals(a.x) + a.x + a.x.equals(a.x) } } }