From 4303cd2fc777671989fce3b393e822f719f8dbaa Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 27 Jan 2020 13:31:27 +0300 Subject: [PATCH] [FIR] Put rendering of cone types in one place and change render for error types --- .../jetbrains/kotlin/fir/types/ConeTypes.kt | 10 +++---- .../kotlin/fir/types/TypeRenderer.kt | 4 +-- .../loadCompiledKotlin/coroutines/Basic.txt | 2 +- .../type/SuspendFunction.txt | 9 ++++--- .../fir/resolve/testData/resolve/cast.txt | 4 +-- .../resolve/testData/resolve/cfg/complex.dot | 4 +-- .../resolve/testData/resolve/cfg/complex.txt | 10 +++---- .../resolve/cfg/initBlockAndInPlaceLambda.txt | 2 +- .../CallBasedInExpressionGenerator.txt | 26 +++++++++---------- .../expresssions/genericDiagnostic.txt | 8 +++--- .../resolve/fakeRecursiveSupertype.txt | 4 +-- .../resolve/fakeRecursiveTypealias.txt | 4 +-- .../resolve/multifile/sealedStarImport.txt | 2 +- .../problems/defaultJavaImportHiding.txt | 8 +++--- .../samConversionInConstructorCall.txt | 2 +- .../resolve/samConversions/kotlinSam.txt | 4 +-- .../notSamBecauseOfSupertype.txt | 2 +- .../j+k/KJKComplexHierarchyNestedLoop.txt | 4 +-- .../stdlib/problems/delegateTypeMismatch.txt | 2 +- .../stdlib/problems/inapplicableRemoveAll.txt | 2 +- .../resolve/typeParameterVsNested.txt | 2 +- 21 files changed, 58 insertions(+), 57 deletions(-) diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt index 11d82331466..3a343d8152e 100644 --- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt +++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeTypes.kt @@ -66,7 +66,7 @@ sealed class ConeKotlinType : ConeKotlinTypeProjection(), abstract val nullability: ConeNullability - override fun toString(): String { + final override fun toString(): String { return render() } } @@ -90,10 +90,6 @@ class ConeClassErrorType(val reason: String) : ConeClassLikeType() { override val nullability: ConeNullability get() = ConeNullability.UNKNOWN - - override fun toString(): String { - return "" - } } abstract class ConeLookupTagBasedType : ConeSimpleKotlinType() { @@ -221,6 +217,10 @@ class ConeStubType(val variable: ConeTypeVariable, override val nullability: Con open class ConeTypeVariable(name: String) : TypeVariableMarker { val typeConstructor = ConeTypeVariableTypeConstructor(name) val defaultType = ConeTypeVariableType(ConeNullability.NOT_NULL, typeConstructor) + + override fun toString(): String { + return defaultType.toString() + } } class ConeTypeVariableTypeConstructor(val debugName: String) : ConeClassifierLookupTag(), TypeVariableTypeConstructorMarker { diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt index c8760e2f07a..e2edfb5caf4 100644 --- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt +++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt @@ -13,8 +13,8 @@ fun ConeKotlinType.render(): String { val nullabilitySuffix = if (this !is ConeKotlinErrorType && this !is ConeClassErrorType) nullability.suffix else "" return when (this) { is ConeTypeVariableType -> "TypeVariable(${this.lookupTag.name})" - is ConeDefinitelyNotNullType -> "${original.render()}!" - is ConeClassErrorType -> "class error: $reason" + is ConeDefinitelyNotNullType -> "${original.render()}!!" + is ConeClassErrorType -> "ERROR CLASS: $reason" is ConeCapturedType -> "captured type: lowerType = ${lowerType?.render()}" is ConeClassLikeType -> { buildString { diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/coroutines/Basic.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/coroutines/Basic.txt index 1727bf2edad..fa06f1ca6e7 100644 --- a/compiler/fir/resolve/testData/loadCompiledKotlin/coroutines/Basic.txt +++ b/compiler/fir/resolve/testData/loadCompiledKotlin/coroutines/Basic.txt @@ -1,4 +1,4 @@ -public final fun builder(c: @R|kotlin/ExtensionFunctionType|() R|class error: createSuspendFunctionType not supported|): R|kotlin/Unit| +public final fun builder(c: @R|kotlin/ExtensionFunctionType|() R|ERROR CLASS: createSuspendFunctionType not supported|): R|kotlin/Unit| public final class Controller : R|kotlin/Any| { public final suspend fun suspendFun(): R|kotlin/Unit| diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/SuspendFunction.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/SuspendFunction.txt index 4b61728ec8c..cbaf98bb13f 100644 --- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/SuspendFunction.txt +++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/SuspendFunction.txt @@ -1,7 +1,8 @@ -public final fun test1(): R|class error: createSuspendFunctionType not supported| +public final fun test1(): R|ERROR CLASS: createSuspendFunctionType not supported| -public final fun test2(): @R|kotlin/ExtensionFunctionType|() R|class error: createSuspendFunctionType not supported| +public final fun test2(): @R|kotlin/ExtensionFunctionType|() R|ERROR CLASS: createSuspendFunctionType not supported| -public final fun test3(): R|kotlin/collections/List| +public final fun test3(): R|kotlin/collections/List| + +public final fun test4(): R|ERROR CLASS: createSuspendFunctionType not supported| -public final fun test4(): R|class error: createSuspendFunctionType not supported| diff --git a/compiler/fir/resolve/testData/resolve/cast.txt b/compiler/fir/resolve/testData/resolve/cast.txt index 393fae0d9e4..a8c76db9abc 100644 --- a/compiler/fir/resolve/testData/resolve/cast.txt +++ b/compiler/fir/resolve/testData/resolve/cast.txt @@ -18,8 +18,8 @@ FILE: cast.kt } public get(): R|(kotlin/String) -> kotlin/Boolean| - public final val hError: R|(class error: No type for parameter) -> kotlin/Boolean| = fun (_: R|class error: No type for parameter|): R|kotlin/Boolean| { + public final val hError: R|(ERROR CLASS: No type for parameter) -> kotlin/Boolean| = fun (_: R|ERROR CLASS: No type for parameter|): R|kotlin/Boolean| { Boolean(true) } - public get(): R|(class error: No type for parameter) -> kotlin/Boolean| + public get(): R|(ERROR CLASS: No type for parameter) -> kotlin/Boolean| diff --git a/compiler/fir/resolve/testData/resolve/cfg/complex.dot b/compiler/fir/resolve/testData/resolve/cfg/complex.dot index 6909d6a94f7..1c41d30d3f5 100644 --- a/compiler/fir/resolve/testData/resolve/cfg/complex.dot +++ b/compiler/fir/resolve/testData/resolve/cfg/complex.dot @@ -28,7 +28,7 @@ digraph complex_kt { 14 [label="Access variable R|/url|"]; 15 [label="Access variable R|/url|"]; 16 [label="Function call: #.#(R|/url|)"]; - 17 [label="Function call: #.#(R|/url|).#( = connect@fun (): R|class error: Unresolved name: fromJson| { + 17 [label="Function call: #.#(R|/url|).#( = connect@fun (): R|ERROR CLASS: Unresolved name: fromJson| { #().#().#(#.#.#(), (Q|kotlin/Array|).R|kotlin/jvm/java|) } )"]; @@ -71,7 +71,7 @@ digraph complex_kt { } 41 [label="Try expression exit"]; } - 42 [label="Variable declaration: lval pluginDTOs: R|kotlin/Array|"]; + 42 [label="Variable declaration: lval pluginDTOs: R|kotlin/Array|"]; 43 [label="Exit function fetchPluginReleaseDate" style="filled" fillcolor=red]; } subgraph cluster_8 { diff --git a/compiler/fir/resolve/testData/resolve/cfg/complex.txt b/compiler/fir/resolve/testData/resolve/cfg/complex.txt index a5e653cd4b4..b145552c17e 100644 --- a/compiler/fir/resolve/testData/resolve/cfg/complex.txt +++ b/compiler/fir/resolve/testData/resolve/cfg/complex.txt @@ -1,16 +1,16 @@ FILE: complex.kt - @R|kotlin/jvm/Throws|((#), (#)) public final fun fetchPluginReleaseDate(pluginId: R|class error: Symbol not found, for `PluginId`|, version: R|kotlin/String|, channel: R|kotlin/String?|): R|class error: Symbol not found, for `LocalDate?`| { + @R|kotlin/jvm/Throws|((#), (#)) public final fun fetchPluginReleaseDate(pluginId: R|ERROR CLASS: Symbol not found, for `PluginId`|, version: R|kotlin/String|, channel: R|kotlin/String?|): R|ERROR CLASS: Symbol not found, for `LocalDate?`| { lval url: R|kotlin/String| = (String(https://plugins.jetbrains.com/api/plugins/), R|/pluginId|.#.R|kotlin/toString|(), String(/updates?version=), R|/version|.R|kotlin/Any.toString|()) - lval pluginDTOs: R|kotlin/Array| = try { - #.#(R|/url|).#( = connect@fun (): R|class error: Unresolved name: fromJson| { + lval pluginDTOs: R|kotlin/Array| = try { + #.#(R|/url|).#( = connect@fun (): R|ERROR CLASS: Unresolved name: fromJson| { #().#().#(#.#.#(), (Q|kotlin/Array|).R|kotlin/jvm/java|) } ) } - catch (ioException: R|class error: Symbol not found, for `JsonIOException`|) { + catch (ioException: R|ERROR CLASS: Symbol not found, for `JsonIOException`|) { throw #(R|/ioException|) } - catch (syntaxException: R|class error: Symbol not found, for `JsonSyntaxException`|) { + catch (syntaxException: R|ERROR CLASS: Symbol not found, for `JsonSyntaxException`|) { throw #(String(Can't parse json response), R|/syntaxException|) } diff --git a/compiler/fir/resolve/testData/resolve/cfg/initBlockAndInPlaceLambda.txt b/compiler/fir/resolve/testData/resolve/cfg/initBlockAndInPlaceLambda.txt index 2597d53d0da..449ede36410 100644 --- a/compiler/fir/resolve/testData/resolve/cfg/initBlockAndInPlaceLambda.txt +++ b/compiler/fir/resolve/testData/resolve/cfg/initBlockAndInPlaceLambda.txt @@ -7,7 +7,7 @@ FILE: initBlockAndInPlaceLambda.kt } public final class C : R|kotlin/Any| { - public constructor(a: R|A|, b: R|class error: Symbol not found, for `b`|): R|C| { + public constructor(a: R|A|, b: R|ERROR CLASS: Symbol not found, for `b`|): R|C| { super() } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt b/compiler/fir/resolve/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt index 79fd11b8c5b..4879a8e890c 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt @@ -1,11 +1,11 @@ FILE: CallBasedInExpressionGenerator.kt - public final class CallBasedInExpressionGenerator : R|class error: Symbol not found, for `InExpressionGenerator`| { - public constructor(codegen: R|class error: Symbol not found, for `ExpressionCodegen`|, operatorReference: R|class error: Symbol not found, for `KtSimpleNameExpression`|): R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator| { + public final class CallBasedInExpressionGenerator : R|ERROR CLASS: Symbol not found, for `InExpressionGenerator`| { + public constructor(codegen: R|ERROR CLASS: Symbol not found, for `ExpressionCodegen`|, operatorReference: R|ERROR CLASS: Symbol not found, for `KtSimpleNameExpression`|): R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator| { super() } - public final val codegen: R|class error: Symbol not found, for `ExpressionCodegen`| = R|/codegen| - public get(): R|class error: Symbol not found, for `ExpressionCodegen`| + public final val codegen: R|ERROR CLASS: Symbol not found, for `ExpressionCodegen`| = R|/codegen| + public get(): R|ERROR CLASS: Symbol not found, for `ExpressionCodegen`| private final val resolvedCall: = R|/operatorReference|.#(R|/codegen|.#) private get(): @@ -13,8 +13,8 @@ FILE: CallBasedInExpressionGenerator.kt private final val isInverted: R|kotlin/Boolean| = ==(R|/operatorReference|.#(), #.#) private get(): R|kotlin/Boolean| - public final override fun generate(argument: R|class error: Symbol not found, for `StackValue`|): R|class error: Symbol not found, for `BranchedValue`| { - ^generate R?C|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator.gen|(R|/argument|).#( = let@fun (): R|class error: Can't resolve when expression| { + public final override fun generate(argument: R|ERROR CLASS: Symbol not found, for `StackValue`|): R|ERROR CLASS: Symbol not found, for `BranchedValue`| { + ^generate R?C|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator.gen|(R|/argument|).#( = let@fun (): R|ERROR CLASS: Can't resolve when expression| { when () { this@R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator|.R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator.isInverted| -> { #(#) @@ -28,18 +28,18 @@ FILE: CallBasedInExpressionGenerator.kt ) } - private final fun gen(argument: R|class error: Symbol not found, for `StackValue`|): R|class error: Symbol not found, for `BranchedValue`| { - ^gen object : R|class error: Symbol not found, for `BranchedValue`| { - private constructor(): R|class error: Symbol not found, for `BranchedValue`| { - super(R|/argument|, Null(null), R|/argument|.#, #.#) + private final fun gen(argument: R|ERROR CLASS: Symbol not found, for `StackValue`|): R|ERROR CLASS: Symbol not found, for `BranchedValue`| { + ^gen object : R|ERROR CLASS: Symbol not found, for `BranchedValue`| { + private constructor(): R|ERROR CLASS: Symbol not found, for `BranchedValue`| { + super(R|/argument|, Null(null), R|/argument|.#, #.#) } - public final override fun putSelector(type: R|class error: Symbol not found, for `Type`|, kotlinType: R|class error: Symbol not found, for `KotlinType?`|, v: R|class error: Symbol not found, for `InstructionAdapter`|): R|kotlin/Unit| { + public final override fun putSelector(type: R|ERROR CLASS: Symbol not found, for `Type`|, kotlinType: R|ERROR CLASS: Symbol not found, for `KotlinType?`|, v: R|ERROR CLASS: Symbol not found, for `InstructionAdapter`|): R|kotlin/Unit| { this@R|/anonymous|.R|/anonymous.invokeFunction|(R|/v|) #(R|/type|, R|/kotlinType|, R|/v|) } - public final override fun condJump(jumpLabel: R|class error: Symbol not found, for `Label`|, v: R|class error: Symbol not found, for `InstructionAdapter`|, jumpIfFalse: R|kotlin/Boolean|): R|kotlin/Unit| { + public final override fun condJump(jumpLabel: R|ERROR CLASS: Symbol not found, for `Label`|, v: R|ERROR CLASS: Symbol not found, for `InstructionAdapter`|, jumpIfFalse: R|kotlin/Boolean|): R|kotlin/Unit| { this@R|/anonymous|.R|/anonymous.invokeFunction|(R|/v|) R|/v|.#(when () { R|/jumpIfFalse| -> { @@ -52,7 +52,7 @@ FILE: CallBasedInExpressionGenerator.kt , R|/jumpLabel|) } - private final fun invokeFunction(v: R|class error: Symbol not found, for `InstructionAdapter`|): R|kotlin/Unit| { + private final fun invokeFunction(v: R|ERROR CLASS: Symbol not found, for `InstructionAdapter`|): R|kotlin/Unit| { lval result: = this@R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator|.R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator.codegen|.#(this@R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator|.R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator.resolvedCall|.#, this@R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator|.R|org/jetbrains/kotlin/codegen/range/inExpression/CallBasedInExpressionGenerator.resolvedCall|, #()) R|/result|.#(R|/result|.#, R|/result|.#, R|/v|) } diff --git a/compiler/fir/resolve/testData/resolve/expresssions/genericDiagnostic.txt b/compiler/fir/resolve/testData/resolve/expresssions/genericDiagnostic.txt index a46da2826fb..04ac6b0e6a4 100644 --- a/compiler/fir/resolve/testData/resolve/expresssions/genericDiagnostic.txt +++ b/compiler/fir/resolve/testData/resolve/expresssions/genericDiagnostic.txt @@ -6,17 +6,17 @@ FILE: test.kt } public final fun create(d: R|Diagnostic|): R|kotlin/Unit| { - lval element: R|DerivedElement!| = R|/d|.R|/Diagnostic.element| + lval element: R|DerivedElement!!| = R|/d|.R|/Diagnostic.element| R|/Fix.Fix|(R|/element|) } public final fun createGeneric(d: R|Diagnostic|): R|kotlin/Unit| { - lval element: R|DE!| = R|/d|.R|/Diagnostic.element| + lval element: R|DE!!| = R|/d|.R|/Diagnostic.element| R|/Fix.Fix|(R|/element|) } private final val DERIVED_FACTORY: R|DiagnosticFactory0| = R|/DiagnosticFactory0.DiagnosticFactory0|() private get(): R|DiagnosticFactory0| public final fun createViaFactory(d: R|EmptyDiagnostic|): R|kotlin/Unit| { - lval casted: R|Diagnostic!| = R|/DERIVED_FACTORY|.R|FakeOverride!|>|(R|/d|) - lval element: R|DerivedElement!| = R|/casted|.R|/Diagnostic.element| + lval casted: R|Diagnostic!!| = R|/DERIVED_FACTORY|.R|FakeOverride!!|>|(R|/d|) + lval element: R|DerivedElement!!| = R|/casted|.R|/Diagnostic.element| R|/Fix.Fix|(R|/element|) } diff --git a/compiler/fir/resolve/testData/resolve/fakeRecursiveSupertype.txt b/compiler/fir/resolve/testData/resolve/fakeRecursiveSupertype.txt index 0099c84f488..664066f8034 100644 --- a/compiler/fir/resolve/testData/resolve/fakeRecursiveSupertype.txt +++ b/compiler/fir/resolve/testData/resolve/fakeRecursiveSupertype.txt @@ -1,5 +1,5 @@ FILE: fakeRecursiveSupertype.kt - public final class My : R|class error: Loop in supertype: /My -> /My| { + public final class My : R|ERROR CLASS: Loop in supertype: /My -> /My| { public constructor(): R|My| { super() } @@ -11,7 +11,7 @@ FILE: fakeRecursiveSupertype.kt } } - public final class His : R|class error: Loop in supertype: /His -> /Your| { + public final class His : R|ERROR CLASS: Loop in supertype: /His -> /Your| { public constructor(): R|His| { super() } diff --git a/compiler/fir/resolve/testData/resolve/fakeRecursiveTypealias.txt b/compiler/fir/resolve/testData/resolve/fakeRecursiveTypealias.txt index c9397354d7b..b059aa61af3 100644 --- a/compiler/fir/resolve/testData/resolve/fakeRecursiveTypealias.txt +++ b/compiler/fir/resolve/testData/resolve/fakeRecursiveTypealias.txt @@ -1,3 +1,3 @@ FILE: fakeRecursiveTypealias.kt - public final typealias My = R|class error: Symbol not found, for `incorrect.directory.My`| - public final typealias Your = R|class error: Loop in supertype: /Your -> /Your| + public final typealias My = R|ERROR CLASS: Symbol not found, for `incorrect.directory.My`| + public final typealias Your = R|ERROR CLASS: Loop in supertype: /Your -> /Your| diff --git a/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt index bad021bab08..ff4d8f58de4 100644 --- a/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt +++ b/compiler/fir/resolve/testData/resolve/multifile/sealedStarImport.txt @@ -28,7 +28,7 @@ FILE: main.kt super() } - public abstract fun createTest(): R|class error: Symbol not found, for `Test`| + public abstract fun createTest(): R|ERROR CLASS: Symbol not found, for `Test`| public abstract fun createObj(): R|test/Test.O| diff --git a/compiler/fir/resolve/testData/resolve/problems/defaultJavaImportHiding.txt b/compiler/fir/resolve/testData/resolve/problems/defaultJavaImportHiding.txt index 33adeaf356f..34ed65a533a 100644 --- a/compiler/fir/resolve/testData/resolve/problems/defaultJavaImportHiding.txt +++ b/compiler/fir/resolve/testData/resolve/problems/defaultJavaImportHiding.txt @@ -1,7 +1,7 @@ FILE: LinkedList.kt - public final class LinkedList : R|class error: Symbol not found, for `java.util.LinkedList`| { + public final class LinkedList : R|ERROR CLASS: Symbol not found, for `java.util.LinkedList`| { public constructor(): R|foo/LinkedList| { - super`|>() + super`|>() } } @@ -13,9 +13,9 @@ FILE: HashSet.kt } FILE: main.kt - public final class LinkedHashMap : R|class error: Symbol not found, for `java.util.LinkedHashMap`| { + public final class LinkedHashMap : R|ERROR CLASS: Symbol not found, for `java.util.LinkedHashMap`| { public constructor(): R|foo/LinkedHashMap| { - super`|>() + super`|>() } } diff --git a/compiler/fir/resolve/testData/resolve/problems/samConversionInConstructorCall.txt b/compiler/fir/resolve/testData/resolve/problems/samConversionInConstructorCall.txt index 26c8a1e18ad..daa2ef63a4c 100644 --- a/compiler/fir/resolve/testData/resolve/problems/samConversionInConstructorCall.txt +++ b/compiler/fir/resolve/testData/resolve/problems/samConversionInConstructorCall.txt @@ -1,6 +1,6 @@ FILE: main.kt public final fun test(): R|kotlin/Unit| { - #( = Foo@fun (): R|class error: Unresolved name: it| { + #( = Foo@fun (): R|ERROR CLASS: Unresolved name: it| { # } ) diff --git a/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt b/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt index 74bb3553f51..89eeeb1daf1 100644 --- a/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt +++ b/compiler/fir/resolve/testData/resolve/samConversions/kotlinSam.txt @@ -38,12 +38,12 @@ FILE: kotlinSam.kt } ) R|/foo1|(R|/f|) - #( = foo2@fun (x: R|class error: No type for parameter|): R|kotlin/Boolean| { + #( = foo2@fun (x: R|ERROR CLASS: No type for parameter|): R|kotlin/Boolean| { >(R|/x|, Int(1)) } ) #(R|/f|) - #( = foo3@fun (x: R|class error: No type for parameter|): R|kotlin/Boolean| { + #( = foo3@fun (x: R|ERROR CLASS: No type for parameter|): R|kotlin/Boolean| { >(R|/x|, Int(1)) } ) diff --git a/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt b/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt index b2508c111a3..d165c2534da 100644 --- a/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt +++ b/compiler/fir/resolve/testData/resolve/samConversions/notSamBecauseOfSupertype.txt @@ -2,7 +2,7 @@ FILE: main.kt public final fun foo(m: R|MyRunnable|): R|kotlin/Unit| { } public final fun main(): R|kotlin/Unit| { - Q|JavaUsage|.#( = foo@fun (x: R|class error: No type for parameter|): R|kotlin/Boolean| { + Q|JavaUsage|.#( = foo@fun (x: R|ERROR CLASS: No type for parameter|): R|kotlin/Boolean| { >(R|/x|, Int(1)) } ) diff --git a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchyNestedLoop.txt b/compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchyNestedLoop.txt index fa525279f3c..4c55ec3e552 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchyNestedLoop.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/j+k/KJKComplexHierarchyNestedLoop.txt @@ -4,9 +4,9 @@ FILE: K1.kt super() } - public final class Q : R|class error: Symbol not found, for `Nested`| { + public final class Q : R|ERROR CLASS: Symbol not found, for `Nested`| { public constructor(): R|K2.Q| { - super() + super() } } diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/delegateTypeMismatch.txt b/compiler/fir/resolve/testData/resolve/stdlib/problems/delegateTypeMismatch.txt index 8855160b878..1fd3fbe3717 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/problems/delegateTypeMismatch.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/problems/delegateTypeMismatch.txt @@ -41,7 +41,7 @@ FILE: delegateTypeMismatch.kt D|/A.classifierNamePolicy|.#(this@R|/A|, ::R|/A.classifierNamePolicy|, R|/classifierNamePolicy|) } - public final var typeNormalizer: by # KotlinType|>(property@fun (): R|class error: Unresolved name: it| { + public final var typeNormalizer: by # KotlinType|>(property@fun (): R|ERROR CLASS: Unresolved name: it| { # } ) diff --git a/compiler/fir/resolve/testData/resolve/stdlib/problems/inapplicableRemoveAll.txt b/compiler/fir/resolve/testData/resolve/stdlib/problems/inapplicableRemoveAll.txt index da63032b3aa..118b833ff7d 100644 --- a/compiler/fir/resolve/testData/resolve/stdlib/problems/inapplicableRemoveAll.txt +++ b/compiler/fir/resolve/testData/resolve/stdlib/problems/inapplicableRemoveAll.txt @@ -1,6 +1,6 @@ FILE: inapplicableRemoveAll.kt public final fun test(list: R|kotlin/collections/MutableList|): R|kotlin/Unit| { - R|/list|.#( = removeAll@fun (): R|class error: Ambiguity: isEmpty, [kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/text/isEmpty]| { + R|/list|.#( = removeAll@fun (): R|ERROR CLASS: Ambiguity: isEmpty, [kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/collections/isEmpty, kotlin/text/isEmpty]| { #.#() } ) diff --git a/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt b/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt index b7f5de38f36..2fc87ae4405 100644 --- a/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt +++ b/compiler/fir/resolve/testData/resolve/typeParameterVsNested.txt @@ -32,7 +32,7 @@ FILE: typeParameterVsNested.kt } } - public abstract class Your : R|class error: Type parameter cannot be a super-type: T| { + public abstract class Your : R|ERROR CLASS: Type parameter cannot be a super-type: T| { public constructor(): R|test/Your| { super() }