From f831e11b4acbf2d48490c9ec38e10d5bb4e8e067 Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Tue, 19 Dec 2023 18:25:41 +0100 Subject: [PATCH] Minor. Refine type parameters' naming in diagnostic test data Using different names is more convenient for debugging --- .../testsWithStdLib/coroutines/inference/kt38667.kt | 9 +++++---- .../testsWithStdLib/coroutines/inference/kt38667.txt | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.kt index 178c5ad03f3..545ba1efa10 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.kt @@ -1,4 +1,5 @@ // FIR_IDENTICAL +// ISSUE: KT-38667 // !OPT_IN: kotlin.RequiresOptIn // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION @@ -12,11 +13,11 @@ abstract class AnimationBuilder abstract class DurationBasedAnimationBuilder : AnimationBuilder() class TweenBuilder : DurationBasedAnimationBuilder() class TransitionSpec { - fun tween(init: TweenBuilder.() -> Unit): DurationBasedAnimationBuilder = TweenBuilder().apply(init) - infix fun PropKey.using(builder: AnimationBuilder) {} + fun tween(init: TweenBuilder.() -> Unit): DurationBasedAnimationBuilder = TweenBuilder().apply(init) + infix fun PropKey.using(builder: AnimationBuilder) {} } -class TransitionDefinition { - fun transition(fromState: T? = null, toState: T? = null, init: TransitionSpec.() -> Unit) {} +class TransitionDefinition { + fun transition(fromState: X? = null, toState: X? = null, init: TransitionSpec.() -> Unit) {} } @OptIn(ExperimentalTypeInference::class) fun transitionDefinition(init: TransitionDefinition.() -> Unit) = TransitionDefinition().apply(init) diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.txt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.txt index 081c25f6b55..0cf7becd2b5 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt38667.txt @@ -44,12 +44,12 @@ public interface PropKey { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public final class TransitionDefinition { - public constructor TransitionDefinition() +public final class TransitionDefinition { + public constructor TransitionDefinition() 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 fun transition(/*0*/ fromState: T? = ..., /*1*/ toState: T? = ..., /*2*/ init: TransitionSpec.() -> kotlin.Unit): kotlin.Unit + public final fun transition(/*0*/ fromState: X? = ..., /*1*/ toState: X? = ..., /*2*/ init: TransitionSpec.() -> kotlin.Unit): kotlin.Unit } public final class TransitionSpec { @@ -57,8 +57,8 @@ public final class TransitionSpec { 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 fun tween(/*0*/ init: TweenBuilder.() -> kotlin.Unit): DurationBasedAnimationBuilder - public final infix fun PropKey.using(/*0*/ builder: AnimationBuilder): kotlin.Unit + public final fun tween(/*0*/ init: TweenBuilder.() -> kotlin.Unit): DurationBasedAnimationBuilder + public final infix fun PropKey.using(/*0*/ builder: AnimationBuilder): kotlin.Unit } public final class TweenBuilder : DurationBasedAnimationBuilder {