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

K2: don't resolve callable reference to enum entries #KT-59611 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2023-07-05 14:02:04 +02:00
committed by Space Team
parent 9bbfdb708c
commit 15b070b494
10 changed files with 54 additions and 6 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
@@ -11062,6 +11062,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.kt");
}
@Test
@TestMetadata("referenceToEnumEntry.kt")
public void testReferenceToEnumEntry() throws Exception {
runTest("compiler/testData/diagnostics/tests/enum/referenceToEnumEntry.kt");
}
@Test
@TestMetadata("SecondaryConstructorCall.kt")
public void testSecondaryConstructorCall() 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
@@ -11062,6 +11062,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.kt");
}
@Test
@TestMetadata("referenceToEnumEntry.kt")
public void testReferenceToEnumEntry() throws Exception {
runTest("compiler/testData/diagnostics/tests/enum/referenceToEnumEntry.kt");
}
@Test
@TestMetadata("SecondaryConstructorCall.kt")
public void testSecondaryConstructorCall() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -11062,6 +11062,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.kt");
}
@Test
@TestMetadata("referenceToEnumEntry.kt")
public void testReferenceToEnumEntry() throws Exception {
runTest("compiler/testData/diagnostics/tests/enum/referenceToEnumEntry.kt");
}
@Test
@TestMetadata("SecondaryConstructorCall.kt")
public void testSecondaryConstructorCall() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -11068,6 +11068,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.kt");
}
@Test
@TestMetadata("referenceToEnumEntry.kt")
public void testReferenceToEnumEntry() throws Exception {
runTest("compiler/testData/diagnostics/tests/enum/referenceToEnumEntry.kt");
}
@Test
@TestMetadata("SecondaryConstructorCall.kt")
public void testSecondaryConstructorCall() throws Exception {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CandidateFactory.kt
+12 -3
View File
@@ -83,11 +83,20 @@ class CandidateFactory private constructor(
)
// The counterpart in FE 1.0 checks if the given descriptor is VariableDescriptor yet not PropertyDescriptor.
// Here, we explicitly check if the referred declaration/symbol is value parameter, local variable, or backing field.
// Here, we explicitly check if the referred declaration/symbol is value parameter, local variable, enum entry, or backing field.
val callSite = callInfo.callSite
if (callSite is FirCallableReferenceAccess) {
if (symbol is FirValueParameterSymbol || symbol is FirPropertySymbol && symbol.isLocal || symbol is FirBackingFieldSymbol) {
result.addDiagnostic(Unsupported("References to variables aren't supported yet", callSite.calleeReference.source))
when {
symbol is FirValueParameterSymbol || symbol is FirPropertySymbol && symbol.isLocal || symbol is FirBackingFieldSymbol -> {
result.addDiagnostic(
Unsupported("References to variables aren't supported yet", callSite.calleeReference.source)
)
}
symbol is FirEnumEntrySymbol -> {
result.addDiagnostic(
Unsupported("References to enum entries aren't supported", callSite.calleeReference.source)
)
}
}
} else if (objectsByName && symbol.isRegularClassWithoutCompanion(callInfo.session)) {
result.addDiagnostic(NoCompanionObject)
compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionDiagnostic.kt
+1 -1
View File
@@ -123,7 +123,7 @@ class InfixCallOfNonInfixFunction(val function: FirNamedFunctionSymbol) : Resolu
class OperatorCallOfNonOperatorFunction(val function: FirNamedFunctionSymbol) : ResolutionDiagnostic(CONVENTION_ERROR)
class InferenceError(val constraintError: ConstraintSystemError) : ResolutionDiagnostic(constraintError.applicability)
class Unsupported(val message: String, val source: KtSourceElement? = null) : ResolutionDiagnostic(K2_UNSUPPORTED)
class Unsupported(val message: String, val source: KtSourceElement?) : ResolutionDiagnostic(K2_UNSUPPORTED)
object PropertyAsOperator : ResolutionDiagnostic(K2_PROPERTY_AS_OPERATOR)
compiler/testData/codegen/box/enum/enumEntriesNameClashes.kt
Vendored
+1 -2
View File
@@ -1,6 +1,5 @@
// !LANGUAGE: +EnumEntries
// !LANGUAGE: +EnumEntries -PrioritizedEnumEntries
// KT-59611
// IGNORE_BACKEND_K2: JVM_IR, JS_IR, NATIVE, WASM
// IGNORE_BACKEND: JS, JVM
// WITH_STDLIB
compiler/testData/diagnostics/tests/enum/referenceToEnumEntry.fir.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
enum class My { V }
fun test() {
val ref = My::<!UNSUPPORTED!>V<!>
}
compiler/testData/diagnostics/tests/enum/referenceToEnumEntry.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
enum class My { V }
fun test() {
val ref = My::<!UNRESOLVED_REFERENCE!>V<!>
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -11068,6 +11068,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.kt");
}
@Test
@TestMetadata("referenceToEnumEntry.kt")
public void testReferenceToEnumEntry() throws Exception {
runTest("compiler/testData/diagnostics/tests/enum/referenceToEnumEntry.kt");
}
@Test
@TestMetadata("SecondaryConstructorCall.kt")
public void testSecondaryConstructorCall() throws Exception {