azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K2: Propagate explicit getter type to the property without initializer

Browse Source 
In K1, we have the rules like:
- if there's explicit type of a property, then use it
- if there's an initializer, obtain its expression-type
- Otherwise, use getter's return type

The case when getter's type is implicit is handled at
FirDeclarationsResolveTransformer.transformProperty

^KT-56707 Fixed
This commit is contained in:
Denis.Zharkov
2023-02-20 16:53:33 +01:00
committed by Space Team
parent c09607c791
commit 3f052af517
10 changed files with 96 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+12
View File
@@ -25062,12 +25062,24 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/properties/extensionPropertyMustHaveAccessorsOrBeAbstract.kt");
}
@Test
@TestMetadata("inferPropertyTypeFromGetter.kt")
public void testInferPropertyTypeFromGetter() throws Exception {
runTest("compiler/testData/diagnostics/tests/properties/inferPropertyTypeFromGetter.kt");
}
@Test
@TestMetadata("kt47621.kt")
public void testKt47621() throws Exception {
runTest("compiler/testData/diagnostics/tests/properties/kt47621.kt");
}
@Test
@TestMetadata("kt56707.kt")
public void testKt56707() throws Exception {
runTest("compiler/testData/diagnostics/tests/properties/kt56707.kt");
}
@Test
@TestMetadata("lateinitOnTopLevel.kt")
public void testLateinitOnTopLevel() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+12
View File
@@ -25056,12 +25056,24 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/properties/extensionPropertyMustHaveAccessorsOrBeAbstract.kt");
}
@Test
@TestMetadata("inferPropertyTypeFromGetter.kt")
public void testInferPropertyTypeFromGetter() throws Exception {
runTest("compiler/testData/diagnostics/tests/properties/inferPropertyTypeFromGetter.kt");
}
@Test
@TestMetadata("kt47621.kt")
public void testKt47621() throws Exception {
runTest("compiler/testData/diagnostics/tests/properties/kt47621.kt");
}
@Test
@TestMetadata("kt56707.kt")
public void testKt56707() throws Exception {
runTest("compiler/testData/diagnostics/tests/properties/kt56707.kt");
}
@Test
@TestMetadata("lateinitOnTopLevel.kt")
public void testLateinitOnTopLevel() throws Exception {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt
+12 -2
View File
@@ -6,7 +6,9 @@
package org.jetbrains.kotlin.fir.resolve.transformers
import kotlinx.collections.immutable.toImmutableList
import org.jetbrains.kotlin.KtFakeSourceElementKind
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.copyWithNewSourceKind
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.utils.isFromVararg
import org.jetbrains.kotlin.fir.expressions.*
@@ -154,8 +156,16 @@ open class FirTypeResolveTransformer(
setAccessorTypesByPropertyType(property)
}
if (property.returnTypeRef is FirResolvedTypeRef && property.delegate != null) {
setAccessorTypesByPropertyType(property)
when {
property.returnTypeRef is FirResolvedTypeRef && property.delegate != null -> {
setAccessorTypesByPropertyType(property)
}
property.returnTypeRef !is FirResolvedTypeRef && property.initializer == null &&
property.getter?.returnTypeRef is FirResolvedTypeRef -> {
property.replaceReturnTypeRef(
property.getter!!.returnTypeRef.copyWithNewSourceKind(KtFakeSourceElementKind.PropertyTypeFromGetterReturnType)
)
}
}
unboundCyclesInTypeParametersSupertypes(property)