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

[FIR] Don't report MUST_BE_INITIALIZED on private open properites

Browse Source 
^KT-59074 Fixed

This solution is not ideal. Ideally, the allopen compiler plugin
shouldn't report `private` properites as `open` KT-64980, but it will
unpredictably break other things.
This commit is contained in:
Nikita Bobko
2024-01-15 16:21:17 +01:00
committed by Space Team
parent 35caae355d
commit 0dc8629312
8 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -3578,6 +3578,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/backingField/MustBeInitializedEffectivelyFinalOn.kt");
}
@Test
@TestMetadata("OpenPrivateValDeferredInit.kt")
public void testOpenPrivateValDeferredInit() throws Exception {
runTest("compiler/testData/diagnostics/tests/backingField/OpenPrivateValDeferredInit.kt");
}
@Test
@TestMetadata("OpenValDeferredInitError_InFinalClass_DisableEffectivelyFinal.kt")
public void testOpenValDeferredInitError_InFinalClass_DisableEffectivelyFinal() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+6
View File
@@ -3578,6 +3578,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/backingField/MustBeInitializedEffectivelyFinalOn.kt");
}
@Test
@TestMetadata("OpenPrivateValDeferredInit.kt")
public void testOpenPrivateValDeferredInit() throws Exception {
runTest("compiler/testData/diagnostics/tests/backingField/OpenPrivateValDeferredInit.kt");
}
@Test
@TestMetadata("OpenValDeferredInitError_InFinalClass_DisableEffectivelyFinal.kt")
public void testOpenValDeferredInitError_InFinalClass_DisableEffectivelyFinal() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -3572,6 +3572,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/backingField/MustBeInitializedEffectivelyFinalOn.kt");
}
@Test
@TestMetadata("OpenPrivateValDeferredInit.kt")
public void testOpenPrivateValDeferredInit() throws Exception {
runTest("compiler/testData/diagnostics/tests/backingField/OpenPrivateValDeferredInit.kt");
}
@Test
@TestMetadata("OpenValDeferredInitError_InFinalClass_DisableEffectivelyFinal.kt")
public void testOpenValDeferredInitError_InFinalClass_DisableEffectivelyFinal() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -3578,6 +3578,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/backingField/MustBeInitializedEffectivelyFinalOn.kt");
}
@Test
@TestMetadata("OpenPrivateValDeferredInit.kt")
public void testOpenPrivateValDeferredInit() throws Exception {
runTest("compiler/testData/diagnostics/tests/backingField/OpenPrivateValDeferredInit.kt");
}
@Test
@TestMetadata("OpenValDeferredInitError_InFinalClass_DisableEffectivelyFinal.kt")
public void testOpenValDeferredInitError_InFinalClass_DisableEffectivelyFinal() throws Exception {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt
+3 -1
View File
@@ -149,7 +149,9 @@ internal fun checkPropertyInitializer(
val isExternal = property.isEffectivelyExternal(containingClass, context)
val isCorrectlyInitialized =
property.initializer != null || isDefinitelyAssigned && !property.hasSetterAccessorImplementation &&
property.getEffectiveModality(containingClass, context.languageVersionSettings) != Modality.OPEN
(property.getEffectiveModality(containingClass, context.languageVersionSettings) != Modality.OPEN ||
// Drop this workaround after KT-64980 is fixed
property.effectiveVisibility == org.jetbrains.kotlin.descriptors.EffectiveVisibility.PrivateInClass)
if (
backingFieldRequired &&
!inInterface &&
compiler/testData/diagnostics/tests/backingField/OpenPrivateValDeferredInit.fir.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// LANGUAGE:+ProhibitOpenValDeferredInitialization
open class Foo {
<!INCOMPATIBLE_MODIFIERS!>private<!> <!INCOMPATIBLE_MODIFIERS!>open<!> val foo: Int
init {
foo = 1
}
}
compiler/testData/diagnostics/tests/backingField/OpenPrivateValDeferredInit.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// LANGUAGE:+ProhibitOpenValDeferredInitialization
open class Foo {
<!MUST_BE_INITIALIZED_OR_FINAL_OR_ABSTRACT!><!INCOMPATIBLE_MODIFIERS!>private<!> <!INCOMPATIBLE_MODIFIERS!>open<!> val foo: Int<!>
init {
foo = 1
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -3578,6 +3578,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/backingField/MustBeInitializedEffectivelyFinalOn.kt");
}
@Test
@TestMetadata("OpenPrivateValDeferredInit.kt")
public void testOpenPrivateValDeferredInit() throws Exception {
runTest("compiler/testData/diagnostics/tests/backingField/OpenPrivateValDeferredInit.kt");
}
@Test
@TestMetadata("OpenValDeferredInitError_InFinalClass_DisableEffectivelyFinal.kt")
public void testOpenValDeferredInitError_InFinalClass_DisableEffectivelyFinal() throws Exception {