diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/lazyProperty.txt b/analysis/low-level-api-fir/testdata/lazyResolve/lazyProperty.txt index 34dfc8a9860..3125ce6b33a 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/lazyProperty.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/lazyProperty.txt @@ -313,7 +313,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt } ) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Test] get(): R|kotlin/String| { - ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) + ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) } } @@ -350,7 +350,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt } ) public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=Test] get(): R|kotlin/String| { - ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) + ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) } } @@ -387,7 +387,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt } ) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Test] get(): R|kotlin/String| { - ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) + ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) } } @@ -426,7 +426,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyProperty.kt } ) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Test] get(): R|kotlin/String| { - ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) + ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) } } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/lazyPropertyScript.txt b/analysis/low-level-api-fir/testdata/lazyResolve/lazyPropertyScript.txt index a878416fb89..6720012d820 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/lazyPropertyScript.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/lazyPropertyScript.txt @@ -411,7 +411,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts } ) public [ResolvedTo(IMPLICIT_TYPES_BODY_RESOLVE)] [ContainingClassKey=Test] get(): R|kotlin/String| { - ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) + ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) } } @@ -457,7 +457,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts } ) public [ResolvedTo(ANNOTATIONS_ARGUMENTS_MAPPING)] [ContainingClassKey=Test] get(): R|kotlin/String| { - ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) + ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) } } @@ -503,7 +503,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts } ) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Test] get(): R|kotlin/String| { - ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) + ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) } } @@ -551,7 +551,7 @@ FILE: [ResolvedTo(IMPORTS)] lazyPropertyScript.kts } ) public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Test] get(): R|kotlin/String| { - ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) + ^ this@R|/Test|.D|/Test.resolveMe|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.resolveMe|) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.fir.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.fir.txt index bbc58f4c488..782f38286ca 100644 --- a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.fir.txt @@ -42,7 +42,7 @@ FILE: delegateInference.kt public final var x: R|kotlin/Boolean|by R|/FreezableVar.FreezableVar|(Boolean(true)) public get(): R|kotlin/Boolean| { - ^ this@R|/Test|.D|/Test.x|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.x|) + ^ this@R|/Test|.D|/Test.x|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.x|) } public set(: R|kotlin/Boolean|): R|kotlin/Unit| { this@R|/Test|.D|/Test.x|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.x|, R|/x|) @@ -50,7 +50,7 @@ FILE: delegateInference.kt public final var y: R|kotlin/String|by R|/FreezableVar.FreezableVar|(String()) public get(): R|kotlin/String| { - ^ this@R|/Test|.D|/Test.y|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.y|) + ^ this@R|/Test|.D|/Test.y|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.y|) } public set(: R|kotlin/String|): R|kotlin/Unit| { this@R|/Test|.D|/Test.y|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.y|, R|/y|) diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.fir.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.fir.txt index 622e0a907dd..dd2ce2b97aa 100644 --- a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.fir.txt @@ -31,7 +31,7 @@ FILE: delegateWithLambda.kt } ) public get(): R|kotlin/String| { - ^ this@R|/Test|.D|/Test.x|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.x|) + ^ this@R|/Test|.D|/Test.x|.R|SubstitutionOverride|(this@R|/Test|, ::R|/Test.x|) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.fir.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.fir.txt index 4cdd976fa0f..366318bff69 100644 --- a/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.fir.txt @@ -38,9 +38,9 @@ FILE: provideDelegate.kt super() } - public final val x: R|kotlin/Int|by R|/delegate|(Int(1)).R|SubstitutionOverride|>|(this@R|/A|, ::R|/A.x|) + public final val x: R|kotlin/Int|by R|/delegate|(Int(1)).R|SubstitutionOverride|>|(this@R|/A|, ::R|/A.x|) public get(): R|kotlin/Int| { - ^ this@R|/A|.D|/A.x|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.x|) + ^ this@R|/A|.D|/A.x|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.x|) } } diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/receiverInference.fir.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/receiverInference.fir.txt index 2b543389953..0cbd29b9f79 100644 --- a/compiler/fir/analysis-tests/testData/resolve/delegates/receiverInference.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolve/delegates/receiverInference.fir.txt @@ -29,9 +29,9 @@ FILE: receiverInference.kt super() } - public final val d: R|kotlin/String|by R|/mkProp|().R|SubstitutionOverride|>|(this@R|/MyEnt|, ::R|/MyEnt.d|) + public final val d: R|kotlin/String|by R|/mkProp|().R|SubstitutionOverride|>|(this@R|/MyEnt|, ::R|/MyEnt.d|) public get(): R|kotlin/String| { - ^ this@R|/MyEnt|.D|/MyEnt.d|.R|SubstitutionOverride|(this@R|/MyEnt|, ::R|/MyEnt.d|) + ^ this@R|/MyEnt|.D|/MyEnt.d|.R|SubstitutionOverride|(this@R|/MyEnt|, ::R|/MyEnt.d|) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.fir.txt index 79fa7c96839..b8c994d73e5 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.fir.txt @@ -35,7 +35,7 @@ FILE: delegateTypeMismatch.kt public final var classifierNamePolicy: R|ClassifierNamePolicy|by this@R|/A|.R|/A.property|(Q|ClassifierNamePolicy.SOURCE_CODE_QUALIFIED|) public get(): R|ClassifierNamePolicy| { - ^ this@R|/A|.D|/A.classifierNamePolicy|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.classifierNamePolicy|) + ^ this@R|/A|.D|/A.classifierNamePolicy|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.classifierNamePolicy|) } public set(: R|ClassifierNamePolicy|): R|kotlin/Unit| { this@R|/A|.D|/A.classifierNamePolicy|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.classifierNamePolicy|, R|/classifierNamePolicy|) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot index 66099894c8b..f9b43a6f36e 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot @@ -205,8 +205,8 @@ digraph delegateWithAnonymousObject_kt { color=blue 63 [label="Enter block"]; 64 [label="Access variable D|/IssuesListUserProfile.issueListView|"]; - 65 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(...)" style="filled" fillcolor=yellow]; - 66 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"]; + 65 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(...)" style="filled" fillcolor=yellow]; + 66 [label="Jump: ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|)"]; 67 [label="Stub" style="filled" fillcolor=gray]; 68 [label="Exit block" style="filled" fillcolor=gray]; } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.fir.txt index 8a0cb32de99..2323ab9e276 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.fir.txt @@ -41,7 +41,7 @@ FILE: delegateWithAnonymousObject.kt } ) public get(): R|IssueListView| { - ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|) + ^ this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|) } public set(: R|IssueListView|): R|kotlin/Unit| { this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(this@R|/IssuesListUserProfile|, ::R|/IssuesListUserProfile.issueListView|, R|/issueListView|) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/kt41917.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/kt41917.fir.txt index ed85618ba3b..6f62f64f9e4 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/kt41917.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/kt41917.fir.txt @@ -25,12 +25,12 @@ FILE: kt41917.kt public final val implicit: R|kotlin/String|by R|/DummyDelegate.DummyDelegate|(String(hello)) public get(): R|kotlin/String| { - ^ this@R|/A|.D|/A.implicit|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.implicit|) + ^ this@R|/A|.D|/A.implicit|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.implicit|) } public final val explicit: R|kotlin/String|by R|/DummyDelegate.DummyDelegate|(String(hello)) public get(): R|kotlin/String| { - ^ this@R|/A|.D|/A.explicit|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.explicit|) + ^ this@R|/A|.D|/A.explicit|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.explicit|) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/nullableTypeDelegate.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/nullableTypeDelegate.fir.txt index 7a76e6e75a3..cddb73e6010 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/nullableTypeDelegate.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/nullableTypeDelegate.fir.txt @@ -19,7 +19,7 @@ FILE: nullableTypeDelegate.kt public final var other: R|MyClassSome?|by this@R|/MyClassSome|.R|/directed|((Q|MyClassSome|).R|kotlin/jvm/java|) public get(): R|MyClassSome?| { - ^ this@R|/MyClassSome|.D|/MyClassSome.other|.R|SubstitutionOverride|(this@R|/MyClassSome|, ::R|/MyClassSome.other|) + ^ this@R|/MyClassSome|.D|/MyClassSome.other|.R|SubstitutionOverride|(this@R|/MyClassSome|, ::R|/MyClassSome.other|) } public set(: R|MyClassSome?|): R|kotlin/Unit| { this@R|/MyClassSome|.D|/MyClassSome.other|.R|SubstitutionOverride|(this@R|/MyClassSome|, ::R|/MyClassSome.other|, R|/other|) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.fir.txt index e96f55ce057..02d088ad5b2 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.fir.txt @@ -26,7 +26,7 @@ FILE: propertyWithFunctionalType.kt } ) public get(): R|(B) -> B| { - ^ this@R|/A|.D|/A.conventerWithExpectedType|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.conventerWithExpectedType|) + ^ this@R|/A|.D|/A.conventerWithExpectedType|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.conventerWithExpectedType|) } public set(: R|(B) -> B|): R|kotlin/Unit| { this@R|/A|.D|/A.conventerWithExpectedType|.R|SubstitutionOverride|(this@R|/A|, ::R|/A.conventerWithExpectedType|, R|/conventerWithExpectedType|) diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/hideBySeverity.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/hideBySeverity.fir.txt index c501d5a7770..ea90fd5e36f 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/hideBySeverity.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/hideBySeverity.fir.txt @@ -30,14 +30,14 @@ FILE: hideBySeverity.kt super() } - public final val hideBySeverityDerived: R|kotlin/collections/MutableSet|by this@R|/Some|.R|/BaseState.propertyDerived||>(R|kotlin/collections/mutableSetOf|()).R|SubstitutionOverride|>|(this@R|/Some|, ::R|/Some.hideBySeverityDerived|) + public final val hideBySeverityDerived: R|kotlin/collections/MutableSet|by this@R|/Some|.R|/BaseState.propertyDerived||>(R|kotlin/collections/mutableSetOf|()).R|SubstitutionOverride|>|(this@R|/Some|, ::R|/Some.hideBySeverityDerived|) public get(): R|kotlin/collections/MutableSet| { - ^ this@R|/Some|.D|/Some.hideBySeverityDerived|.R|SubstitutionOverride|(this@R|/Some|, ::R|/Some.hideBySeverityDerived|) + ^ this@R|/Some|.D|/Some.hideBySeverityDerived|.R|SubstitutionOverride|(this@R|/Some|, ::R|/Some.hideBySeverityDerived|) } public final val hideBySeverityBase: R|kotlin/collections/MutableSet|by this@R|/Some|.R|/BaseState.propertyBase||>(R|kotlin/collections/mutableSetOf|()) public get(): R|kotlin/collections/MutableSet| { - ^ this@R|/Some|.D|/Some.hideBySeverityBase|.R|SubstitutionOverride|(this@R|/Some|, ::R|/Some.hideBySeverityBase|) + ^ this@R|/Some|.D|/Some.hideBySeverityBase|.R|SubstitutionOverride|(this@R|/Some|, ::R|/Some.hideBySeverityBase|) } } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/WithValidityAssertion.fir.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/WithValidityAssertion.fir.txt index e71cc0037a7..9e70aebe8eb 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/WithValidityAssertion.fir.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/WithValidityAssertion.fir.txt @@ -61,7 +61,7 @@ FILE: WithValidityAssertion.kt } ) private get(): R|kotlin/collections/List| { - ^ this@R|/KtFirNonStarImportingScope|.D|/KtFirNonStarImportingScope.imports|.R|SubstitutionOverride|(this@R|/KtFirNonStarImportingScope|, ::R|/KtFirNonStarImportingScope.imports|) + ^ this@R|/KtFirNonStarImportingScope|.D|/KtFirNonStarImportingScope.imports|.R|SubstitutionOverride|(this@R|/KtFirNonStarImportingScope|, ::R|/KtFirNonStarImportingScope.imports|) } public final fun getCallableSymbols(nameFilter: R|KtScopeNameFilter|): R|kotlin/sequences/Sequence| { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirDelegatedPropertyInferenceSession.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirDelegatedPropertyInferenceSession.kt index a40d8582760..8732c350b41 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirDelegatedPropertyInferenceSession.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirDelegatedPropertyInferenceSession.kt @@ -240,7 +240,7 @@ class FirDelegatedPropertyInferenceSession( val variable = variableWithConstraints.typeVariable as ConeTypeVariable val syntheticVariable = syntheticTypeVariableByTypeVariable.getOrPut(variable) { - ConeTypeVariable("_" + variable.typeConstructor.name).also { + ConeTypeVariable("+" + variable.typeConstructor.name).also { currentConstraintSystem.registerVariable(it) } } diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt50994.fir.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt50994.fir.txt index 2db301ef395..e92f06139b9 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt50994.fir.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt50994.fir.txt @@ -6,7 +6,7 @@ FILE: kt50994.fir.kt public final var processor: R|ProcessorWithChildren?|by this@R|/ProcessorWithParent|.R|/parent|(Q|ProcessorWithChildren|::R|/ProcessorWithChildren.processors|) public get(): R|ProcessorWithChildren?| { - ^ this@R|/ProcessorWithParent|.D|/ProcessorWithParent.processor|.R|SubstitutionOverride|(this@R|/ProcessorWithParent|, ::R|/ProcessorWithParent.processor|) + ^ this@R|/ProcessorWithParent|.D|/ProcessorWithParent.processor|.R|SubstitutionOverride|(this@R|/ProcessorWithParent|, ::R|/ProcessorWithParent.processor|) } public set(: R|ProcessorWithChildren?|): R|kotlin/Unit| { this@R|/ProcessorWithParent|.D|/ProcessorWithParent.processor|.R|SubstitutionOverride|(this@R|/ProcessorWithParent|, ::R|/ProcessorWithParent.processor|, R|/processor|) @@ -20,7 +20,7 @@ FILE: kt50994.fir.kt public final var processors: R|kotlin/collections/MutableCollection|by this@R|/ProcessorWithChildren|.R|/children#|<, >((Q|ProcessorWithParent|).R|kotlin/jvm/java|, Q|ProcessorWithParent|::#) public get(): R|kotlin/collections/MutableCollection| { - ^ this@R|/ProcessorWithChildren|.D|/ProcessorWithChildren.processors|.R|SubstitutionOverride|>|(this@R|/ProcessorWithChildren|, ::R|/ProcessorWithChildren.processors|) + ^ this@R|/ProcessorWithChildren|.D|/ProcessorWithChildren.processors|.R|SubstitutionOverride|>|(this@R|/ProcessorWithChildren|, ::R|/ProcessorWithChildren.processors|) } public set(: R|kotlin/collections/MutableCollection|): R|kotlin/Unit| { this@R|/ProcessorWithChildren|.D|/ProcessorWithChildren.processors|.R|SubstitutionOverride|(this@R|/ProcessorWithChildren|, ::R|/ProcessorWithChildren.processors|, R|/processors|) @@ -48,7 +48,7 @@ FILE: kt50994.fir.kt public final var processors: R|kotlin/collections/MutableCollection|by this@R|/Processor2WithChildren|.R|/children|((Q|Processor2WithParent|).R|kotlin/jvm/java|, Q|Processor2WithParent|::R|/Processor2WithParent.processor|) public get(): R|kotlin/collections/MutableCollection| { - ^ this@R|/Processor2WithChildren|.D|/Processor2WithChildren.processors|.R|SubstitutionOverride|>|(this@R|/Processor2WithChildren|, ::R|/Processor2WithChildren.processors|) + ^ this@R|/Processor2WithChildren|.D|/Processor2WithChildren.processors|.R|SubstitutionOverride|>|(this@R|/Processor2WithChildren|, ::R|/Processor2WithChildren.processors|) } public set(: R|kotlin/collections/MutableCollection|): R|kotlin/Unit| { this@R|/Processor2WithChildren|.D|/Processor2WithChildren.processors|.R|SubstitutionOverride|(this@R|/Processor2WithChildren|, ::R|/Processor2WithChildren.processors|, R|/processors|) @@ -76,7 +76,7 @@ FILE: kt50994.fir.kt public final var processors: R|kotlin/collections/MutableCollection|by this@R|/Processor3WithChildren|.R|/children|((Q|Processor3WithParent|).R|kotlin/jvm/java|, Q|Processor3WithParent|::R|/Processor3WithParent.processor|) public get(): R|kotlin/collections/MutableCollection| { - ^ this@R|/Processor3WithChildren|.D|/Processor3WithChildren.processors|.R|SubstitutionOverride|>|(this@R|/Processor3WithChildren|, ::R|/Processor3WithChildren.processors|) + ^ this@R|/Processor3WithChildren|.D|/Processor3WithChildren.processors|.R|SubstitutionOverride|>|(this@R|/Processor3WithChildren|, ::R|/Processor3WithChildren.processors|) } public set(: R|kotlin/collections/MutableCollection|): R|kotlin/Unit| { this@R|/Processor3WithChildren|.D|/Processor3WithChildren.processors|.R|SubstitutionOverride|(this@R|/Processor3WithChildren|, ::R|/Processor3WithChildren.processors|, R|/processors|) diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt50994.reversed.fir.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt50994.reversed.fir.txt index 541db736496..e38aaafef12 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt50994.reversed.fir.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt50994.reversed.fir.txt @@ -6,7 +6,7 @@ FILE: kt50994.reversed.kt public final var processor: R|ProcessorWithChildren?|by this@R|/ProcessorWithParent|.R|/parent|(Q|ProcessorWithChildren|::R|/ProcessorWithChildren.processors|) public get(): R|ProcessorWithChildren?| { - ^ this@R|/ProcessorWithParent|.D|/ProcessorWithParent.processor|.R|SubstitutionOverride|(this@R|/ProcessorWithParent|, ::R|/ProcessorWithParent.processor|) + ^ this@R|/ProcessorWithParent|.D|/ProcessorWithParent.processor|.R|SubstitutionOverride|(this@R|/ProcessorWithParent|, ::R|/ProcessorWithParent.processor|) } public set(: R|ProcessorWithChildren?|): R|kotlin/Unit| { this@R|/ProcessorWithParent|.D|/ProcessorWithParent.processor|.R|SubstitutionOverride|(this@R|/ProcessorWithParent|, ::R|/ProcessorWithParent.processor|, R|/processor|) @@ -20,7 +20,7 @@ FILE: kt50994.reversed.kt public final var processors: R|kotlin/collections/MutableCollection|by this@R|/ProcessorWithChildren|.R|/children|((Q|ProcessorWithParent|).R|kotlin/jvm/java|, Q|ProcessorWithParent|::R|/ProcessorWithParent.processor|) public get(): R|kotlin/collections/MutableCollection| { - ^ this@R|/ProcessorWithChildren|.D|/ProcessorWithChildren.processors|.R|SubstitutionOverride|>|(this@R|/ProcessorWithChildren|, ::R|/ProcessorWithChildren.processors|) + ^ this@R|/ProcessorWithChildren|.D|/ProcessorWithChildren.processors|.R|SubstitutionOverride|>|(this@R|/ProcessorWithChildren|, ::R|/ProcessorWithChildren.processors|) } public set(: R|kotlin/collections/MutableCollection|): R|kotlin/Unit| { this@R|/ProcessorWithChildren|.D|/ProcessorWithChildren.processors|.R|SubstitutionOverride|(this@R|/ProcessorWithChildren|, ::R|/ProcessorWithChildren.processors|, R|/processors|) @@ -48,7 +48,7 @@ FILE: kt50994.reversed.kt public final var processors: R|kotlin/collections/MutableCollection|by this@R|/Processor2WithChildren|.R|/children|((Q|Processor2WithParent|).R|kotlin/jvm/java|, Q|Processor2WithParent|::R|/Processor2WithParent.processor|) public get(): R|kotlin/collections/MutableCollection| { - ^ this@R|/Processor2WithChildren|.D|/Processor2WithChildren.processors|.R|SubstitutionOverride|>|(this@R|/Processor2WithChildren|, ::R|/Processor2WithChildren.processors|) + ^ this@R|/Processor2WithChildren|.D|/Processor2WithChildren.processors|.R|SubstitutionOverride|>|(this@R|/Processor2WithChildren|, ::R|/Processor2WithChildren.processors|) } public set(: R|kotlin/collections/MutableCollection|): R|kotlin/Unit| { this@R|/Processor2WithChildren|.D|/Processor2WithChildren.processors|.R|SubstitutionOverride|(this@R|/Processor2WithChildren|, ::R|/Processor2WithChildren.processors|, R|/processors|) @@ -76,7 +76,7 @@ FILE: kt50994.reversed.kt public final var processors: R|kotlin/collections/MutableCollection|by this@R|/Processor3WithChildren|.R|/children|((Q|Processor3WithParent|).R|kotlin/jvm/java|, Q|Processor3WithParent|::R|/Processor3WithParent.processor|) public get(): R|kotlin/collections/MutableCollection| { - ^ this@R|/Processor3WithChildren|.D|/Processor3WithChildren.processors|.R|SubstitutionOverride|>|(this@R|/Processor3WithChildren|, ::R|/Processor3WithChildren.processors|) + ^ this@R|/Processor3WithChildren|.D|/Processor3WithChildren.processors|.R|SubstitutionOverride|>|(this@R|/Processor3WithChildren|, ::R|/Processor3WithChildren.processors|) } public set(: R|kotlin/collections/MutableCollection|): R|kotlin/Unit| { this@R|/Processor3WithChildren|.D|/Processor3WithChildren.processors|.R|SubstitutionOverride|(this@R|/Processor3WithChildren|, ::R|/Processor3WithChildren.processors|, R|/processors|)